From 1c3bae905f11d00d6d87bff61693715abcc364a0 Mon Sep 17 00:00:00 2001 From: Enrico Jorns Date: Mon, 12 Feb 2024 23:04:52 +0100 Subject: [PATCH 1/2] meta-lxatac-software: local.conf.sample: do not set PACKAGE_CLASSES The tacos distro already sets the variable to its original default value. So no need to set it a third time from local.conf. Restore the original commented-out line and description from poky/oe-core. Signed-off-by: Enrico Jorns --- meta-lxatac-software/conf/templates/default/local.conf.sample | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-lxatac-software/conf/templates/default/local.conf.sample b/meta-lxatac-software/conf/templates/default/local.conf.sample index 3d46faf5..124a478c 100644 --- a/meta-lxatac-software/conf/templates/default/local.conf.sample +++ b/meta-lxatac-software/conf/templates/default/local.conf.sample @@ -81,8 +81,8 @@ DISTRO ?= "tacos" # - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager) # - 'package_rpm' for rpm style packages # E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" -# We default to rpm: -PACKAGE_CLASSES ?= "package_ipk" +# OE-Core defaults to ipkg, whilst Poky defaults to rpm: +# PACKAGE_CLASSES ?= "package_rpm" # # SDK target architecture From 5ac55668aa5af006f8bc34a1a8d23447f5a89573 Mon Sep 17 00:00:00 2001 From: Enrico Jorns Date: Mon, 12 Feb 2024 23:01:35 +0100 Subject: [PATCH 2/2] meta-lxatac-software: sync local.conf.sample with poky Since the duplication from poky, the original local.conf.sample changed a bit compared to our variant. This is just a sync with the current version from nanbield. Signed-off-by: Enrico Jorns --- .../conf/templates/default/local.conf.sample | 43 +++++++++++-------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/meta-lxatac-software/conf/templates/default/local.conf.sample b/meta-lxatac-software/conf/templates/default/local.conf.sample index 124a478c..70571d4a 100644 --- a/meta-lxatac-software/conf/templates/default/local.conf.sample +++ b/meta-lxatac-software/conf/templates/default/local.conf.sample @@ -2,9 +2,11 @@ # This file is your local configuration file and is where all local user settings # are placed. The comments in this file give some guide to the options a new user # to the system might want to change but pretty much any configuration option can -# be set in this file. More adventurous users can look at local.conf.extended -# which contains other examples of configuration which can be placed in this file -# but new users likely won't need any of them initially. +# be set in this file. More adventurous users can look at +# local.conf.sample.extended which contains other examples of configuration which +# can be placed in this file but new users likely won't need any of them +# initially. There's also site.conf.sample which contains examples of site specific +# information such as proxy server addresses. # # Lines starting with the '#' character are commented out and in some cases the # default values are provided as comments to show people example syntax. Enabling @@ -90,7 +92,7 @@ DISTRO ?= "tacos" # This variable specifies the architecture to build SDK items for and means # you can build the SDK packages for architectures other than the machine you are # running the build on (i.e. building i686 packages on an x86_64 host). -# Supported values are i686 and x86_64 +# Supported values are i686, x86_64, aarch64 #SDKMACHINE ?= "i686" # @@ -115,7 +117,8 @@ DISTRO ?= "tacos" # "debug-tweaks" - make an image suitable for development # e.g. ssh root access has a blank password # There are other application targets that can be used here too, see -# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details. +# meta/classes-recipe/image.bbclass and +# meta/classes-recipe/core-image.bbclass for more details. # We default to enabling the debugging tweaks. EXTRA_IMAGE_FEATURES ?= "debug-tweaks" @@ -126,10 +129,6 @@ EXTRA_IMAGE_FEATURES ?= "debug-tweaks" # enable extra features. Some available options which can be included in this variable # are: # - 'buildstats' collect build statistics -# - 'image-mklibs' to reduce shared library files size for an image -# - 'image-prelink' in order to prelink the filesystem image -# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink -# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended USER_CLASSES ?= "buildstats" # @@ -138,7 +137,7 @@ USER_CLASSES ?= "buildstats" # The build system can test booting virtual machine images under qemu (an emulator) # after any root filesystems are created and run tests against those images. It can also # run tests against any SDK that are built. To enable this uncomment these lines. -# See classes/test{image,sdk}.bbclass for further details. +# See meta/classes-recipe/test{image,sdk}.bbclass for further details. #IMAGE_CLASSES += "testimage testsdk" #TESTIMAGE_AUTO:qemuall = "1" @@ -166,10 +165,10 @@ PATCHRESOLVE = "noop" # # Monitor the disk space during the build. If there is less that 1GB of space or less # than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully -# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort +# shutdown the build. If there is less than 100MB or 1K inodes, perform a hard halt # of the build. The reason for this is that running completely out of space can corrupt # files and damages the build in ways which may not be easily recoverable. -# It's necesary to monitor /tmp, if there is no space left the build will fail +# It's necessary to monitor /tmp, if there is no space left the build will fail # with very exotic errors. BB_DISKMON_DIRS ??= "\ STOPTASKS,${TMPDIR},1G,100K \ @@ -184,11 +183,11 @@ BB_DISKMON_DIRS ??= "\ # # Shared-state files from other locations # -# As mentioned above, shared state files are prebuilt cache data objects which can +# As mentioned above, shared state files are prebuilt cache data objects which can be # used to accelerate build time. This variable can be used to configure the system # to search other mirror locations for these objects before it builds the data itself. # -# This can be a filesystem directory, or a remote url such as http or ftp. These +# This can be a filesystem directory, or a remote url such as https or ftp. These # would contain the sstate-cache results from previous builds (possibly from other # machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the # cache locations to check for the shared objects. @@ -196,20 +195,28 @@ BB_DISKMON_DIRS ??= "\ # at the end as shown in the examples below. This will be substituted with the # correct path within the directory structure. #SSTATE_MIRRORS ?= "\ -#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ +#file://.* https://someserver.tld/share/sstate/PATH;downloadfilename=PATH \ #file://.* file:///some/local/dir/sstate/PATH" # # Yocto Project SState Mirror # # The Yocto Project has prebuilt artefacts available for its releases, you can enable -# use of these by uncommenting the following line. This will mean the build uses +# use of these by uncommenting some of the following lines. This will mean the build uses # the network to check for artefacts at the start of builds, which does slow it down -# equally, it will also speed up the builds by not having to build things if they are +# initially but it will then speed up the builds by not having to build things if they are # present in the cache. It assumes you can download something faster than you can build it # which will depend on your network. +# Note: For this to work you also need hash-equivalence passthrough to the matching server +# There is a choice between our sstate server directly and a faster content delivery network +# (CDN) kindly provided by JSDelivr, uncomment one of the SSTATE_MIRRORS lines, not both. +# Using the CDN rather than the yoctoproject.org address is suggested/preferred. # -#SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/2.5/PATH;downloadfilename=PATH" +#BB_HASHSERVE_UPSTREAM = "hashserv.yocto.io:8687" +#SSTATE_MIRRORS ?= "file://.* http://cdn.jsdelivr.net/yocto/sstate/all/PATH;downloadfilename=PATH" +# +###SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/all/PATH;downloadfilename=PATH" + # # Qemu configuration