diff options
Diffstat (limited to 'poky/meta-poky')
| -rw-r--r-- | poky/meta-poky/conf/distro/include/gcsections.inc | 22 | ||||
| -rw-r--r-- | poky/meta-poky/conf/distro/poky-tiny.conf | 2 | ||||
| -rw-r--r-- | poky/meta-poky/conf/distro/poky.conf | 11 |
3 files changed, 29 insertions, 6 deletions
diff --git a/poky/meta-poky/conf/distro/include/gcsections.inc b/poky/meta-poky/conf/distro/include/gcsections.inc new file mode 100644 index 0000000000..dd98943acb --- /dev/null +++ b/poky/meta-poky/conf/distro/include/gcsections.inc @@ -0,0 +1,22 @@ +CFLAGS_SECTION_REMOVAL = "-ffunction-sections -fdata-sections" +LDFLAGS_SECTION_REMOVAL = "-Wl,--gc-sections" + +# packages with build problems using sections +CFLAGS_SECTION_REMOVAL_pn-glibc = "" +LDFLAGS_SECTION_REMOVAL_pn-glibc = "" +CFLAGS_SECTION_REMOVAL_pn-cairo = "" +LDFLAGS_SECTION_REMOVAL_pn-cairo = "" +CFLAGS_SECTION_REMOVAL_pn-perl = "" +LDFLAGS_SECTION_REMOVAL_pn-perl = "" +CFLAGS_SECTION_REMOVAL_pn-grub-efi = "" +LDFLAGS_SECTION_REMOVAL_pn-grub-efi = "" +CFLAGS_SECTION_REMOVAL_pn-grub = "" +LDFLAGS_SECTION_REMOVAL_pn-grub = "" + +# set default for target +CFLAGS_append_class-target = " ${CFLAGS_SECTION_REMOVAL}" +LDFLAGS_append_class-target = " ${LDFLAGS_SECTION_REMOVAL}" + +# set default for nativesdk +CFLAGS_append_class-nativesdk = " ${CFLAGS_SECTION_REMOVAL}" +LDFLAGS_append_class-nativesdk = " ${LDFLAGS_SECTION_REMOVAL}" diff --git a/poky/meta-poky/conf/distro/poky-tiny.conf b/poky/meta-poky/conf/distro/poky-tiny.conf index 9a043b1ef5..e125b23d46 100644 --- a/poky/meta-poky/conf/distro/poky-tiny.conf +++ b/poky/meta-poky/conf/distro/poky-tiny.conf @@ -29,6 +29,8 @@ # [ ] Modify busybox to allow for DISTRO_FEATURES-like confiruration require conf/distro/poky.conf +require conf/distro/include/gcsections.inc + DISTRO = "poky-tiny" DISTROOVERRIDES = "poky:poky-tiny" TCLIBC = "musl" diff --git a/poky/meta-poky/conf/distro/poky.conf b/poky/meta-poky/conf/distro/poky.conf index 31dc110bf6..b33df3c17f 100644 --- a/poky/meta-poky/conf/distro/poky.conf +++ b/poky/meta-poky/conf/distro/poky.conf @@ -1,9 +1,10 @@ DISTRO = "poky" DISTRO_NAME = "Poky (Yocto Project Reference Distro)" -DISTRO_VERSION = "3.2+snapshot-${DATE}" +DISTRO_VERSION = "3.2+snapshot-${METADATA_REVISION}" DISTRO_CODENAME = "master" SDK_VENDOR = "-pokysdk" -SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${DATE}', 'snapshot')}" +SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${METADATA_REVISION}', 'snapshot')}" +SDK_VERSION[vardepvalue] = "${SDK_VERSION}" MAINTAINER = "Poky <poky@lists.yoctoproject.org>" @@ -11,9 +12,6 @@ TARGET_VENDOR = "-poky" LOCALCONF_VERSION = "1" -DISTRO_VERSION[vardepsexclude] = "DATE" -SDK_VERSION[vardepsexclude] = "DATE" - # Override these in poky based distros POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch wayland vulkan" POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot" @@ -49,15 +47,16 @@ SANITY_TESTED_DISTROS ?= " \ ubuntu-16.04 \n \ ubuntu-18.04 \n \ ubuntu-20.04 \n \ - fedora-30 \n \ fedora-31 \n \ fedora-32 \n \ + fedora-33 \n \ centos-7 \n \ centos-8 \n \ debian-8 \n \ debian-9 \n \ debian-10 \n \ opensuseleap-15.1 \n \ + opensuseleap-15.2 \n \ " # add poky sanity bbclass INHERIT += "poky-sanity" |