Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cbrake/master #43

Merged
merged 4 commits into from
Oct 22, 2018
Merged

Cbrake/master #43

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d5ff48
switch from generating site.conf to auto.conf
cbrake Oct 22, 2018
7e00372
switch to using site.conf for settings stored in git
cbrake Oct 22, 2018
09a0a4a
add up link
cbrake Oct 22, 2018
458f9de
document configuration files
cbrake Oct 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
switch to using site.conf for settings stored in git
  • Loading branch information
@cbrake
cbrake committed Oct 22, 2018
commit 7e003720737117ae7a9c8bd0dd850abc640141f7
4 changes: 2 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
build
downloads
conf/auto.conf
conf/local.conf
conf/sanity_info
conf/site.conf
conf/locallocal.conf
conf/local.conf
pseudodone
git_config
subversion_config/
Expand Down
36 changes: 23 additions & 13 deletions conf/local.conf.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,26 @@
# Uncomment the following to enable systemd
#DISTRO_FEATURES_append = " systemd"
#VIRTUAL-RUNTIME_init_manager = "systemd"
#DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
#VIRTUAL-RUNTIME_initscripts = ""

# Uncomment the following to enable busybox init/dev/login
#VIRTUAL-RUNTIME_init_manager = "busybox"
#VIRTUAL-RUNTIME_dev_manager = "busybox-mdev"
#VIRTUAL-RUNTIME_login_manager = "busybox"
# this is a sample of what might go in local.conf

# Uncomment the following to enable musl libc
#TCLIBC = "musl"
# required for Freescale stuff to build
ACCEPT_FSL_EULA = "1"

# generate the mirror tarball for SCM repos
# BB_GENERATE_MIRROR_TARBALLS = "1"
# required for Qualcomm stuff to build
ACCEPT_EULA = "1"

# required to build netperf
LICENSE_FLAGS_WHITELIST = "non-commercial"

# use the following to set the IP or hostname
# for the oe_setup_feed_server function
# if you have a decent DHCP server, then this is often
# the same as MACHINE
export MACHINE_IP=$MACHINE

# When setting up feeds it will try to use this
# hosts IP address to configure the server on target
# machine, however if a different IP address is to be
# used then set it up here
export HOST_IP=10.10.10.10

# configure docker container to run bitbake in
export DOCKER_REPO=yoedistro/yoe-build:stretch
12 changes: 0 additions & 12 deletions conf/locallocal.conf.sample
View file
Open in desktop

This file was deleted.

7 changes: 3 additions & 4 deletions conf/local.conf → conf/site.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@

# this following is for settings that are not checked into the build
# template -- see locallocal.conf.sample
include locallocal.conf
# site.conf is used for configuration settings that are checked into git,
# and are used by the entire team. For settings that are unique to a machine
# or user, and are not stored in git, please use local.conf.

# CONF_VERSION is increased each time build/conf/ changes incompatibly
CONF_VERSION = "1"
Expand Down
20 changes: 20 additions & 0 deletions conf/site.conf.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# local.conf should only be used for settings that are unique to a
# user or build machine. Settings that are common for the entire team
# should be added to site.conf, which is stored in git.

# Use the following to enable systemd
DISTRO_FEATURES_append = " systemd"
VIRTUAL-RUNTIME_init_manager = "systemd"
DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
VIRTUAL-RUNTIME_initscripts = ""

# Use the following to enable busybox init/dev/login
VIRTUAL-RUNTIME_init_manager = "busybox"
VIRTUAL-RUNTIME_dev_manager = "busybox-mdev"
VIRTUAL-RUNTIME_login_manager = "busybox"

# Use the following to enable musl libc
TCLIBC = "musl"

# configure docker container to run bitbake in
export DOCKER_REPO=yoedistro/yoe-build:stretch