From ce0397ba44158ff139c3d1bb98a81c29ff07aa99 Mon Sep 17 00:00:00 2001 From: Bogdan Oprescu Date: Fri, 17 Jun 2022 15:44:46 +0000 Subject: Update layer for kirkstone build Change-Id: Iaf8381bd4e43bdbcae44325627ed99ebec3f6a34 Signed-off-by: Bogdan Oprescu --- conf/distro/include/enea-mirrors.inc | 2 +- conf/layer.conf | 2 +- images/enea-image-extra.inc | 2 +- recipes-connectivity/connman/connman_%.bbappend | 6 +++--- recipes-core/busybox/busybox_%.bbappend | 2 +- recipes-devtools/run-postinsts/run-postinsts_1.0.bbappend | 2 +- recipes-enea/bitcalc/bitcalc_1.0.bb | 6 +++--- recipes-enea/linx/linx-mod_2.6.7.bb | 2 +- recipes-enea/linx/linx.inc | 2 +- recipes-extended/ltp/ltp_%.bbappend | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/conf/distro/include/enea-mirrors.inc b/conf/distro/include/enea-mirrors.inc index ead2d72..3084f21 100644 --- a/conf/distro/include/enea-mirrors.inc +++ b/conf/distro/include/enea-mirrors.inc @@ -1,6 +1,6 @@ MIRROR_ENEA_DISTRO = "${@d.getVar('DISTRO_NAME').replace(" ","")}${@d.getVar('DISTRO_VERSION_MAJOR').replace(" ","")}${@d.getVar('DISTRO_VERSION_MINOR').replace(" ","")}" -MIRRORS_append = "\ +MIRRORS:append = "\ cvs://.*/.* http://linux.enea.com/${MIRROR_ENEA_DISTRO}/sources/ \n \ svn://.*/.* http://linux.enea.com/${MIRROR_ENEA_DISTRO}/sources/ \n \ git://.*/.* http://linux.enea.com/${MIRROR_ENEA_DISTRO}/sources/ \n \ diff --git a/conf/layer.conf b/conf/layer.conf index 8884cca..69e8654 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -11,4 +11,4 @@ BBFILE_COLLECTIONS += "el-common" BBFILE_PATTERN_el-common = "^${LAYERDIR}/" BBFILE_PRIORITY_el-common = "5" -LAYERSERIES_COMPAT_el-common = "dunfell zeus" +LAYERSERIES_COMPAT_el-common = "dunfell zeus kirkstone" diff --git a/images/enea-image-extra.inc b/images/enea-image-extra.inc index 98a88cb..c6ef28f 100644 --- a/images/enea-image-extra.inc +++ b/images/enea-image-extra.inc @@ -21,7 +21,7 @@ SDKIMAGE_FEATURES += " \ IMAGE_INSTALL += " \ binutils \ - dhcp-client \ + dhcpcd \ fuse \ gnutls \ kernel-dev \ diff --git a/recipes-connectivity/connman/connman_%.bbappend b/recipes-connectivity/connman/connman_%.bbappend index a32d4b3..8e6a7ef 100644 --- a/recipes-connectivity/connman/connman_%.bbappend +++ b/recipes-connectivity/connman/connman_%.bbappend @@ -1,10 +1,10 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/connman:" +FILESEXTRAPATHS:prepend := "${THISDIR}/connman:" SRC_URI += "file://0001-added-noipconfig-option.patch \ file://connman.patch \ " -python do_patch_prepend() { +python do_patch:prepend() { import shutil workdir = d.getVar('WORKDIR', True) source = d.getVar('S', True) @@ -12,7 +12,7 @@ python do_patch_prepend() { } -python do_patch_append() { +python do_patch:append() { import shutil workdir = d.getVar('WORKDIR', True) source = d.getVar('S', True) diff --git a/recipes-core/busybox/busybox_%.bbappend b/recipes-core/busybox/busybox_%.bbappend index 7b61cf9..01d3379 100644 --- a/recipes-core/busybox/busybox_%.bbappend +++ b/recipes-core/busybox/busybox_%.bbappend @@ -1,4 +1,4 @@ -do_prepare_config_append () { +do_prepare_config:append () { sed -i -e 's/# CONFIG_CHRT is not set/CONFIG_CHRT=y/' .config sed -i -e 's/# CONFIG_TASKSET is not set/CONFIG_TASKSET=y/' .config sed -i -e 's/# CONFIG_FEATURE_TASKSET_FANCY is not set/CONFIG_FEATURE_TASKSET_FANCY=y/' .config diff --git a/recipes-devtools/run-postinsts/run-postinsts_1.0.bbappend b/recipes-devtools/run-postinsts/run-postinsts_1.0.bbappend index c800e85..3187b1f 100644 --- a/recipes-devtools/run-postinsts/run-postinsts_1.0.bbappend +++ b/recipes-devtools/run-postinsts/run-postinsts_1.0.bbappend @@ -1,5 +1,5 @@ -do_install_append() { +do_install:append() { # Don't run 'dpkg --configure' for debs, because it is already executed by a # service included in the dpkg recipe if ${@bb.utils.contains('PACKAGE_CLASSES', 'package_deb', 'true', 'false', d)}; then diff --git a/recipes-enea/bitcalc/bitcalc_1.0.bb b/recipes-enea/bitcalc/bitcalc_1.0.bb index c59cbb5..89096c4 100644 --- a/recipes-enea/bitcalc/bitcalc_1.0.bb +++ b/recipes-enea/bitcalc/bitcalc_1.0.bb @@ -9,7 +9,7 @@ PR = "r0" DEPENDS = "gcc-sanitizers" RDEPENDS_${PN} = "bash" -FILESEXTRAPATHS_append := "${THISDIR}/${PN}" +FILESEXTRAPATHS:append := "${THISDIR}/${PN}" SRC_URI = "git://github.com/OpenEneaLinux/rt-tools.git;branch=master \ file://0001-bitcalc-resolved-compilation-warnings.patch \ @@ -17,8 +17,8 @@ SRC_URI = "git://github.com/OpenEneaLinux/rt-tools.git;branch=master \ file://0001-Fix-implicit-fallthrough-warnings.patch \ " -DEPENDS_remove_aarch64 = "gcc-sanitizers" -SRC_URI_append_aarch64 = "file://0001-bitcalc-disable-gcc-address-sanitizer.patch" +DEPENDS:remove:aarch64 = "gcc-sanitizers" +SRC_URI:append:aarch64 = "file://0001-bitcalc-disable-gcc-address-sanitizer.patch" SRCREV = "9d4d1ce26b58ada516466c30e53c75c2961d6f0a" diff --git a/recipes-enea/linx/linx-mod_2.6.7.bb b/recipes-enea/linx/linx-mod_2.6.7.bb index 9bcf459..ae2e33f 100644 --- a/recipes-enea/linx/linx-mod_2.6.7.bb +++ b/recipes-enea/linx/linx-mod_2.6.7.bb @@ -19,7 +19,7 @@ S = "${WORKDIR}/linx-${PV}/net/linx" inherit module -module_do_compile_prepend () { +module_do_compile:prepend () { if [ -z $(cat ${STAGING_KERNEL_BUILDDIR}/.config | grep "CONFIG_MODULES=y") ] ; then echo "The specified Linux kernel has no support for pluggable modules (CONFIG_MODULES=y). Enable it before baking this." diff --git a/recipes-enea/linx/linx.inc b/recipes-enea/linx/linx.inc index 3388964..4b8ad56 100644 --- a/recipes-enea/linx/linx.inc +++ b/recipes-enea/linx/linx.inc @@ -15,7 +15,7 @@ S = "${WORKDIR}/linx-${PV}" inherit autotools-brokensep -do_install_append () { +do_install:append () { mkdir -p ${D}/etc install -m 644 ${S}/linxgw/linxgws/example.conf ${D}/etc/linxgws.conf } diff --git a/recipes-extended/ltp/ltp_%.bbappend b/recipes-extended/ltp/ltp_%.bbappend index 59a4341..3c9ad05 100644 --- a/recipes-extended/ltp/ltp_%.bbappend +++ b/recipes-extended/ltp/ltp_%.bbappend @@ -1,3 +1,3 @@ -do_compile_prepend () { +do_compile:prepend () { ( make -C ${B}/testcases/open_posix_testsuite generate-makefiles conformance-all tools-all functional-all stress-all ) } -- cgit v1.2.3-54-g00ecf