diff options
| author | Ricardo Salveti <ricardo@opensourcefoundries.com> | 2018-01-25 22:36:19 -0200 |
|---|---|---|
| committer | Ricardo Salveti <ricardo@opensourcefoundries.com> | 2018-02-06 18:27:24 -0200 |
| commit | aafb3b5a5583da1cdf3c657cb5337d904c02a1cf (patch) | |
| tree | 92644c00ed94a69b95bd26d8feb6430987f11323 | |
| parent | 9d470111477ab8a58e48718fa1a06ad3331dce1b (diff) | |
Change local.conf to be a copy instead of a link
All the machine specific configuration is now provided by meta-osf, so
there is no other reason to keep maintaining local.conf as a symbolic
link.
This change allows the user to customize local.conf without facing
conflict issues when updating the manifest repository.
Signed-off-by: Ricardo Salveti <ricardo@opensourcefoundries.com>
| -rw-r--r-- | conf/local.conf | 27 | ||||
| -rw-r--r-- | setup-environment-internal | 4 |
2 files changed, 3 insertions, 28 deletions
diff --git a/conf/local.conf b/conf/local.conf index 9dae7bf..90f07a0 100644 --- a/conf/local.conf +++ b/conf/local.conf @@ -44,30 +44,3 @@ file://.* https://lmp-mirror.foundries.io/sstate-cache/PATH \n \ # its good for a case when this is the only builder # generating the feeds #PRSERV_HOST = "localhost:0" - -# OSF LMP specific configuration - -# Beaglebone -IMAGE_FSTYPES_append_beaglebone = " wic.gz" -IMAGE_FSTYPES_remove_beaglebone = " wic" - -# Dragonboard (DB410/DB820) -QCOM_BOOTIMG_ROOTFS_dragonboard-820c = "sda9" - -# HiKey -CMDLINE_remove_hikey = "quiet" - -# Raspberry Pi -VC4DTBO_raspberrypi3-64 = "vc4-kms-v3d" -RPI_USE_U_BOOT = "1" -IMAGE_FSTYPES_append_rpi = " ext4.gz wic.gz wic.bmap" -WKS_FILE_rpi = "raspberrypi.wks" -IMAGE_FSTYPES_remove_rpi += " ext3 rpi-sdimg" - -# Intel -IMAGE_FSTYPES_append_intel-corei7-64 = " ext4.gz wic.gz" -IMAGE_FSTYPES_remove_intel-corei7-64 = " ext4 wic" - -# Cross machines / BSPs -## Drop IMX BSP that is not needed -MACHINE_EXTRA_RRECOMMENDS_remove = "imx-alsa-plugins" diff --git a/setup-environment-internal b/setup-environment-internal index dd0560e..36a5456 100644 --- a/setup-environment-internal +++ b/setup-environment-internal @@ -157,7 +157,9 @@ fi # Evaluate new checksum and regenerate the conf files sha512sum "${MANIFESTS}"/setup-environment-internal 2>&1 > conf/checksum -ln -sf "${MANIFESTS}"/conf/local.conf conf/local.conf +if [ ! -f "conf/local.conf" ]; then + cp "${MANIFESTS}"/conf/local.conf conf/local.conf +fi ln -sf "${MANIFESTS}"/conf/bblayers.conf conf/bblayers.conf ln -sf "${MANIFESTS}"/README.md README.md |