|
[meta-zephyr][PATCH v2 2/2] layer.conf: add honister to LAYERSERIES_COMPAT
Naveen Saini
Signed-off-by: Naveen Saini <naveen.kumar.saini@...>
--- conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/layer.conf b/conf/layer.conf index 8e6b15d..5f13c27 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -15,4 +15,4 @@ LAYERVERSION_zephyr = "1" LAYERDEPENDS_zephyr = "core meta-python" -LAYERSERIES_COMPAT_zephyr = "dunfell gatesgarth hardknott" +LAYERSERIES_COMPAT_zephyr = "dunfell gatesgarth hardknott honister" -- 2.17.1
|
|
|
|
[meta-zephyr][PATCH v2 1/2] Convert to new override syntax
Naveen Saini
Use the convert-overrides.py to convert to new syntax and fixed
some additional changes manually. Signed-off-by: Naveen Saini <naveen.kumar.saini@...> --- classes/zephyr.bbclass | 2 +- conf/machine/96b-avenger96.conf | 2 +- conf/machine/96b-nitrogen.conf | 2 +- conf/machine/arduino-nano-33-ble.conf | 2 +- conf/machine/include/tune-arc.inc | 2 +- conf/machine/include/tune-cortexm0.inc | 8 ++++---- conf/machine/include/tune-cortexm3.inc | 10 +++++----- conf/machine/include/tune-cortexm4.inc | 10 +++++----- conf/machine/include/tune-iamcu.inc | 4 ++-- conf/machine/include/tune-nios2.inc | 4 ++-- conf/machine/intel-x86-64.conf | 2 +- conf/machine/nrf52840dk-nrf52840.conf | 2 +- conf/machine/qemu-cortex-m3.conf | 2 +- conf/machine/qemu-nios2.conf | 2 +- conf/machine/qemu-x86.conf | 6 +++--- recipes-core/newlib/newlib_%.bbappend | 10 +++++----- recipes-devtools-arc/binutils/binutils-2.26arc.inc | 4 ++-- .../binutils/binutils-cross-canadian_2.26arc.bb | 2 +- .../binutils/binutils-cross_2.26arc.bb | 4 ++-- recipes-devtools-arc/gcc/gcc-6.x.arc.inc | 4 ++-- .../gcc/gcc-cross-canadian_6.x.arc.bb | 8 ++++---- recipes-devtools-arc/gcc/gcc-cross_6.x.arc .bb | 8 ++++---- recipes-devtools-arc/gcc/libgcc_6.x.arc.bb | 6 +++--- recipes-devtools/gcc/gcc-cross_6.%.bbappend | 2 +- recipes-devtools/gcc/libgcc_6.%.bbappend | 4 ++-- recipes-devtools/qemu/qemu_%.bbappend | 6 +++--- recipes-kernel/zephyr-kernel/zephyr-coap-client.bb | 2 +- recipes-kernel/zephyr-kernel/zephyr-coap-server.bb | 2 +- recipes-kernel/zephyr-kernel/zephyr-echo-client.bb | 2 +- recipes-kernel/zephyr-kernel/zephyr-http-client.bb | 2 +- .../zephyr-kernel/zephyr-kernel-common.inc | 14 +++++++------- .../zephyr-kernel/zephyr-kernel-src-2.5.0.inc | 2 +- .../zephyr-kernel/zephyr-kernel-src-2.6.0.inc | 2 +- recipes-kernel/zephyr-kernel/zephyr-kernel-src.bb | 2 +- recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc | 2 +- .../zephyr-kernel/zephyr-kernel-test.inc | 12 ++++++------ .../zephyr-kernel/zephyr-mqtt-publisher.bb | 2 +- .../zephyr-kernel/zephyr-openthread-echo-client.bb | 4 ++-- .../zephyr-kernel/zephyr-peripheral-esp.bb | 2 +- .../zephyr-kernel/zephyr-peripheral-hr.bb | 2 +- .../zephyr-kernel/zephyr-websocket-client.bb | 2 +- 41 files changed, 86 insertions(+), 86 deletions(-) diff --git a/classes/zephyr.bbclass b/classes/zephyr.bbclass index 6fceb04..e1d3185 100644 --- a/classes/zephyr.bbclass +++ b/classes/zephyr.bbclass @@ -48,7 +48,7 @@ do_menuconfig[nostamp] = "1" do_menuconfig[dirs] = "${B}" addtask menuconfig after do_configure -python do_devshell_prepend () { +python do_devshell:prepend () { # Most likely we need to manually edit prj.conf... os.chdir(d.getVar('ZEPHYR_SRC_DIR', True)) } diff --git a/conf/machine/96b-avenger96.conf b/conf/machine/96b-avenger96.conf index 7bcfb4a..ae6f972 100644 --- a/conf/machine/96b-avenger96.conf +++ b/conf/machine/96b-avenger96.conf @@ -5,4 +5,4 @@ require conf/machine/include/stm32mp1-cortex-m4.inc -ARCH_96b-avenger96 = "arm" +ARCH:96b-avenger96 = "arm" diff --git a/conf/machine/96b-nitrogen.conf b/conf/machine/96b-nitrogen.conf index 48f2041..affe9eb 100644 --- a/conf/machine/96b-nitrogen.conf +++ b/conf/machine/96b-nitrogen.conf @@ -5,4 +5,4 @@ require conf/machine/include/nrf52.inc ZEPHYR_INHERIT_CLASSES += "zephyr-flash-pyocd" -ARCH_96b-nitrogen = "arm" +ARCH:96b-nitrogen = "arm" diff --git a/conf/machine/arduino-nano-33-ble.conf b/conf/machine/arduino-nano-33-ble.conf index 18ba056..ebf4155 100644 --- a/conf/machine/arduino-nano-33-ble.conf +++ b/conf/machine/arduino-nano-33-ble.conf @@ -5,5 +5,5 @@ require conf/machine/include/nrf52.inc ZEPHYR_INHERIT_CLASSES += "zephyr-flash-bossac" -ARCH_arduino-nano-33-ble = "arm" +ARCH:arduino-nano-33-ble = "arm" diff --git a/conf/machine/include/tune-arc.inc b/conf/machine/include/tune-arc.inc index ff841e7..7db88ef 100644 --- a/conf/machine/include/tune-arc.inc +++ b/conf/machine/include/tune-arc.inc @@ -2,7 +2,7 @@ DEFAULTTUNE ?= "arc" TUNE_ARCH = "arc" TUNE_PKGARCH = "arc" -TUNE_FEATURES_tune-arc = "littleendian" +TUNE_FEATURES:tune-arc = "littleendian" TUNE_CCARGS = "" TUNEVALID[littleendian] = "Little endian mode" diff --git a/conf/machine/include/tune-cortexm0.inc b/conf/machine/include/tune-cortexm0.inc index d4f95e4..5067eb2 100644 --- a/conf/machine/include/tune-cortexm0.inc +++ b/conf/machine/include/tune-cortexm0.inc @@ -22,10 +22,10 @@ TUNEVALID[armv6m] = "Enable Cortex-M0 specific processor optimizations" TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'armv6m', ' -march=armv6-m', '', d)}" MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'armv6m', 'armv6m:', '' ,d)}" -ARMPKGARCH_tune-cortexm0 = "cortexm0" -TUNE_FEATURES_tune-cortexm0 = "${TUNE_FEATURES_tune-armv6} cortexm0" +ARMPKGARCH:tune-cortexm0 = "cortexm0" +TUNE_FEATURES:tune-cortexm0 = "${TUNE_FEATURES:tune-armv6} cortexm0" -PACKAGE_EXTRA_ARCHS_tune-cortexm0 = "${PACKAGE_EXTRA_ARCHS_tune-armv6m} cortexm0-vfp" +PACKAGE_EXTRA_ARCHS:tune-cortexm0 = "${PACKAGE_EXTRA_ARCHS:tune-armv6m} cortexm0-vfp" -TUNE_FEATURES_tune-cortexm0 = "armv6m vfp cortexm0 thumb no-thumb-interwork soft" +TUNE_FEATURES:tune-cortexm0 = "armv6m vfp cortexm0 thumb no-thumb-interwork soft" diff --git a/conf/machine/include/tune-cortexm3.inc b/conf/machine/include/tune-cortexm3.inc index 3fba827..404e2b7 100644 --- a/conf/machine/include/tune-cortexm3.inc +++ b/conf/machine/include/tune-cortexm3.inc @@ -10,12 +10,12 @@ TUNEVALID[armv7m] = "Enable Cortex-M3 specific processor optimizations" TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'armv7m', ' -march=armv7-m', '', d)}" MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'armv7m', 'armv7m:', '' ,d)}" -TUNE_PKGARCH_tune-cortexm3 = "cortexm3" +TUNE_PKGARCH:tune-cortexm3 = "cortexm3" -ARMPKGARCH_tune-cortexm3 = "armv7m" -PACKAGE_EXTRA_ARCHS_tune-cortexm3 ="cortexm3" +ARMPKGARCH:tune-cortexm3 = "armv7m" +PACKAGE_EXTRA_ARCHS:tune-cortexm3 ="cortexm3" -TUNE_FEATURES_tune-cortexm3 = "armv7m vfp cortexm3" -PACKAGE_EXTRA_ARCHS_tune-cortexm3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7m-vfp" +TUNE_FEATURES:tune-cortexm3 = "armv7m vfp cortexm3" +PACKAGE_EXTRA_ARCHS:tune-cortexm3 = "${PACKAGE_EXTRA_ARCHS:tune-armv7at} armv7m-vfp" TUNE_CCARGS_MFLOAT = "soft" diff --git a/conf/machine/include/tune-cortexm4.inc b/conf/machine/include/tune-cortexm4.inc index a823b6b..b3092d8 100644 --- a/conf/machine/include/tune-cortexm4.inc +++ b/conf/machine/include/tune-cortexm4.inc @@ -10,10 +10,10 @@ TUNEVALID[armv7m] = "Enable Cortex-M4 specific processor optimizations" TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'armv7m', ' -march=armv7e-m', '', d)}" MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'armv7m', 'armv7m:', '' ,d)}" -TUNE_PKGARCH_tune-cortexm4 = "cortexm4" +TUNE_PKGARCH:tune-cortexm4 = "cortexm4" -ARMPKGARCH_tune-cortexm4 = "armv7m" -PACKAGE_EXTRA_ARCHS_tune-cortexm4 ="cortexm4" +ARMPKGARCH:tune-cortexm4 = "armv7m" +PACKAGE_EXTRA_ARCHS:tune-cortexm4 ="cortexm4" -TUNE_FEATURES_tune-cortexm4 = "armv7m vfp cortexm4" -PACKAGE_EXTRA_ARCHS_tune-cortexm4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7m-vfp armv7m" +TUNE_FEATURES:tune-cortexm4 = "armv7m vfp cortexm4" +PACKAGE_EXTRA_ARCHS:tune-cortexm4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7at} armv7m-vfp armv7m" diff --git a/conf/machine/include/tune-iamcu.inc b/conf/machine/include/tune-iamcu.inc index 20a93a6..827d39b 100644 --- a/conf/machine/include/tune-iamcu.inc +++ b/conf/machine/include/tune-iamcu.inc @@ -3,9 +3,9 @@ DEFAULTTUNE ?= "iamcu" TARGET_OS_iamcu = "elfiamcu" TARGET_ARCH = "i586" -TUNE_FEATURES_tune-iamcu = "iamcu" +TUNE_FEATURES:tune-iamcu = "iamcu" TUNE_CCARGS = "-miamcu -m32" TUNE_ARCH = "i586" TUNEVALID[iamcu] = "Intel MCU" -PACKAGE_EXTRA_ARCHS_tune-iamcu = "iamcu" +PACKAGE_EXTRA_ARCHS:tune-iamcu = "iamcu" diff --git a/conf/machine/include/tune-nios2.inc b/conf/machine/include/tune-nios2.inc index e8662eb..391727e 100644 --- a/conf/machine/include/tune-nios2.inc +++ b/conf/machine/include/tune-nios2.inc @@ -4,9 +4,9 @@ DEFAULTTUNE ?= "nios2" TUNE_ARCH = "nios2" TUNE_PKGARCH = "nios2" -TUNE_FEATURES_tune-nios2 = "nios2" +TUNE_FEATURES:tune-nios2 = "nios2" TUNE_CCARGS = "" TUNEVALID[nios2] = "Altera Nios2" -PACKAGE_EXTRA_ARCHS_tune-nios2 = "nios2" +PACKAGE_EXTRA_ARCHS:tune-nios2 = "nios2" diff --git a/conf/machine/intel-x86-64.conf b/conf/machine/intel-x86-64.conf index 2935cff..74e8f6e 100644 --- a/conf/machine/intel-x86-64.conf +++ b/conf/machine/intel-x86-64.conf @@ -4,7 +4,7 @@ require conf/machine/include/tune-corei7-common.inc -ARCH_intel-x86-64 = "x86" +ARCH:intel-x86-64 = "x86" # Supported Boards: # ZEPHYR_BOARD ?= "acrn" diff --git a/conf/machine/nrf52840dk-nrf52840.conf b/conf/machine/nrf52840dk-nrf52840.conf index c5be5db..258aa7a 100644 --- a/conf/machine/nrf52840dk-nrf52840.conf +++ b/conf/machine/nrf52840dk-nrf52840.conf @@ -5,4 +5,4 @@ require conf/machine/include/nrf52.inc ZEPHYR_INHERIT_CLASSES += "zephyr-flash-pyocd" -ARCH_nrf52840dk-nrf52840 = "arm" +ARCH:nrf52840dk-nrf52840 = "arm" diff --git a/conf/machine/qemu-cortex-m3.conf b/conf/machine/qemu-cortex-m3.conf index 3a50796..835a775 100644 --- a/conf/machine/qemu-cortex-m3.conf +++ b/conf/machine/qemu-cortex-m3.conf @@ -14,4 +14,4 @@ QB_OPT_APPEND = "-nographic -vga none" QB_CPU = "-cpu cortex-m3" QB_RNG = "" -ARCH_qemu-cortex-m3 = "arm" +ARCH:qemu-cortex-m3 = "arm" diff --git a/conf/machine/qemu-nios2.conf b/conf/machine/qemu-nios2.conf index ab8b366..de20320 100644 --- a/conf/machine/qemu-nios2.conf +++ b/conf/machine/qemu-nios2.conf @@ -13,4 +13,4 @@ QB_MACHINE = "-machine altera_10m50_zephyr" QB_OPT_APPEND = "-nographic" QB_CPU = "-cpu nios2" -ARCH_qemu-nios2 = "nios2" +ARCH:qemu-nios2 = "nios2" diff --git a/conf/machine/qemu-x86.conf b/conf/machine/qemu-x86.conf index 85b3f0d..31ce80d 100644 --- a/conf/machine/qemu-x86.conf +++ b/conf/machine/qemu-x86.conf @@ -11,7 +11,7 @@ ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot" QB_SYSTEM_NAME = "qemu-system-i386" QB_MACHINE = "-machine type=pc-q35-2.10" QB_OPT_APPEND = "-nographic -no-acpi" -QB_CPU_x86 = "-cpu qemu32,+nx,+pae" -QB_CPU_KVM_x86 = "-cpu kvm32" +QB_CPU:x86 = "-cpu qemu32,+nx,+pae" +QB_CPU_KVM:x86 = "-cpu kvm32" -ARCH_qemu-x86 = "x86" +ARCH:qemu-x86 = "x86" diff --git a/recipes-core/newlib/newlib_%.bbappend b/recipes-core/newlib/newlib_%.bbappend index 37ff961..dfecb99 100644 --- a/recipes-core/newlib/newlib_%.bbappend +++ b/recipes-core/newlib/newlib_%.bbappend @@ -3,7 +3,7 @@ # ARC specific # ######################################################################## -LIC_FILES_CHKSUM_arc = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ +LIC_FILES_CHKSUM:arc = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \ @@ -12,11 +12,11 @@ LIC_FILES_CHKSUM_arc = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://newlib/libc/sys/linux/linuxthreads/LICENSE;md5=73640207fbc79b198c7ffd4ad4d97aa0" #Tag arc-2016.03 -SRCREV_arc = "e4da0f88abe8dd2a0b947bcf7cb8b3736ab94f33" -SRC_URI_arc = "git://github.com/foss-for-synopsys-dwc-arc-processors/newlib.git;branch=arc-2.3" -S_arc = "${WORKDIR}/git" +SRCREV:arc = "e4da0f88abe8dd2a0b947bcf7cb8b3736ab94f33" +SRC_URI:arc = "git://github.com/foss-for-synopsys-dwc-arc-processors/newlib.git;branch=arc-2.3" +S:arc = "${WORKDIR}/git" # ERROR: QA Issue: Architecture did not match (195 to 93) -INSANE_SKIP_${PN}_arc += " arch " +INSANE_SKIP:${PN}:arc += " arch " diff --git a/recipes-devtools-arc/binutils/binutils-2.26arc.inc b/recipes-devtools-arc/binutils/binutils-2.26arc.inc index c0c575b..bfe0960 100644 --- a/recipes-devtools-arc/binutils/binutils-2.26arc.inc +++ b/recipes-devtools-arc/binutils/binutils-2.26arc.inc @@ -26,12 +26,12 @@ SRC_URI = "\ S = "${WORKDIR}/git" -do_configure_prepend () { +do_configure:prepend () { rm -rf ${S}/gdb ${S}/libdecnumber ${S}/readline ${S}/sim } CONFIG_SHELL = "/bin/bash" -sysroot_stage_all_append() { +sysroot_stage_all:append() { sysroot_stage_dir ${D}${exec_prefix}/extlib ${SYSROOT_DESTDIR}${exec_prefix}/extlib } diff --git a/recipes-devtools-arc/binutils/binutils-cross-canadian_2.26arc.bb b/recipes-devtools-arc/binutils/binutils-cross-canadian_2.26arc.bb index 24f35fe..88f0ad7 100644 --- a/recipes-devtools-arc/binutils/binutils-cross-canadian_2.26arc.bb +++ b/recipes-devtools-arc/binutils/binutils-cross-canadian_2.26arc.bb @@ -2,6 +2,6 @@ require recipes-devtools/binutils/binutils.inc require recipes-devtools-arc/binutils/binutils-2.26arc.inc require recipes-devtools/binutils/binutils-cross-canadian.inc -do_install_append () { +do_install:append () { rm -f ${D}/${libdir}/../lib/libiberty* } diff --git a/recipes-devtools-arc/binutils/binutils-cross_2.26arc.bb b/recipes-devtools-arc/binutils/binutils-cross_2.26arc.bb index ab266dc..3d94fea 100644 --- a/recipes-devtools-arc/binutils/binutils-cross_2.26arc.bb +++ b/recipes-devtools-arc/binutils/binutils-cross_2.26arc.bb @@ -2,7 +2,7 @@ require recipes-devtools/binutils/binutils.inc require binutils-2.26arc.inc require recipes-devtools/binutils/binutils-cross.inc -SRC_URI_remove = "file://no-tooldirpaths.patch" -SRC_URI_remove = "file://0002-binutils-cross-Do-not-generate-linker-script-directo.patch" +SRC_URI:remove = "file://no-tooldirpaths.patch" +SRC_URI:remove = "file://0002-binutils-cross-Do-not-generate-linker-script-directo.patch" #COMPATIBLE_MACHINE = "arc" diff --git a/recipes-devtools-arc/gcc/gcc-6.x.arc.inc b/recipes-devtools-arc/gcc/gcc-6.x.arc.inc index 6324c50..5b3772e 100644 --- a/recipes-devtools-arc/gcc/gcc-6.x.arc.inc +++ b/recipes-devtools-arc/gcc/gcc-6.x.arc.inc @@ -73,9 +73,9 @@ EXTRA_OECONF_INTERMEDIATE = "\ --disable-libssp \ " -EXTRA_OECONF_append_libc-uclibc = " --disable-decimal-float " +EXTRA_OECONF:append:libc-uclibc = " --disable-decimal-float " -EXTRA_OECONF_append_arc = ' --with-pkgversion="ARCompact/ARCv2 ISA elf32 toolchain ${SRCREV}"' +EXTRA_OECONF:append:arc = ' --with-pkgversion="ARCompact/ARCv2 ISA elf32 toolchain ${SRCREV}"' EXTRA_OECONF_PATHS = "\ --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++/${BINV} \ diff --git a/recipes-devtools-arc/gcc/gcc-cross-canadian_6.x.arc.bb b/recipes-devtools-arc/gcc/gcc-cross-canadian_6.x.arc.bb index 39f837f..bc4a3b3 100644 --- a/recipes-devtools-arc/gcc/gcc-cross-canadian_6.x.arc.bb +++ b/recipes-devtools-arc/gcc/gcc-cross-canadian_6.x.arc.bb @@ -1,8 +1,8 @@ require recipes-devtools-arc/gcc/gcc-${PV}.inc require recipes-devtools/gcc/gcc-cross-canadian.inc -EXTRA_OECONF_append_libc-baremetal = " --without-headers" -EXTRA_OECONF_remove_libc-baremetal = "--with-sysroot=/not/exist" -EXTRA_OECONF_remove_libc-baremetal = "--with-build-sysroot=${STAGING_DIR_TARGET}" -EXTRA_OECONF_append_libc-baremetal = " --enable-plugin " +EXTRA_OECONF:append:libc-baremetal = " --without-headers" +EXTRA_OECONF:remove:libc-baremetal = "--with-sysroot=/not/exist" +EXTRA_OECONF:remove:libc-baremetal = "--with-build-sysroot=${STAGING_DIR_TARGET}" +EXTRA_OECONF:append:libc-baremetal = " --enable-plugin " diff --git a/recipes-devtools-arc/gcc/gcc-cross_6.x.arc .bb b/recipes-devtools-arc/gcc/gcc-cross_6.x.arc .bb index 911a640..6cf71c6 100644 --- a/recipes-devtools-arc/gcc/gcc-cross_6.x.arc .bb +++ b/recipes-devtools-arc/gcc/gcc-cross_6.x.arc .bb @@ -1,10 +1,10 @@ require recipes-devtools-arc/gcc/gcc-6.x.arc.inc require recipes-devtools/gcc/gcc-cross.inc -DEPENDS_remove_libc-baremetal := "virtual/${TARGET_PREFIX}libc-for-gcc" -EXTRA_OECONF_append_libc-baremetal = " --without-headers" -EXTRA_OECONF_remove_libc-baremetal = "--with-sysroot=/not/exist" -EXTRA_OECONF_remove_libc-baremetal = "--enable-threads=posix" +DEPENDS:remove:libc-baremetal := "virtual/${TARGET_PREFIX}libc-for-gcc" +EXTRA_OECONF:append:libc-baremetal = " --without-headers" +EXTRA_OECONF:remove:libc-baremetal = "--with-sysroot=/not/exist" +EXTRA_OECONF:remove:libc-baremetal = "--enable-threads=posix" #COMPATIBLE_MACHINE = "arc" diff --git a/recipes-devtools-arc/gcc/libgcc_6.x.arc.bb b/recipes-devtools-arc/gcc/libgcc_6.x.arc.bb index 4cc4833..2ad8d34 100644 --- a/recipes-devtools-arc/gcc/libgcc_6.x.arc.bb +++ b/recipes-devtools-arc/gcc/libgcc_6.x.arc.bb @@ -4,11 +4,11 @@ require recipes-devtools/gcc/libgcc.inc INHIBIT_PACKAGE_DEBUG_SPLIT = "1" #COMPATIBLE_MACHINE = "arc" -EXTRA_OECONF_append_arc = " --disable-multilib" +EXTRA_OECONF:append:arc = " --disable-multilib" #EXTRA_OECONF_append_arc = " --enable-multilib" # ERROR: QA Issue: Architecture did not match (195 to 93) -INSANE_SKIP_${PN}-dev += "arch" +INSANE_SKIP:${PN}-dev += "arch" # ERROR: QA Issue: non -staticdev package contains static .a library -INSANE_SKIP_${PN}-dev += "staticdev" +INSANE_SKIP:${PN}-dev += "staticdev" diff --git a/recipes-devtools/gcc/gcc-cross_6.%.bbappend b/recipes-devtools/gcc/gcc-cross_6.%.bbappend index 0bf8c24..2b2c713 100644 --- a/recipes-devtools/gcc/gcc-cross_6.%.bbappend +++ b/recipes-devtools/gcc/gcc-cross_6.%.bbappend @@ -1 +1 @@ -EXTRA_OECONF_append_armv7m = " --with-arch=armv7-m --with-mode=thumb " +EXTRA_OECONF:append:armv7m = " --with-arch=armv7-m --with-mode=thumb " diff --git a/recipes-devtools/gcc/libgcc_6.%.bbappend b/recipes-devtools/gcc/libgcc_6.%.bbappend index 5c3fd1f..80bb46c 100644 --- a/recipes-devtools/gcc/libgcc_6.%.bbappend +++ b/recipes-devtools/gcc/libgcc_6.%.bbappend @@ -1,3 +1,3 @@ -EXTRA_OECONF_remove = "--enable_multilib" -EXTRA_OECONF_append = " --disable-multilib" +EXTRA_OECONF:remove = "--enable_multilib" +EXTRA_OECONF:append = " --disable-multilib" diff --git a/recipes-devtools/qemu/qemu_%.bbappend b/recipes-devtools/qemu/qemu_%.bbappend index 9f5a981..4f8cc05 100644 --- a/recipes-devtools/qemu/qemu_%.bbappend +++ b/recipes-devtools/qemu/qemu_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" QEMU_TARGETS = "" @@ -6,8 +6,8 @@ QEMU_TARGETS = "" # file://nios2-add-support.patch \ # " -EXTRA_OECONF_remove = "--target-list" +EXTRA_OECONF:remove = "--target-list" #QEMUS_BUILT = "arm-softmmu i386-softmmu nios2-softmmu" QEMUS_BUILT = "arm-softmmu i386-softmmu" -EXTRA_OECONF_append = " --target-list="${QEMUS_BUILT}"" +EXTRA_OECONF:append = " --target-list="${QEMUS_BUILT}"" diff --git a/recipes-kernel/zephyr-kernel/zephyr-coap-client.bb b/recipes-kernel/zephyr-kernel/zephyr-coap-client.bb index 4140c0f..1c79dbe 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-coap-client.bb +++ b/recipes-kernel/zephyr-kernel/zephyr-coap-client.bb @@ -2,4 +2,4 @@ include zephyr-sample.inc ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/coap_client" -ZEPHYR_MODULES_append = "\;${S}/modules/lib/mbedtls" +ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls" diff --git a/recipes-kernel/zephyr-kernel/zephyr-coap-server.bb b/recipes-kernel/zephyr-kernel/zephyr-coap-server.bb index f7d75c0..7100f96 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-coap-server.bb +++ b/recipes-kernel/zephyr-kernel/zephyr-coap-server.bb @@ -2,4 +2,4 @@ include zephyr-sample.inc ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/coap_server" -ZEPHYR_MODULES_append = "\;${S}/modules/lib/mbedtls" +ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls" diff --git a/recipes-kernel/zephyr-kernel/zephyr-echo-client.bb b/recipes-kernel/zephyr-kernel/zephyr-echo-client.bb index c17e1e7..e7fcaab 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-echo-client.bb +++ b/recipes-kernel/zephyr-kernel/zephyr-echo-client.bb @@ -2,4 +2,4 @@ include zephyr-sample.inc ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/echo_client" -ZEPHYR_MODULES_append = "\;${S}/modules/lib/mbedtls" +ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls" diff --git a/recipes-kernel/zephyr-kernel/zephyr-http-client.bb b/recipes-kernel/zephyr-kernel/zephyr-http-client.bb index cf3c322..d06ad37 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-http-client.bb +++ b/recipes-kernel/zephyr-kernel/zephyr-http-client.bb @@ -2,4 +2,4 @@ include zephyr-sample.inc ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/http_client" -ZEPHYR_MODULES_append = "\;${S}/modules/lib/mbedtls" +ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls" diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc b/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc index 7d44b97..5ae7504 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc +++ b/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc @@ -27,19 +27,19 @@ EXTRA_OECMAKE = "\ " ZEPHYR_MODULES = "" -ZEPHYR_MODULES_append_arm = "\;${S}/modules/cmsis" -ZEPHYR_MODULES_append_nordic = "\;${S}/modules/hal/nordic" -ZEPHYR_MODULES_append_stm32 = "\;${S}/modules/hal/stm32" -ZEPHYR_MODULES_append_openamp = "\;${S}/modules/lib/open-amp\;${S}/modules/hal/libmetal" +ZEPHYR_MODULES:append:arm = "\;${S}/modules/cmsis" +ZEPHYR_MODULES:append:nordic = "\;${S}/modules/hal/nordic" +ZEPHYR_MODULES:append:stm32 = "\;${S}/modules/hal/stm32" +ZEPHYR_MODULES:append:openamp = "\;${S}/modules/lib/open-amp\;${S}/modules/hal/libmetal" -EXTRA_OECMAKE_append = " -DZEPHYR_MODULES=${ZEPHYR_MODULES}" +EXTRA_OECMAKE:append = " -DZEPHYR_MODULES=${ZEPHYR_MODULES}" export ZEPHYR_BASE="${S}" DEPENDS += "gperf-native python3-pyelftools-native python3-pyyaml-native python3-pykwalify-native" CROSS_COMPILE = "${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}" -DEPENDS_append_qemuall = " qemu-native qemu-helper-native" +DEPENDS:append:qemuall = " qemu-native qemu-helper-native" # The makefiles are explicit about the flags they want, so don't unset # them so zephyr flags actually get used. @@ -61,7 +61,7 @@ OE_TERMINAL_EXPORTS += "ZEPHYR_GCC_VARIANT" IMAGE_FSTYPES = "elf bin" -do_configure_prepend() { +do_configure:prepend() { # Zephyr expects CPPFLAGS as cmake argument as and ignores env variables. unset CPPFLAGS } diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.5.0.inc b/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.5.0.inc index 35bafdf..be75362 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.5.0.inc +++ b/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.5.0.inc @@ -12,6 +12,6 @@ SRCREV_mbedtls = "24d84ecff195fb15c889d9046e44e4804d626c67" ZEPHYR_BRANCH = "main" PV = "2.5.0+git${SRCPV}" -SRC_URI_append = " file://0001-zephyr-2.5.0-cmake-add-yocto-toolchain.patch \ +SRC_URI:append = " file://0001-zephyr-2.5.0-cmake-add-yocto-toolchain.patch \ file://0001-x86-fix-efi-binary-generation-issue-in-cross-compila.patch \ " diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.0.inc b/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.0.inc index 091c057..63665bf 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.0.inc +++ b/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.0.inc @@ -12,7 +12,7 @@ SRCREV_mbedtls = "5765cb7f75a9973ae9232d438e361a9d7bbc49e7" ZEPHYR_BRANCH = "v2.6-branch" PV = "2.6.0+git${SRCPV}" -SRC_URI_append = " file://0001-cmake-add-yocto-toolchain.patch \ +SRC_URI:append = " file://0001-cmake-add-yocto-toolchain.patch \ file://0001-x86-fix-efi-binary-generation-issue-in-cross-compila.patch \ file://arduino-nano-33-ble-storage-partition.patch \ " diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel-src.bb b/recipes-kernel/zephyr-kernel/zephyr-kernel-src.bb index 210cfa7..92d277d 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-kernel-src.bb +++ b/recipes-kernel/zephyr-kernel/zephyr-kernel-src.bb @@ -14,6 +14,6 @@ do_install () { } PACKAGES = "${PN}" -FILES_${PN} = "/usr/src/zephyr" +FILES:${PN} = "/usr/src/zephyr" SYSROOT_DIRS += "/usr/src/zephyr" diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc b/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc index a0004ed..950966e 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc +++ b/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc @@ -6,7 +6,7 @@ inherit cmake # This file might be included from other places (like other layers) and not # having an explicit path to the patches directory, will make bitbake fail to # find the patch(es) in SRC_URI. -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI = "\ git://github.com/zephyrproject-rtos/zephyr.git;protocol=https;branch=${ZEPHYR_BRANCH};name=default \ diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel-test.inc b/recipes-kernel/zephyr-kernel/zephyr-kernel-test.inc index 78747f9..f970225 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-kernel-test.inc +++ b/recipes-kernel/zephyr-kernel/zephyr-kernel-test.inc @@ -1,21 +1,21 @@ -ZEPHYRTESTS_remove = "fifo fpu_sharing lifo mbox mem_heap mem_pool \ +ZEPHYRTESTS:remove = "fifo fpu_sharing lifo mbox mem_heap mem_pool \ mem_protect mem_slab msgq mutex pipe profiling sched semaphore \ stack threads tickless timer workq" # Exclude tests which does not build for various reasons -ZEPHYRTESTS_remove = "gen_isr_table spinlock smp mp" +ZEPHYRTESTS:remove = "gen_isr_table spinlock smp mp" # test_context will fail because QEMU for ARM does not emulate CortexM3 BASEPRI register -#ZEPHYRTESTS_remove_arm += "" +#ZEPHYRTESTS:remove:arm += "" # test_critical never finishes in an unpatched QEMU either -#ZEPHYRTESTS_remove_arm += "" +#ZEPHYRTESTS:remove:arm += "" #Remove ARM specific tests -#ZEPHYRTESTS_remove_x86 += "" +#ZEPHYRTESTS:remove:x86 += "" #Remove tests not intended for Nios2 -#ZEPHYRTESTS_remove_nios2 += "" +#ZEPHYRTESTS:remove:nios2 += "" # List of all available kernel tests ZEPHYRTESTS = " \ diff --git a/recipes-kernel/zephyr-kernel/zephyr-mqtt-publisher.bb b/recipes-kernel/zephyr-kernel/zephyr-mqtt-publisher.bb index b4e3067..02b3c16 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-mqtt-publisher.bb +++ b/recipes-kernel/zephyr-kernel/zephyr-mqtt-publisher.bb @@ -2,4 +2,4 @@ include zephyr-sample.inc ZEPHYR_SRC_DIR = "${S}/samples/net/mqtt_publisher" -ZEPHYR_MODULES_append = "\;${S}/modules/lib/mbedtls" +ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls" diff --git a/recipes-kernel/zephyr-kernel/zephyr-openthread-echo-client.bb b/recipes-kernel/zephyr-kernel/zephyr-openthread-echo-client.bb index 49f5565..88922b8 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-openthread-echo-client.bb +++ b/recipes-kernel/zephyr-kernel/zephyr-openthread-echo-client.bb @@ -2,8 +2,8 @@ include zephyr-sample.inc ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/echo_client" -ZEPHYR_MODULES_append = "\;${S}/modules/lib/mbedtls" -ZEPHYR_MODULES_append = "\;${S}/modules/lib/openthread" +ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls" +ZEPHYR_MODULES:append = "\;${S}/modules/lib/openthread" EXTRA_OECMAKE += "-DOVERLAY_CONFIG=overlay-ot.conf" diff --git a/recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb b/recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb index 8be90d1..045ea36 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb +++ b/recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb @@ -2,4 +2,4 @@ include zephyr-sample.inc ZEPHYR_SRC_DIR = "${S}/samples/bluetooth/peripheral_esp" -ZEPHYR_MODULES_append = "\;${S}/modules/crypto/tinycrypt" +ZEPHYR_MODULES:append = "\;${S}/modules/crypto/tinycrypt" diff --git a/recipes-kernel/zephyr-kernel/zephyr-peripheral-hr.bb b/recipes-kernel/zephyr-kernel/zephyr-peripheral-hr.bb index e6ef7b8..64fd0ec 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-peripheral-hr.bb +++ b/recipes-kernel/zephyr-kernel/zephyr-peripheral-hr.bb @@ -2,4 +2,4 @@ include zephyr-sample.inc ZEPHYR_SRC_DIR = "${S}/samples/bluetooth/peripheral_hr" -ZEPHYR_MODULES_append = "\;${S}/modules/crypto/tinycrypt" +ZEPHYR_MODULES:append = "\;${S}/modules/crypto/tinycrypt" diff --git a/recipes-kernel/zephyr-kernel/zephyr-websocket-client.bb b/recipes-kernel/zephyr-kernel/zephyr-websocket-client.bb index 428f75e..85f2cda 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-websocket-client.bb +++ b/recipes-kernel/zephyr-kernel/zephyr-websocket-client.bb @@ -2,4 +2,4 @@ include zephyr-sample.inc ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/websocket_client" -ZEPHYR_MODULES_append = "\;${S}/modules/lib/mbedtls" +ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls" -- 2.17.1
|
|
|
|
Re: [meta-rockchip][PATCH v2 1/2] layer: Convert to new override syntax
On 8/4/21 10:53 AM, Trevor Woerner wrote:
There are still some cases which are being missed. For example, this patchsounds good.
|
|
|
|
Yocto Technical Team Minutes, Engineering Sync, for August 3 2021
Trevor Woerner
Yocto Technical Team Minutes, Engineering Sync, for August 3 2021
archive: https://docs.google.com/document/d/1ly8nyhO14kDNnFcW2QskANXW3ZT7QwKC5wWVDg9dDH4/edit == disclaimer == Best efforts are made to ensure the below is accurate and valid. However, errors sometimes happen. If any errors or omissions are found, please feel free to reply to this email with any corrections. == attendees == Trevor Woerner, Stephen Jolley, Richard Elberger, Saul Wold, Scott Murray, Steve Sakoman, Tim Orling, Trevor Gamblin, Armin Kuster, Richard Purdie, Joshua Watt, Michael Halstead, Jan-Simon Möller, Rob Woolley, Denys Dmytriyenko, Tony Tascioglu, Randy MacLeod, Michael Opdenacker, Philip Balister == project status == - 3.4 m2 (honister) released - 3.3.2 (hardknott) through QA, pending release approval - 3.1.10 (dunfell) in QA - new syntax change is in, all layers need to update to new syntax - older releases of bitbake support the new syntax too (includes dunfell) - layer compatibility updated to honister - fix to bitbake’s datastore pending - prserv rewrite still ongoing - some AB-INT issues - multiconfig still not 100% == discussion == RP: big change to override syntax. fallout period ongoing RP: subtle datastore bug in bitbake fixed (identified by Ross last year). there might be some fallout. if you have a variable that isn’t assigned a default value (or anything) but does have a conditional override (e.g. _append) then it changes the value from “” to None. one such case was found in all of oe-core (DRIDRIVERS in mesa), but others might exist in other layers JPEW: so now only the new override syntax is valid in master? RP: yes. i added some checks in bitbake so it will now error if it finds _append, _prepend, _remove. this doesn’t catch all instances of old syntax, obviously, but it’s a good basic check ScottM: will the syntax changes be backported in oe-core? RP: there are no plans to do it in oe-core ScottM: it would help with cherry-picking RP: there are other incompatible changes that would make it hard/impossible to backport the override syntax change to older branches TrevorW: i’ve noticed a couple examples of overrides that don’t seem to work when updated to the new syntax. in conf/layer.conf BBFILE_PATTERN_<layer> aren’t overrides? RP: no. the things in conf/layer.conf aren’t overrides. also IMAGE_TYPEDEP isn’t (…yet). there’s a chance we might reconsider some TrevorW: and SRCREV_<name>? RP: yes. SRCREV_<name> is not, but SRCREV_pn-${PN} is an override Elberger: is there a list? RP: i have a list… in my head, there’s things in the manual, but we should probably add more notes. we should add it to the migration guide Elberger: it would be nice to make it consistent RP: this is the first step, i think there will be follow-on steps. we changed tune variables into overrides for example, but they’re not always overrides TrevorW: these inconsistencies are a great reason to do the syntax change TimO: this change provided a nice to opportunity learn more deeply about overrides and override syntax MO: nice that the project isn’t mired in the past, it is able to make such changes RP: i’ve added a MAINTAINERS.md file in oe-core. it doesn’t give exclusive ownership over an area of the project; i will, for example, apply patches that i think are okay if maintainer feedback isn’t forthcoming. we’re basically trying to document tribal knowledge; wanting to document the list of people who are knowledgeable in various areas. we’re also trying to encourage people to take ownership in various areas. this list shouldn’t describe any changes to what people already know. ScottM: (re: prserv) am now able to reproduce some of the bugs that have been reported by others and that we’ve seen on the AB. i have ruled out a bunch of stuff. the issues seem to start at python 3.8 (rather than 3.9 as we were expecting) JPEW: is it still related to exiting? ScottM: that still happens, but this is something else. after the prexport.bbclass cases run other things are stuck waiting. it looks like a message might be getting dropped JPEW: how large is the message? ScottM: that’s what i thought too. but they’re not very large. maybe 100 bytes? hash + prnumber + packaging. there’s probably more than 1 bug at play. looking through Paul’s stuff there’s also a case where something gets shut down, but other things are left waiting for it to shut down RP: (to the OE board) were there any discussions to promote OE membership (the oe tsc election is coming up) Denys: we discussed this at our last meeting Philip: we need to figure out how to recruit members, we’re looking for people active in the community. we would like to get feedback on how to attract more members. RP: it’s not obvious that OE has a membership, or what its benefits might be. i don’t think people who are new to the project know about OE, what it is, why to join, how to join Denys: we used to have developer meetings (OEDEM/OEDAM) but we don’t have that now, those would include general assemblies. Philip: if you want to become a member send an email including a bio and reason why you want to join to board@... and we can vote on it RP: maybe a reminder to various mailing lists would be good too ScottM: do we have a booth at ELC? TrevorW: check with David Reyna, i think he’s working on getting one MO: is it okay to update the docs with the new override updates? RP: yes. i had said “hold off” a week ago, but now that’s it’s in we should go ahead with the changes to the main yocto docs
|
|
|
|
Yocto Technical Team Minutes, Engineering Sync, for July 27 2021
Trevor Woerner
Yocto Technical Team Minutes, Engineering Sync, for July 27 2021
archive: https://docs.google.com/document/d/1ly8nyhO14kDNnFcW2QskANXW3ZT7QwKC5wWVDg9dDH4/edit == disclaimer == Best efforts are made to ensure the below is accurate and valid. However, errors sometimes happen. If any errors or omissions are found, please feel free to reply to this email with any corrections. == attendees == Trevor Woerner, Stephen Jolley, Scott Murray, Bruce Ashfield, Joshua Watt, Armin Kuster, Steve Sakoman, Randy MacLeod, Michael Opdenacker, Paul Barker, Michael Halstead, Richard Purdie, Tim Orling, Alejandro Hernandez, Denys Dmytriyenko, Tony Tascioglu, Trevor Gamblin == project status == - 3.4 m2 built but QA issues - 3.3.2 is being built - new override syntax added, conversions can start - proposal to add lz4c, zstd, and pzstd to host commands - prserv rewrite making process but still issues with asyncio - AB-INT issues - multiconfig needs simpler test cases to track down issues == discussion == RP: the override syntax change was merged; nobody seemed to notice. layers need to start doing the conversions; there are conversion scripts but they’re a bit too overzealous (doing conversions where they’re not needed) MO: could we just search+replace? RP: it’s hard to programmatically determine what is an override and what isn’t. an underscore is an accepted symbol in many areas and is also an override qualifier. i have a whole bunch of stuff working, but it’s hard to find things that aren’t found/converted by the script. i hope layers will be converted quickly (layers outside of core) TrevorW: what’s the script name and where do we find it? RP: in master-next scripts/contrib/convert-overrides.py. i’ve put comments in to help, there are some changes that are needed (e.g. removing hard-coded paths). also ARCH overrides are particularly hard to do, so i’ve mostly done them by hand PaulB: will the new syntax be backported to dunfell and hardknott? RP: dunfell onwards <various>: good! Armin: layers need to be fixed up in dunfell RP: only if you’re trying to make your dunfell branch work with master PaulB: what happens if you mix and match RP: it will error out and not parse, the colon was not a legal character previously so it will fail PaulB: noisy errors are the best RP: m2 now in QA. there is an issue with systemtap not working on Intel. no details from the QA team to figure out what went wrong. also there is a runtime issue on beaglebone-yocto to do with the keyboard. there’s a backlog building up for QA (3.3.2 and 3.1.10). we’re a bit down on AB power ScottM: are there bugzilla entries for those two? RP: yes. odd that the systemtap issue didn’t pop up on the AB PaulB: it looks like a 64 vs 32 bit issue. the register names indicate 64-bit but it’s pulling in a 32-bit header? RP: hmm. that looks like that’s the case ScottM: there should be a new rev of prserv patch later today PaulB: mixin layers. is that the way to go or do we want 1 layer? RP: i prefer mixins, then we can distribute maintainership more easily. adding mixin layers can get messy, which is good since i’d rather have users have to think about what they’re mixing in PaulB: if the mixins are orthnogonal then they should work easily together RP: yes, if they’re orthogonal, but how do you ensure that? TimO: any news on a next yocto conference/devday? TrevorW: plans are in the works PaulB: is there a place with a list of YP-related talks at elc? TrevorW: not that i know of PaulB: i’ll put the list together on the wiki and post to irc https://wiki.yoctoproject.org/wiki/Embedded_Linux_Conference_2021 RP: and mailing list too please TimO: some of us have started posting our links to irc RP: JPEW will be giving a presentation at an LF security supply-chain event. this will be good to help advocacy https://events.linuxfoundation.org/supply-chain-town-hall/ JPEW: i’ll be discussing reproducible builds and sw build materials (aug 18) RP: it would be nice if you could add cve tracking too JPEW: SS can help RP: we have pretty graphs TrevorW: the advocacy people have been wondering if YP should advertise at Embedded World ScottM: ask J-SM i think he has attended (as a part of the AGL) MO: and/or we could give YP-related talks
|
|
|
|
Re: [meta-rockchip][PATCH v2 1/2] layer: Convert to new override syntax
Trevor Woerner
There are still some cases which are being missed. For example, this patch
doesn't build successfully for marsboard-rk3066, rock2-square, and tinker-board. I had been working on a similar patch yesterday as well which I had been build-testing and run-testing when your patches came in ;-) I've added your SOB to them since they're so similar.
|
|
|
|
[meta-rockchip][PATCH 2/2] switch to the new bitbake OVERRIDE syntax
Trevor Woerner
With bitbake commit 7dcf317cc141dc980634f8c18bfa84f83e57206a
("bitbake: Switch to using new override syntax"), applied on Aug 2, 2021, the OVERRIDE separator is now a colon instead of an underscore. Therefore all builds performed with a bitbake before this change must use a meta-rockchip commit before this one, and any builds performed with a bitbake after this change must use a meta-rockchip starting from this commit onwards. Build-tested for all meta-rockchip MACHINEs. Run tested on: - tinker-board - nanopi-m4-2gb - rock64 - rock-pi-4b - rock-pi-e The tinker-board and rock-pi-e work fine. The rest of the boards seem to have a, hopefully unrelated, issue running a 5.13-yocto-standard kernel. However, all boards work with the 5.10-yocto-standard kernel. Signed-off-by: Trevor Woerner <twoerner@...> Signed-off-by: Khem Raj <raj.khem@...> --- classes/rockchip-gpt-img.bbclass | 6 ++-- conf/machine/include/rk3288.inc | 2 +- conf/machine/include/rk3328.inc | 2 +- conf/machine/include/rk3399.inc | 2 +- conf/machine/include/rockchip-defaults.inc | 2 +- conf/machine/include/rockchip-wic.inc | 2 +- conf/machine/rock-pi-e.conf | 4 +-- .../recipes-qt/qt5/qtbase_%.bbappend | 10 +++---- .../trusted-firmware-a_%.bbappend | 8 +++--- recipes-bsp/u-boot/u-boot%.bbappend | 10 +++---- recipes-graphics/mesa/mesa_%.bbappend | 4 +-- recipes-kernel/linux/linux-yocto%.bbappend | 28 +++++++++---------- recipes-kernel/linux/linux-yocto_5.4.bbappend | 4 +-- 13 files changed, 42 insertions(+), 42 deletions(-) diff --git a/classes/rockchip-gpt-img.bbclass b/classes/rockchip-gpt-img.bbclass index 3ee46c8..434c100 100644 --- a/classes/rockchip-gpt-img.bbclass +++ b/classes/rockchip-gpt-img.bbclass @@ -37,10 +37,10 @@ do_image_rockchip_gpt_img[depends] = "parted-native:do_populate_sysroot \ virtual/kernel:do_deploy \ virtual/bootloader:do_deploy" -PER_CHIP_IMG_GENERATION_COMMAND_rk3288 = "generate_rk3288_loader1_image" -PER_CHIP_IMG_GENERATION_COMMAND_rock2-square = "generate_rock2_loader1_image" +PER_CHIP_IMG_GENERATION_COMMAND:rk3288 = "generate_rk3288_loader1_image" +PER_CHIP_IMG_GENERATION_COMMAND:rock2-square = "generate_rock2_loader1_image" -IMAGE_CMD_rockchip-gpt-img () { +IMAGE_CMD:rockchip-gpt-img () { # Change to image directory cd ${DEPLOY_DIR_IMAGE} diff --git a/conf/machine/include/rk3288.inc b/conf/machine/include/rk3288.inc index 6b5f70a..017f9d7 100644 --- a/conf/machine/include/rk3288.inc +++ b/conf/machine/include/rk3288.inc @@ -12,5 +12,5 @@ SERIAL_CONSOLES = "115200;ttyS2" KBUILD_DEFCONFIG ?= "multi_v7_defconfig" KERNEL_IMAGETYPE = "zImage" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" +PREFERRED_PROVIDER:virtual/bootloader ?= "u-boot" UBOOT_SUFFIX ?= "bin" diff --git a/conf/machine/include/rk3328.inc b/conf/machine/include/rk3328.inc index 70261a0..70189f1 100644 --- a/conf/machine/include/rk3328.inc +++ b/conf/machine/include/rk3328.inc @@ -20,4 +20,4 @@ TFA_BUILD_TARGET = "bl31" UBOOT_SUFFIX ?= "itb" UBOOT_ENTRYPOINT ?= "0x06000000" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" +PREFERRED_PROVIDER:virtual/bootloader ?= "u-boot" diff --git a/conf/machine/include/rk3399.inc b/conf/machine/include/rk3399.inc index 3fc712f..4149092 100644 --- a/conf/machine/include/rk3399.inc +++ b/conf/machine/include/rk3399.inc @@ -20,4 +20,4 @@ TFA_BUILD_TARGET = "bl31" UBOOT_SUFFIX ?= "itb" UBOOT_ENTRYPOINT ?= "0x06000000" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" +PREFERRED_PROVIDER:virtual/bootloader ?= "u-boot" diff --git a/conf/machine/include/rockchip-defaults.inc b/conf/machine/include/rockchip-defaults.inc index 905b2a6..455cca8 100644 --- a/conf/machine/include/rockchip-defaults.inc +++ b/conf/machine/include/rockchip-defaults.inc @@ -5,7 +5,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" KCONFIG_MODE ?= "alldefconfig" # xserver -PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +PREFERRED_PROVIDER:virtual/xserver = "xserver-xorg" XSERVER = " \ xserver-xorg \ xserver-xorg-utils \ diff --git a/conf/machine/include/rockchip-wic.inc b/conf/machine/include/rockchip-wic.inc index 61d9f3d..b5939f7 100644 --- a/conf/machine/include/rockchip-wic.inc +++ b/conf/machine/include/rockchip-wic.inc @@ -23,7 +23,7 @@ RK_CONSOLE_DEVICE ?= "${@d.getVar('SERIAL_CONSOLES').split(';')[1].split()[0]}" # boot device (sd-card/emmc) RK_BOOT_DEVICE ??= "mmcblk0" -WICVARS_append = " \ +WICVARS:append = " \ RK_BOOT_DEVICE \ RK_CONSOLE_BAUD \ RK_CONSOLE_DEVICE \ diff --git a/conf/machine/rock-pi-e.conf b/conf/machine/rock-pi-e.conf index 9cd3ed4..7f49c9f 100644 --- a/conf/machine/rock-pi-e.conf +++ b/conf/machine/rock-pi-e.conf @@ -7,9 +7,9 @@ require conf/machine/include/rk3328.inc MACHINEOVERRIDES =. "rock-pi-e:" -PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev" +PREFERRED_PROVIDER:virtual/kernel = "linux-yocto-dev" KERNEL_DEVICETREE = "rockchip/rk3328-rock-pi-e.dtb" MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot" +PREFERRED_PROVIDER:virtual/bootloader = "u-boot" UBOOT_MACHINE = "rock-pi-e-rk3328_defconfig" diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend index a977229..0ced545 100644 --- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend +++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend @@ -1,9 +1,9 @@ -PACKAGECONFIG_GL_rk3399 = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'gl', \ +PACKAGECONFIG_GL:rk3399 = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'gl', \ bb.utils.contains('DISTRO_FEATURES', 'opengl', 'eglfs gles2', \ '', d), d)}" -PACKAGECONFIG_GL_append_rk3399 = " kms gbm" +PACKAGECONFIG_GL:append:rk3399 = " kms gbm" -PACKAGECONFIG_FONTS_rk3399 = "fontconfig" +PACKAGECONFIG_FONTS:rk3399 = "fontconfig" -PACKAGECONFIG_append_rk3399 = " libinput examples tslib xkbcommon" -PACKAGECONFIG_remove_rk3399 = "tests" +PACKAGECONFIG:append:rk3399 = " libinput examples tslib xkbcommon" +PACKAGECONFIG:remove:rk3399 = "tests" diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index c90673e..f7777a7 100644 --- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -1,11 +1,11 @@ # Rockchip RK3399 compiles some M0 firmware which requires an arm-none-eabi GCC # toolchain -DEPENDS_append_rk3399 = " virtual/arm-none-eabi-gcc-native" +DEPENDS:append:rk3399 = " virtual/arm-none-eabi-gcc-native" -COMPATIBLE_MACHINE_append_rk3399 = "|rk3399" -COMPATIBLE_MACHINE_append_rk3328 = "|rk3328" +COMPATIBLE_MACHINE:append:rk3399 = "|rk3399" +COMPATIBLE_MACHINE:append:rk3328 = "|rk3328" -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "\ file://serial-console-baudrate.patch \ file://0001-Fix-build-with-gcc-11.patch \ diff --git a/recipes-bsp/u-boot/u-boot%.bbappend b/recipes-bsp/u-boot/u-boot%.bbappend index 95c019d..7916e45 100644 --- a/recipes-bsp/u-boot/u-boot%.bbappend +++ b/recipes-bsp/u-boot/u-boot%.bbappend @@ -1,4 +1,4 @@ -do_compile_append_rock2-square () { +do_compile:append:rock2-square () { # copy to default search path if [ "${SPL_BINARY}" = "u-boot-spl-dtb.bin" ]; then cp ${B}/spl/${SPL_BINARY} ${B} @@ -7,10 +7,10 @@ do_compile_append_rock2-square () { ATF_DEPENDS ??= "" -EXTRA_OEMAKE_append_rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf" -ATF_DEPENDS_rk3399 = " virtual/trusted-firmware-a:do_deploy" -EXTRA_OEMAKE_append_rk3328 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3328.elf" -ATF_DEPENDS_rk3328 = " virtual/trusted-firmware-a:do_deploy" +EXTRA_OEMAKE:append:rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf" +ATF_DEPENDS:rk3399 = " virtual/trusted-firmware-a:do_deploy" +EXTRA_OEMAKE:append:rk3328 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3328.elf" +ATF_DEPENDS:rk3328 = " virtual/trusted-firmware-a:do_deploy" do_compile[depends] .= "${ATF_DEPENDS}" diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend index 3e8711c..b9089c9 100644 --- a/recipes-graphics/mesa/mesa_%.bbappend +++ b/recipes-graphics/mesa/mesa_%.bbappend @@ -1,2 +1,2 @@ -PACKAGECONFIG_append_rk3288 = " kmsro panfrost" -PACKAGECONFIG_append_rk3399 = " kmsro panfrost" +PACKAGECONFIG:append:rk3288 = " kmsro panfrost" +PACKAGECONFIG:append:rk3399 = " kmsro panfrost" diff --git a/recipes-kernel/linux/linux-yocto%.bbappend b/recipes-kernel/linux/linux-yocto%.bbappend index c2fe9ad..cf63a30 100644 --- a/recipes-kernel/linux/linux-yocto%.bbappend +++ b/recipes-kernel/linux/linux-yocto%.bbappend @@ -1,17 +1,17 @@ -COMPATIBLE_MACHINE_marsboard-rk3066 = "marsboard-rk3066" -COMPATIBLE_MACHINE_rock2-square = "rock2-square" -COMPATIBLE_MACHINE_radxarock = "radxarock" -COMPATIBLE_MACHINE_firefly-rk3288 = "firefly-rk3288" -COMPATIBLE_MACHINE_vyasa-rk3288 = "vyasa-rk3288" -COMPATIBLE_MACHINE_tinker-board = "tinker-board" -COMPATIBLE_MACHINE_tinker-board-s = "tinker-board-s" -COMPATIBLE_MACHINE_rock-pi-4 = "rock-pi-4" -COMPATIBLE_MACHINE_nanopi-m4 = "nanopi-m4" -COMPATIBLE_MACHINE_nanopi-m4-2gb = "nanopi-m4-2gb" -COMPATIBLE_MACHINE_rock64 = "rock64" -COMPATIBLE_MACHINE_rock-pi-e = "rock-pi-e" +COMPATIBLE_MACHINE:marsboard-rk3066 = "marsboard-rk3066" +COMPATIBLE_MACHINE:rock2-square = "rock2-square" +COMPATIBLE_MACHINE:radxarock = "radxarock" +COMPATIBLE_MACHINE:firefly-rk3288 = "firefly-rk3288" +COMPATIBLE_MACHINE:vyasa-rk3288 = "vyasa-rk3288" +COMPATIBLE_MACHINE:tinker-board = "tinker-board" +COMPATIBLE_MACHINE:tinker-board-s = "tinker-board-s" +COMPATIBLE_MACHINE:rock-pi-4 = "rock-pi-4" +COMPATIBLE_MACHINE:nanopi-m4 = "nanopi-m4" +COMPATIBLE_MACHINE:nanopi-m4-2gb = "nanopi-m4-2gb" +COMPATIBLE_MACHINE:rock64 = "rock64" +COMPATIBLE_MACHINE:rock-pi-e = "rock-pi-e" -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" # indeed applicable to all rk3328 boards -SRC_URI_append_rock64 = " file://0001-ayufan-dtsi-rk3328-add-mmc0-mmc1-aliases.patch" +SRC_URI:append:rock64 = " file://0001-ayufan-dtsi-rk3328-add-mmc0-mmc1-aliases.patch" diff --git a/recipes-kernel/linux/linux-yocto_5.4.bbappend b/recipes-kernel/linux/linux-yocto_5.4.bbappend index e832529..31f118e 100644 --- a/recipes-kernel/linux/linux-yocto_5.4.bbappend +++ b/recipes-kernel/linux/linux-yocto_5.4.bbappend @@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" # tinker-board and tinker-board-s. rk3288 covers both -SRC_URI_append_rk3288 = " file://0001-ARM-dts-rockchip-Keep-rk3288-tinker-SD-card-IO-power.patch" +SRC_URI:append:rk3288 = " file://0001-ARM-dts-rockchip-Keep-rk3288-tinker-SD-card-IO-power.patch" -- 2.30.0.rc0
|
|
|
|
[meta-rockchip][PATCH 1/2] layer.conf: update layer compatibility for honister
Trevor Woerner
Add honister, remove hardknott.
Signed-off-by: Trevor Woerner <twoerner@...> Signed-off-by: Khem Raj <raj.khem@...> --- conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/layer.conf b/conf/layer.conf index f97fb69..25b0a99 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -14,7 +14,7 @@ BBFILE_PRIORITY_rockchip = "1" # This should only be incremented on significant changes that will # cause compatibility issues with other layers LAYERVERSION_rockchip = "1" -LAYERSERIES_COMPAT_rockchip = "hardknott" +LAYERSERIES_COMPAT_rockchip = "honister" LAYERDEPENDS_rockchip = "core meta-arm" BBFILES_DYNAMIC += " \ -- 2.30.0.rc0
|
|
|
|
Re: [oe][meta-security][PATCH] meta: Fix typos
Martin Jansa
Acked-by: Martin Jansa <Martin.Jansa@...>
On Mon, Aug 2, 2021 at 11:02 AM George Liu <liuxiwei1013@...> wrote: Fix the variable spelling errors
|
|
|
|
Re: RTC issue
Matthias Klein
Hello jupiter,
I have seen the same message on an i.MX6S7 (https://www.karo-electronics.com/fileadmin/download/Datasheets/TX6S-Datasheet.pdf) with kernel 5.10 (in a dunfell Yocto after I upgraded from kernel 4.14). Since we use an external RTC on the I2C bus, I disabled the internal RTC ("snvs_rtc") in the device tree, and did not analyze the problem further. I think it is a kernel problem, since in my case the Yocto version has not changed. Please inform me if you find out something. Many greetings, Matthias
|
|
|
|
Re: (Go) Library for configuring Yocto based boxes?
Christofer Dutz <christofer.dutz@...>
Hi,
it seems that on the yocto buily the vendor of my box provides (haven't really started customizing this) both NetworkManager as well as systemd-networkd are installed. This seems to be bad. I could find /etc/systemd/network, but this only contained an empty 99-default.link symlink to /dev/null The directories /usr/lib/systemd and /run/systemd both exist, but both don't contain any "network" directory. Same with the /etc/NetworkManager/system-connections Strangely I have two connections configured: "Wired connection 1" and "Wired connection 2" which I however don't find any occurence in any of the files on my system (Except log-files, which mention them) ... are these configured per default? And if yes ... is systemd-networkd or NetworkManager defining them? I think I'll probably go down the route of removing NetworkManager from the box ... having both seems to be dangerous and the systemd appears to be more in-line with the modern way oft hings (even if it might not be as powerful yet) Chris -----Ursprüngliche Nachricht----- Von: Nicolas Jeker <n.jeker@...> Gesendet: Mittwoch, 4. August 2021 09:05 An: Christofer Dutz <christofer.dutz@...>; yocto@... Betreff: Re: [yocto] (Go) Library for configuring Yocto based boxes? On Mon, 2021-08-02 at 11:32 +0000, Christofer Dutz wrote: Hi all,Glad to hear it works. So I guess I'm now safe and managed to get the things I needed working.This doesn't sound correct. It's already some time ago that I last worked on networking. As far as I remember, systemd-networkd and NetworkManager are working differently: Configuration files ------------------- systemd-networkd uses *.network files in /usr/lib/systemd/network, /run/systemd/network and /etc/systemd/network NetworkManager uses *.nm-connection files in /etc/NetworkManager/system-connections (and maybe others that I'm not aware of) Command line utility -------------------- systemd-networkd can be controlled with networkctl NetworkManager can be controlled with nmcli I'm not sure why your setup even works, maybe I'm missing something. For further reading I can recommend the ArchWiki pages (they don't always apply perfectly to Yocto, but it's close enough and very detailed) and the respective man pages: https://wiki.archlinux.org/title/Systemd-networkd https://wiki.archlinux.org/title/NetworkManager https://man.archlinux.org/man/systemd-networkd.8 https://man.archlinux.org/man/extra/networkmanager/NetworkManager.8.en Chris
|
|
|
|
RTC issue
JH
Hi,
I built Yocto iMX6ULL image on Zeus kernel 4.19, but I have following RTC errors: [ 3494.446265] rtc rtc0: Timeout trying to get valid LPSRT Counter read [ 4190.088406] rtc rtc0: Timeout trying to get valid LPSRT Counter read [ 4885.740595] rtc rtc0: Timeout trying to get valid LPSRT Counter read I measured iMX6ULL RTC_XTALI and RTC_XTALO signals connecting to a 32.768 kHz 90 kΩ ESR crystal, all good, not sure if it is caused by kernel or Yocto build. Someone suggested that I should remove the external RTC, the rationale is that Linux is not really a real time OS, there is no battery for supporting RTC. Appreciate your comments. My apology if it is an off topic. Thank you. Kind regards, - jupiter
|
|
|
|
cross compile python
#raspberrypi
yasminebenghozzi6@...
Hello everyone,
So m working on the yocto project, my image is ready, but i need to cross compile my python script from my pc to the image. Is that possible? because i ve been told that python doesn 't to be cross compiled. Thank you very much
|
|
|
|
Re: (Go) Library for configuring Yocto based boxes?
Nicolas Jeker
On Mon, 2021-08-02 at 11:32 +0000, Christofer Dutz wrote:
Hi all,Glad to hear it works. So I guess I'm now safe and managed to get the things I needed working.This doesn't sound correct. It's already some time ago that I last worked on networking. As far as I remember, systemd-networkd and NetworkManager are working differently: Configuration files ------------------- systemd-networkd uses *.network files in /usr/lib/systemd/network, /run/systemd/network and /etc/systemd/network NetworkManager uses *.nm-connection files in /etc/NetworkManager/system-connections (and maybe others that I'm not aware of) Command line utility -------------------- systemd-networkd can be controlled with networkctl NetworkManager can be controlled with nmcli I'm not sure why your setup even works, maybe I'm missing something. For further reading I can recommend the ArchWiki pages (they don't always apply perfectly to Yocto, but it's close enough and very detailed) and the respective man pages: https://wiki.archlinux.org/title/Systemd-networkd https://wiki.archlinux.org/title/NetworkManager https://man.archlinux.org/man/systemd-networkd.8 https://man.archlinux.org/man/extra/networkmanager/NetworkManager.8.en Chris
|
|
|
|
[meta-selinux][PATCH 3/3] meta-selinux: convert to new override syntax
Yi Zhao
This is the result of automated script conversion:
poky/scripts/contrib/convert-overrides.py meta-selinux Converting the metadata to use ":" as the override character instead of "_". Signed-off-by: Yi Zhao <yi.zhao@...> --- README | 6 +- SELinux-FAQ | 4 +- classes/enable-audit.bbclass | 2 +- classes/enable-selinux.bbclass | 2 +- classes/meson-enable-selinux.bbclass | 2 +- classes/meson-selinux.bbclass | 2 +- classes/selinux-image.bbclass | 2 +- classes/with-audit.bbclass | 2 +- classes/with-selinux.bbclass | 2 +- .../iscsi-initiator-utils_selinux.inc | 2 +- .../python/python_selinux.inc | 2 +- recipes-connectivity/bind/bind_selinux.inc | 4 +- .../openssh/openssh_selinux.inc | 4 +- recipes-core/busybox/busybox_selinux.inc | 10 ++-- recipes-core/eudev/eudev_selinux.inc | 2 +- .../initscripts/initscripts-1.0_selinux.inc | 4 +- recipes-core/libcgroup/libcgroup_selinux.inc | 4 +- recipes-core/systemd/systemd_selinux.inc | 2 +- recipes-core/sysvinit/sysvinit_selinux.inc | 2 +- recipes-extended/lsof/lsof_selinux.inc | 2 +- recipes-extended/pam/libpam_selinux.inc | 2 +- recipes-extended/shadow/shadow_selinux.inc | 2 +- .../sysklogd/sysklogd_selinux.inc | 2 +- recipes-extended/tar/tar_selinux.inc | 2 +- recipes-graphics/xcb/libxcb_selinux.inc | 2 +- recipes-kernel/linux/linux-yocto_selinux.inc | 2 +- .../packagegroup-core-selinux.bb | 4 +- .../packagegroup-selinux-minimal.bb | 4 +- .../packagegroup-selinux-policycoreutils.bb | 4 +- .../refpolicy/refpolicy_common.inc | 14 ++--- recipes-security/refpolicy/refpolicy_git.inc | 2 +- recipes-security/selinux/checkpolicy_3.2.bb | 2 +- .../selinux/libselinux-python_3.2.bb | 10 ++-- recipes-security/selinux/libselinux_3.2.bb | 4 +- recipes-security/selinux/libsemanage_3.2.bb | 16 ++--- recipes-security/selinux/mcstrans_3.2.bb | 10 ++-- .../selinux/policycoreutils_3.2.bb | 60 +++++++++---------- recipes-security/selinux/restorecond_3.2.bb | 10 ++-- .../selinux/selinux-autorelabel_0.1.bb | 4 +- recipes-security/selinux/selinux-dbus_3.2.bb | 4 +- recipes-security/selinux/selinux-gui_3.2.bb | 4 +- recipes-security/selinux/selinux-init_0.1.bb | 2 +- recipes-security/selinux/selinux-initsh.inc | 8 +-- .../selinux/selinux-labeldev_0.1.bb | 2 +- .../selinux/selinux-python_3.2.bb | 26 ++++---- .../selinux/selinux-sandbox_3.2.bb | 4 +- .../selinux/semodule-utils_3.2.bb | 8 +-- recipes-security/setools/setools_4.4.0.bb | 10 ++-- recipes-support/attr/attr_selinux.inc | 2 +- recipes-support/libpcre/libpcre_selinux.inc | 4 +- 50 files changed, 146 insertions(+), 146 deletions(-) diff --git a/README b/README index 20e94ca..77b6253 100644 --- a/README +++ b/README @@ -38,7 +38,7 @@ layer should not change the system behavior. In order to use the components in this layer you must add the 'selinux' to the DISTRO_FEATURES. In addition to selinux, you should be sure that acl, xattr and pam are also present. -e.g. DISTRO_FEATURES_append = " acl xattr pam selinux" +e.g. DISTRO_FEATURES:append = " acl xattr pam selinux" You must also specify a preferred provider for the virtual/refpolicy. The included policies with this layer are simply reference policies and will need @@ -69,8 +69,8 @@ By default selinux enabled images coming up with "sysvinit" as init manager, we can use "systemd" as an init manager using below changes to local.conf * enable systemd as init manager changes to local.conf -DISTRO_FEATURES_remove = " sysvinit" -DISTRO_FEATURES_append = " systemd" +DISTRO_FEATURES:remove = " sysvinit" +DISTRO_FEATURES:append = " systemd" VIRTUAL-RUNTIME_init_manager = "systemd" DISTRO_FEATURES_BACKFILL_CONSIDERED = "" diff --git a/SELinux-FAQ b/SELinux-FAQ index b6a0df9..8f56b2b 100644 --- a/SELinux-FAQ +++ b/SELinux-FAQ @@ -67,7 +67,7 @@ After init Poky build environment, please follow these steps: 1. Add meta-selinux path to BUILDDIR/conf/bblayers.conf file. - 2. Set DISTRO="poky-selinux" or add DISTRO_FEATURES_append=" pam selinux" + 2. Set DISTRO="poky-selinux" or add DISTRO_FEATURES:append=" pam selinux" in BUILDDIR/conf/local.conf file. 3. Build the default selinux image. @@ -81,7 +81,7 @@ the following steps: 1. Add meta-selinux path to BUILDDIR/conf/bblayers.conf file - 2. Add DISTRO_FEATURES_append=" pam selinux" in BUILDDIR/conf/local.conf + 2. Add DISTRO_FEATURES:append=" pam selinux" in BUILDDIR/conf/local.conf file. 3. Add packagegroup-core-selinux to your custom image. diff --git a/classes/enable-audit.bbclass b/classes/enable-audit.bbclass index 4538b0b..17bcc8e 100644 --- a/classes/enable-audit.bbclass +++ b/classes/enable-audit.bbclass @@ -1,4 +1,4 @@ # There is still no audit DISTRO_FEATURE, so enable audit when selinux feature enabled. inherit selinux -PACKAGECONFIG_append = " ${@target_selinux(d, 'audit')}" +PACKAGECONFIG:append = " ${@target_selinux(d, 'audit')}" diff --git a/classes/enable-selinux.bbclass b/classes/enable-selinux.bbclass index de2a124..c8af97e 100644 --- a/classes/enable-selinux.bbclass +++ b/classes/enable-selinux.bbclass @@ -1,4 +1,4 @@ inherit selinux -PACKAGECONFIG_append = " ${@target_selinux(d)}" +PACKAGECONFIG:append = " ${@target_selinux(d)}" PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux," diff --git a/classes/meson-enable-selinux.bbclass b/classes/meson-enable-selinux.bbclass index 91c2a2b..b5b8cb7 100644 --- a/classes/meson-enable-selinux.bbclass +++ b/classes/meson-enable-selinux.bbclass @@ -1,4 +1,4 @@ inherit selinux -PACKAGECONFIG_append = " ${@target_selinux(d)}" +PACKAGECONFIG:append = " ${@target_selinux(d)}" PACKAGECONFIG[selinux] = "-Dselinux=enabled,-Dselinux=disabled,libselinux," diff --git a/classes/meson-selinux.bbclass b/classes/meson-selinux.bbclass index 77a763a..337ffca 100644 --- a/classes/meson-selinux.bbclass +++ b/classes/meson-selinux.bbclass @@ -1,4 +1,4 @@ inherit selinux -PACKAGECONFIG_append = " ${@target_selinux(d)}" +PACKAGECONFIG:append = " ${@target_selinux(d)}" PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux," diff --git a/classes/selinux-image.bbclass b/classes/selinux-image.bbclass index 7f157d3..23645b7 100644 --- a/classes/selinux-image.bbclass +++ b/classes/selinux-image.bbclass @@ -10,6 +10,6 @@ selinux_set_labels () { DEPENDS += "policycoreutils-native" -IMAGE_PREPROCESS_COMMAND_append = " selinux_set_labels ;" +IMAGE_PREPROCESS_COMMAND:append = " selinux_set_labels ;" inherit core-image diff --git a/classes/with-audit.bbclass b/classes/with-audit.bbclass index 0c15312..a99bf71 100644 --- a/classes/with-audit.bbclass +++ b/classes/with-audit.bbclass @@ -1,5 +1,5 @@ # There is still no audit DISTRO_FEATURE, so enable audit when selinux feature enabled. inherit selinux -PACKAGECONFIG_append = " ${@target_selinux(d, 'audit')}" +PACKAGECONFIG:append = " ${@target_selinux(d, 'audit')}" PACKAGECONFIG[audit] = "--with-audit,--without-audit,audit," diff --git a/classes/with-selinux.bbclass b/classes/with-selinux.bbclass index 7873d9b..37b9e13 100644 --- a/classes/with-selinux.bbclass +++ b/classes/with-selinux.bbclass @@ -1,4 +1,4 @@ inherit selinux -PACKAGECONFIG_append = " ${@target_selinux(d)}" +PACKAGECONFIG:append = " ${@target_selinux(d)}" PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux," diff --git a/dynamic-layers/networking-layer/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_selinux.inc b/dynamic-layers/networking-layer/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_selinux.inc index 81fe7b7..8802adb 100644 --- a/dynamic-layers/networking-layer/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_selinux.inc +++ b/dynamic-layers/networking-layer/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_selinux.inc @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" diff --git a/dynamic-layers/python2-layer/recipes-devtools/python/python_selinux.inc b/dynamic-layers/python2-layer/recipes-devtools/python/python_selinux.inc index bb54a90..4fed832 100644 --- a/dynamic-layers/python2-layer/recipes-devtools/python/python_selinux.inc +++ b/dynamic-layers/python2-layer/recipes-devtools/python/python_selinux.inc @@ -1,5 +1,5 @@ # If selinux enabled, disable handlers to rw command history file -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" inherit selinux diff --git a/recipes-connectivity/bind/bind_selinux.inc b/recipes-connectivity/bind/bind_selinux.inc index 1be9260..aa11005 100644 --- a/recipes-connectivity/bind/bind_selinux.inc +++ b/recipes-connectivity/bind/bind_selinux.inc @@ -1,8 +1,8 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "file://volatiles.04_bind" -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/default/volatiles install -m 0644 ${WORKDIR}/volatiles.04_bind ${D}${sysconfdir}/default/volatiles/04_bind diff --git a/recipes-connectivity/openssh/openssh_selinux.inc b/recipes-connectivity/openssh/openssh_selinux.inc index ebd2721..20937c2 100644 --- a/recipes-connectivity/openssh/openssh_selinux.inc +++ b/recipes-connectivity/openssh/openssh_selinux.inc @@ -1,9 +1,9 @@ inherit with-selinux -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" # There is no distro feature just for audit. -PACKAGECONFIG_append = " audit" +PACKAGECONFIG:append = " audit" PACKAGECONFIG[audit] = "--with-audit=linux,--without-audit,audit," diff --git a/recipes-core/busybox/busybox_selinux.inc b/recipes-core/busybox/busybox_selinux.inc index 6e491ce..ded8007 100644 --- a/recipes-core/busybox/busybox_selinux.inc +++ b/recipes-core/busybox/busybox_selinux.inc @@ -1,6 +1,6 @@ PTEST_BINDIR = "0" -FILES_${PN} += "${libdir}/${PN}" +FILES:${PN} += "${libdir}/${PN}" # We should use sh wrappers instead of links so the commands could get correct # security labels @@ -39,7 +39,7 @@ python create_sh_wrapper_reset_alternative_vars () { # Match coreutils if alt_name == '[': alt_name = 'lbracket' - d.appendVar('ALTERNATIVE_%s' % (pn), ' ' + alt_name) + d.appendVar('ALTERNATIVE:%s' % (pn), ' ' + alt_name) d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, alt_link_name) if os.path.exists(alt_wppath_dest): d.setVarFlag('ALTERNATIVE_TARGET', alt_name, alt_wppath) @@ -56,11 +56,11 @@ python create_sh_wrapper_reset_alternative_vars () { } # Add to PACKAGEBUILDPKGD so it could override the alternatives, which are set in -# do_package_prepend() section of busybox_*.bb. -PACKAGEBUILDPKGD_prepend = "create_sh_wrapper_reset_alternative_vars " +# do_package:prepend() section of busybox_*.bb. +PACKAGEBUILDPKGD:prepend = "create_sh_wrapper_reset_alternative_vars " # Use sh wrappers instead of links -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { # This part of code is dedicated to the on target upgrade problem. # It's known that if we don't make appropriate symlinks before update-alternatives calls, # there will be errors indicating missing commands such as 'sed'. diff --git a/recipes-core/eudev/eudev_selinux.inc b/recipes-core/eudev/eudev_selinux.inc index 2ad6b13..94950f5 100644 --- a/recipes-core/eudev/eudev_selinux.inc +++ b/recipes-core/eudev/eudev_selinux.inc @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" inherit enable-selinux diff --git a/recipes-core/initscripts/initscripts-1.0_selinux.inc b/recipes-core/initscripts/initscripts-1.0_selinux.inc index bf798e7..6530a87 100644 --- a/recipes-core/initscripts/initscripts-1.0_selinux.inc +++ b/recipes-core/initscripts/initscripts-1.0_selinux.inc @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -do_install_append () { +do_install:append () { cat <<-EOF >> ${D}${sysconfdir}/init.d/populate-volatile.sh touch /var/log/lastlog test ! -x /sbin/restorecon || /sbin/restorecon -iRF /var/volatile/ /var/lib /run \ diff --git a/recipes-core/libcgroup/libcgroup_selinux.inc b/recipes-core/libcgroup/libcgroup_selinux.inc index 9d9ebfc..7efdfd5 100644 --- a/recipes-core/libcgroup/libcgroup_selinux.inc +++ b/recipes-core/libcgroup/libcgroup_selinux.inc @@ -1,6 +1,6 @@ -EXTRA_OECONF_append_class-native = " --enable-pam=no" +EXTRA_OECONF:append:class-native = " --enable-pam=no" -do_install_append() { +do_install:append() { test ! -f ${D}${base_libdir}/security/pam_cgroup.so.0.0.0 || { mv -f ${D}${base_libdir}/security/pam_cgroup.so.0.0.0 ${D}${base_libdir}/security/pam_cgroup.so rm -f ${D}${base_libdir}/security/pam_cgroup.so.* diff --git a/recipes-core/systemd/systemd_selinux.inc b/recipes-core/systemd/systemd_selinux.inc index b17e70a..8136ea8 100644 --- a/recipes-core/systemd/systemd_selinux.inc +++ b/recipes-core/systemd/systemd_selinux.inc @@ -1,6 +1,6 @@ inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-audit', '', d)} -do_install_append() { +do_install:append() { if ${@bb.utils.contains('PACKAGECONFIG', 'backlight', 'true', 'false', d)}; then install -d ${D}${localstatedir}/lib/systemd/backlight fi diff --git a/recipes-core/sysvinit/sysvinit_selinux.inc b/recipes-core/sysvinit/sysvinit_selinux.inc index 2e54330..480bde7 100644 --- a/recipes-core/sysvinit/sysvinit_selinux.inc +++ b/recipes-core/sysvinit/sysvinit_selinux.inc @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" B = "${S}" diff --git a/recipes-extended/lsof/lsof_selinux.inc b/recipes-extended/lsof/lsof_selinux.inc index 6691b4c..9021f38 100644 --- a/recipes-extended/lsof/lsof_selinux.inc +++ b/recipes-extended/lsof/lsof_selinux.inc @@ -2,7 +2,7 @@ inherit selinux DEPENDS += "${LIBSELINUX}" -do_configure_prepend () { +do_configure:prepend () { export LINUX_HASSELINUX="${@target_selinux(d, 'Y', 'N')}" export LSOF_CFGF="${CFLAGS}" export LSOF_CFGL="${LDFLAGS}" diff --git a/recipes-extended/pam/libpam_selinux.inc b/recipes-extended/pam/libpam_selinux.inc index adcf938..bee1f3e 100644 --- a/recipes-extended/pam/libpam_selinux.inc +++ b/recipes-extended/pam/libpam_selinux.inc @@ -1,3 +1,3 @@ inherit enable-selinux -RDEPENDS_${PN}-runtime += "${@target_selinux(d, 'pam-plugin-selinux')}" +RDEPENDS:${PN}-runtime += "${@target_selinux(d, 'pam-plugin-selinux')}" diff --git a/recipes-extended/shadow/shadow_selinux.inc b/recipes-extended/shadow/shadow_selinux.inc index 496ea6a..3c8daea 100644 --- a/recipes-extended/shadow/shadow_selinux.inc +++ b/recipes-extended/shadow/shadow_selinux.inc @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" inherit with-selinux with-audit diff --git a/recipes-extended/sysklogd/sysklogd_selinux.inc b/recipes-extended/sysklogd/sysklogd_selinux.inc index 81fe7b7..8802adb 100644 --- a/recipes-extended/sysklogd/sysklogd_selinux.inc +++ b/recipes-extended/sysklogd/sysklogd_selinux.inc @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" diff --git a/recipes-extended/tar/tar_selinux.inc b/recipes-extended/tar/tar_selinux.inc index 341df8b..b1fa7bf 100644 --- a/recipes-extended/tar/tar_selinux.inc +++ b/recipes-extended/tar/tar_selinux.inc @@ -1,3 +1,3 @@ inherit with-selinux -PACKAGECONFIG_append = "${@bb.utils.contains('DISTRO_FEATURES', 'acl', ' acl', '', d)}" +PACKAGECONFIG:append = "${@bb.utils.contains('DISTRO_FEATURES', 'acl', ' acl', '', d)}" diff --git a/recipes-graphics/xcb/libxcb_selinux.inc b/recipes-graphics/xcb/libxcb_selinux.inc index 29bdadb..6924315 100644 --- a/recipes-graphics/xcb/libxcb_selinux.inc +++ b/recipes-graphics/xcb/libxcb_selinux.inc @@ -3,4 +3,4 @@ inherit enable-selinux PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,," PACKAGES += "${PN}-xselinux" -FILES_${PN}-xselinux += "${libdir}/libxcb-xselinux.so.*" +FILES:${PN}-xselinux += "${libdir}/libxcb-xselinux.so.*" diff --git a/recipes-kernel/linux/linux-yocto_selinux.inc b/recipes-kernel/linux/linux-yocto_selinux.inc index 3312e06..ba078f7 100644 --- a/recipes-kernel/linux/linux-yocto_selinux.inc +++ b/recipes-kernel/linux/linux-yocto_selinux.inc @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" # Enable selinux support in the kernel if the feature is enabled SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'file://selinux.cfg', '', d)}" diff --git a/recipes-security/packagegroups/packagegroup-core-selinux.bb b/recipes-security/packagegroups/packagegroup-core-selinux.bb index 568aaac..148c8a2 100644 --- a/recipes-security/packagegroups/packagegroup-core-selinux.bb +++ b/recipes-security/packagegroups/packagegroup-core-selinux.bb @@ -6,9 +6,9 @@ PACKAGES = "\ ${PN} \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ libsepol \ libsepol-bin \ libselinux \ diff --git a/recipes-security/packagegroups/packagegroup-selinux-minimal.bb b/recipes-security/packagegroups/packagegroup-selinux-minimal.bb index e198e84..0f9abae 100644 --- a/recipes-security/packagegroups/packagegroup-selinux-minimal.bb +++ b/recipes-security/packagegroups/packagegroup-selinux-minimal.bb @@ -6,9 +6,9 @@ PACKAGES = "\ ${PN} \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ coreutils \ libsepol \ libselinux \ diff --git a/recipes-security/packagegroups/packagegroup-selinux-policycoreutils.bb b/recipes-security/packagegroups/packagegroup-selinux-policycoreutils.bb index 2263592..7fd5d1c 100644 --- a/recipes-security/packagegroups/packagegroup-selinux-policycoreutils.bb +++ b/recipes-security/packagegroups/packagegroup-selinux-policycoreutils.bb @@ -6,9 +6,9 @@ PACKAGES = "\ ${PN} \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ policycoreutils-fixfiles \ policycoreutils-genhomedircon \ policycoreutils-loadpolicy \ diff --git a/recipes-security/refpolicy/refpolicy_common.inc b/recipes-security/refpolicy/refpolicy_common.inc index 1bacaa9..3d2eb89 100644 --- a/recipes-security/refpolicy/refpolicy_common.inc +++ b/recipes-security/refpolicy/refpolicy_common.inc @@ -6,7 +6,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=393a5ca445f6965873eca0259a17f833" PROVIDES = "virtual/refpolicy" -RPROVIDES_${PN} = "refpolicy" +RPROVIDES:${PN} = "refpolicy" # Specific config files for Poky SRC_URI += "file://customizable_types \ @@ -113,13 +113,13 @@ SRC_URI += " \ S = "${WORKDIR}/refpolicy" -CONFFILES_${PN} += "${sysconfdir}/selinux/config" -FILES_${PN} += " \ +CONFFILES:${PN} += "${sysconfdir}/selinux/config" +FILES:${PN} += " \ ${sysconfdir}/selinux/${POLICY_NAME}/ \ ${datadir}/selinux/${POLICY_NAME}/*.pp \ ${localstatedir}/lib/selinux/${POLICY_NAME}/ \ " -FILES_${PN}-dev =+ " \ +FILES:${PN}-dev =+ " \ ${datadir}/selinux/${POLICY_NAME}/include/ \ ${sysconfdir}/selinux/sepolgen.conf \ " @@ -128,7 +128,7 @@ EXTRANATIVEPATH += "bzip2-native" DEPENDS += "bzip2-replacement-native checkpolicy-native policycoreutils-native semodule-utils-native m4-native" -RDEPENDS_${PN}-dev =+ " \ +RDEPENDS:${PN}-dev =+ " \ python3-core \ " @@ -289,11 +289,11 @@ do_install () { install_config } -do_install_append(){ +do_install:append(){ # While building policies on target, Makefile will be searched from SELINUX_DEVEL_PATH echo "SELINUX_DEVEL_PATH=${datadir}/selinux/${POLICY_NAME}/include" > ${D}${sysconfdir}/selinux/sepolgen.conf } -sysroot_stage_all_append () { +sysroot_stage_all:append () { sysroot_stage_dir ${D}${sysconfdir} ${SYSROOT_DESTDIR}${sysconfdir} } diff --git a/recipes-security/refpolicy/refpolicy_git.inc b/recipes-security/refpolicy/refpolicy_git.inc index f131646..ccf1bde 100644 --- a/recipes-security/refpolicy/refpolicy_git.inc +++ b/recipes-security/refpolicy/refpolicy_git.inc @@ -6,6 +6,6 @@ SRCREV_refpolicy ?= "1167739da1882f9c89281095d2595da5ea2d9d6b" UPSTREAM_CHECK_GITTAGREGEX = "RELEASE_(?P<pver>\d+_\d+)" -FILESEXTRAPATHS_prepend := "${THISDIR}/refpolicy:" +FILESEXTRAPATHS:prepend := "${THISDIR}/refpolicy:" include refpolicy_common.inc diff --git a/recipes-security/selinux/checkpolicy_3.2.bb b/recipes-security/selinux/checkpolicy_3.2.bb index 552dc26..99ac470 100644 --- a/recipes-security/selinux/checkpolicy_3.2.bb +++ b/recipes-security/selinux/checkpolicy_3.2.bb @@ -18,7 +18,7 @@ EXTRA_OEMAKE += "LIBSEPOLA=${STAGING_LIBDIR}/libsepol.a" S = "${WORKDIR}/git/checkpolicy" -do_install_append() { +do_install:append() { install test/dismod ${D}/${bindir}/sedismod install test/dispol ${D}/${bindir}/sedispol } diff --git a/recipes-security/selinux/libselinux-python_3.2.bb b/recipes-security/selinux/libselinux-python_3.2.bb index b741449..f589ebd 100644 --- a/recipes-security/selinux/libselinux-python_3.2.bb +++ b/recipes-security/selinux/libselinux-python_3.2.bb @@ -10,7 +10,7 @@ require selinux_common.inc inherit python3native python3targetconfig -FILESEXTRAPATHS_prepend := "${THISDIR}/libselinux:" +FILESEXTRAPATHS:prepend := "${THISDIR}/libselinux:" SRC_URI += "\ file://0001-Makefile-fix-python-modules-install-path-for-multili.patch \ file://0001-Do-not-use-PYCEXT-and-rely-on-the-installed-file-nam.patch \ @@ -19,7 +19,7 @@ SRC_URI += "\ S = "${WORKDIR}/git/libselinux" DEPENDS += "python3 swig-native libpcre libsepol" -RDEPENDS_${PN} += "libselinux python3-core python3-shell" +RDEPENDS:${PN} += "libselinux python3-core python3-shell" def get_policyconfigarch(d): import re @@ -30,10 +30,10 @@ def get_policyconfigarch(d): EXTRA_OEMAKE += "${@get_policyconfigarch(d)}" EXTRA_OEMAKE += "LDFLAGS='${LDFLAGS} -lpcre' LIBSEPOLA='${STAGING_LIBDIR}/libsepol.a'" -EXTRA_OEMAKE_append_libc-musl = " FTS_LDLIBS=-lfts" +EXTRA_OEMAKE:append:libc-musl = " FTS_LDLIBS=-lfts" -FILES_${PN} = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" -INSANE_SKIP_${PN} = "dev-so" +FILES:${PN} = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" +INSANE_SKIP:${PN} = "dev-so" do_compile() { oe_runmake pywrap -j1 \ diff --git a/recipes-security/selinux/libselinux_3.2.bb b/recipes-security/selinux/libselinux_3.2.bb index 5acd576..55efbae 100644 --- a/recipes-security/selinux/libselinux_3.2.bb +++ b/recipes-security/selinux/libselinux_3.2.bb @@ -11,7 +11,7 @@ require selinux_common.inc inherit lib_package python3native DEPENDS += "libsepol libpcre" -DEPENDS_append_libc-musl = " fts" +DEPENDS:append:libc-musl = " fts" S = "${WORKDIR}/git/libselinux" @@ -24,6 +24,6 @@ def get_policyconfigarch(d): EXTRA_OEMAKE += "${@get_policyconfigarch(d)}" EXTRA_OEMAKE += "LDFLAGS='${LDFLAGS} -lpcre' LIBSEPOLA='${STAGING_LIBDIR}/libsepol.a'" -EXTRA_OEMAKE_append_libc-musl = " FTS_LDLIBS=-lfts" +EXTRA_OEMAKE:append:libc-musl = " FTS_LDLIBS=-lfts" BBCLASSEXTEND = "native" diff --git a/recipes-security/selinux/libsemanage_3.2.bb b/recipes-security/selinux/libsemanage_3.2.bb index 58b6da4..0a6ff95 100644 --- a/recipes-security/selinux/libsemanage_3.2.bb +++ b/recipes-security/selinux/libsemanage_3.2.bb @@ -17,30 +17,30 @@ SRC_URI += "file://libsemanage-Fix-execve-segfaults-on-Ubuntu.patch \ " DEPENDS += "libsepol libselinux bzip2 python3 bison-native flex-native swig-native" -DEPENDS_append_class-target = " audit" +DEPENDS:append:class-target = " audit" S = "${WORKDIR}/git/libsemanage" PACKAGES =+ "${PN}-python" # For /usr/libexec/selinux/semanage_migrate_store -RDEPENDS_${PN}-python += "python3-core" +RDEPENDS:${PN}-python += "python3-core" -FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/* \ +FILES:${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/* \ ${libexecdir}/selinux/semanage_migrate_store" -FILES_${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug/*" -FILES_${PN} += "${libexecdir}" +FILES:${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug/*" +FILES:${PN} += "${libexecdir}" -EXTRA_OEMAKE_class-native += "DISABLE_AUDIT=y" +EXTRA_OEMAKE:class-native += "DISABLE_AUDIT=y" -do_compile_append() { +do_compile:append() { oe_runmake pywrap \ PYLIBVER='python${PYTHON_BASEVERSION}${PYTHON_ABI}' \ PYINC='-I${STAGING_INCDIR}/${PYLIBVER}' \ PYLIBS='-L${STAGING_LIBDIR}/${PYLIBVER} -l${PYLIBVER}' } -do_install_append() { +do_install:append() { oe_runmake install-pywrap \ PYCEXT='.so' \ PYLIBVER='python${PYTHON_BASEVERSION}${PYTHON_ABI}' \ diff --git a/recipes-security/selinux/mcstrans_3.2.bb b/recipes-security/selinux/mcstrans_3.2.bb index 0cece17..4d99e18 100644 --- a/recipes-security/selinux/mcstrans_3.2.bb +++ b/recipes-security/selinux/mcstrans_3.2.bb @@ -24,7 +24,7 @@ EXTRA_OEMAKE += "SBINDIR=${base_sbindir} \ S = "${WORKDIR}/git/mcstrans" -do_install_append() { +do_install:append() { install -d ${D}${sbindir} install -m 755 utils/untranscon ${D}${sbindir}/ install -m 755 utils/transcon ${D}${sbindir}/ @@ -42,12 +42,12 @@ do_install_append() { cp -r share/* ${D}${datadir}/mcstrans/. } -SYSTEMD_SERVICE_mcstrans = "mcstrans.service" +SYSTEMD_SERVICE:mcstrans = "mcstrans.service" INITSCRIPT_PACKAGES = "mcstrans" -INITSCRIPT_NAME_mcstrans = "mcstrans" -INITSCRIPT_PARAMS_mcstrans = "defaults" +INITSCRIPT_NAME:mcstrans = "mcstrans" +INITSCRIPT_PARAMS:mcstrans = "defaults" -pkg_postinst_mcstrans () { +pkg_postinst:mcstrans () { if [ -z "$D" ]; then if command -v systemd-tmpfiles >/dev/null; then systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/setrans.conf diff --git a/recipes-security/selinux/policycoreutils_3.2.bb b/recipes-security/selinux/policycoreutils_3.2.bb index 9fc1691..04f8ef7 100644 --- a/recipes-security/selinux/policycoreutils_3.2.bb +++ b/recipes-security/selinux/policycoreutils_3.2.bb @@ -26,40 +26,40 @@ S = "${WORKDIR}/git/policycoreutils" inherit selinux python3native -RDEPENDS_${BPN}-fixfiles += "\ +RDEPENDS:${BPN}-fixfiles += "\ ${BPN}-setfiles \ grep \ findutils \ " -RDEPENDS_${BPN}-genhomedircon += "\ +RDEPENDS:${BPN}-genhomedircon += "\ ${BPN}-semodule \ " -RDEPENDS_${BPN}-loadpolicy += "\ +RDEPENDS:${BPN}-loadpolicy += "\ libselinux \ libsepol \ " -RDEPENDS_${BPN}-newrole += "\ +RDEPENDS:${BPN}-newrole += "\ libcap-ng \ libselinux \ " -RDEPENDS_${BPN}-runinit += "libselinux" -RDEPENDS_${BPN}-secon += "libselinux" -RDEPENDS_${BPN}-semodule += "\ +RDEPENDS:${BPN}-runinit += "libselinux" +RDEPENDS:${BPN}-secon += "libselinux" +RDEPENDS:${BPN}-semodule += "\ libsepol \ libselinux \ libsemanage \ " -RDEPENDS_${BPN}-sestatus += "libselinux" -RDEPENDS_${BPN}-setfiles += "\ +RDEPENDS:${BPN}-sestatus += "libselinux" +RDEPENDS:${BPN}-setfiles += "\ libselinux \ libsepol \ " -RDEPENDS_${BPN}-setsebool += "\ +RDEPENDS:${BPN}-setsebool += "\ libsepol \ libselinux \ libsemanage \ " -RDEPENDS_${BPN} += "selinux-python" +RDEPENDS:${BPN} += "selinux-python" PACKAGES =+ "\ ${PN}-fixfiles \ @@ -74,34 +74,34 @@ PACKAGES =+ "\ ${PN}-setfiles \ ${PN}-setsebool \ " -FILES_${PN}-fixfiles += "${base_sbindir}/fixfiles" -FILES_${PN}-genhomedircon += "${base_sbindir}/genhomedircon" -FILES_${PN}-loadpolicy += "\ +FILES:${PN}-fixfiles += "${base_sbindir}/fixfiles" +FILES:${PN}-genhomedircon += "${base_sbindir}/genhomedircon" +FILES:${PN}-loadpolicy += "\ ${base_sbindir}/load_policy \ " -FILES_${PN}-newrole += "\ +FILES:${PN}-newrole += "\ ${bindir}/newrole \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${sysconfdir}/pam.d/newrole', '', d)} \ " -FILES_${PN}-runinit += "\ +FILES:${PN}-runinit += "\ ${base_sbindir}/run_init \ ${base_sbindir}/open_init_pty \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${sysconfdir}/pam.d/run_init', '', d)} \ " -FILES_${PN}-dbg += "${prefix}/libexec/selinux/hll/.debug" -FILES_${PN}-secon += "${bindir}/secon" -FILES_${PN}-semodule += "${base_sbindir}/semodule" -FILES_${PN}-hll += "${prefix}/libexec/selinux/hll/*" -FILES_${PN}-sestatus += "\ +FILES:${PN}-dbg += "${prefix}/libexec/selinux/hll/.debug" +FILES:${PN}-secon += "${bindir}/secon" +FILES:${PN}-semodule += "${base_sbindir}/semodule" +FILES:${PN}-hll += "${prefix}/libexec/selinux/hll/*" +FILES:${PN}-sestatus += "\ ${base_sbindir}/sestatus \ ${sysconfdir}/sestatus.conf \ " -FILES_${PN}-setfiles += "\ +FILES:${PN}-setfiles += "\ ${base_sbindir}/restorecon \ ${base_sbindir}/restorecon_xattr \ ${base_sbindir}/setfiles \ " -FILES_${PN}-setsebool += "\ +FILES:${PN}-setsebool += "\ ${base_sbindir}/setsebool \ ${datadir}/bash-completion/completions/setsebool \ " @@ -111,7 +111,7 @@ export STAGING_LIBDIR export BUILD_SYS export HOST_SYS -PACKAGECONFIG_class-target ?= "\ +PACKAGECONFIG:class-target ?= "\ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \ audit \ " @@ -131,7 +131,7 @@ BBCLASSEXTEND = "native" PCU_NATIVE_CMDS = "setfiles semodule hll" -do_compile_class-native() { +do_compile:class-native() { for PCU_CMD in ${PCU_NATIVE_CMDS} ; do oe_runmake -C $PCU_CMD \ INCLUDEDIR='${STAGING_INCDIR}' \ @@ -139,11 +139,11 @@ do_compile_class-native() { done } -sysroot_stage_dirs_append_class-native() { +sysroot_stage_dirs:append:class-native() { cp -R $from/${prefix}/libexec $to/${prefix}/libexec } -do_compile_prepend() { +do_compile:prepend() { export PYTHON=python3 export PYLIBVER='python${PYTHON_BASEVERSION}' export PYTHON_CPPFLAGS="-I${STAGING_INCDIR}/${PYLIBVER}" @@ -151,12 +151,12 @@ do_compile_prepend() { export PYTHON_SITE_PKG="${libdir}/${PYLIBVER}/site-packages" } -do_install_prepend() { +do_install:prepend() { export PYTHON=python3 export SBINDIR="${D}/${base_sbindir}" } -do_install_class-native() { +do_install:class-native() { for PCU_CMD in ${PCU_NATIVE_CMDS} ; do oe_runmake -C $PCU_CMD install \ DESTDIR="${D}" \ @@ -165,7 +165,7 @@ do_install_class-native() { done } -do_install_append_class-target() { +do_install:append:class-target() { if [ -e ${WORKDIR}/pam.d ]; then install -d ${D}${sysconfdir}/pam.d/ install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ diff --git a/recipes-security/selinux/restorecond_3.2.bb b/recipes-security/selinux/restorecond_3.2.bb index d9def9a..75e65a8 100644 --- a/recipes-security/selinux/restorecond_3.2.bb +++ b/recipes-security/selinux/restorecond_3.2.bb @@ -20,16 +20,16 @@ EXTRA_OEMAKE += "SYSTEMDSYSTEMUNITDIR=${systemd_system_unitdir} \ S = "${WORKDIR}/git/restorecond" -FILES_${PN} += "${datadir}/dbus-1/services/org.selinux.Restorecond.service \ +FILES:${PN} += "${datadir}/dbus-1/services/org.selinux.Restorecond.service \ ${systemd_user_unitdir}/* \ " -SYSTEMD_SERVICE_restorecond = "restorecond.service" +SYSTEMD_SERVICE:restorecond = "restorecond.service" INITSCRIPT_PACKAGES = "restorecond" -INITSCRIPT_NAME_restorecond = "restorecond" -INITSCRIPT_PARAMS_restorecond = "defaults" +INITSCRIPT_NAME:restorecond = "restorecond" +INITSCRIPT_PARAMS:restorecond = "defaults" -do_install_append() { +do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'false', 'true', d)}; then # remove /usr/lib/systemd/user rm -rf ${D}${nonarch_libdir} diff --git a/recipes-security/selinux/selinux-autorelabel_0.1.bb b/recipes-security/selinux/selinux-autorelabel_0.1.bb index 85b0db9..a919445 100644 --- a/recipes-security/selinux/selinux-autorelabel_0.1.bb +++ b/recipes-security/selinux/selinux-autorelabel_0.1.bb @@ -7,7 +7,7 @@ file is present.\ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ policycoreutils-setfiles \ " @@ -19,7 +19,7 @@ INITSCRIPT_PARAMS = "start 01 S ." require selinux-initsh.inc -do_install_append() { +do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then echo "# first boot relabelling" > ${D}/.autorelabel fi diff --git a/recipes-security/selinux/selinux-dbus_3.2.bb b/recipes-security/selinux/selinux-dbus_3.2.bb index bc34f89..badf392 100644 --- a/recipes-security/selinux/selinux-dbus_3.2.bb +++ b/recipes-security/selinux/selinux-dbus_3.2.bb @@ -9,9 +9,9 @@ require selinux_common.inc S = "${WORKDIR}/git/dbus" -RDEPENDS_${PN} += "python3-core selinux-python-sepolicy" +RDEPENDS:${PN} += "python3-core selinux-python-sepolicy" -FILES_${PN} += "\ +FILES:${PN} += "\ ${datadir}/system-config-selinux/selinux_server.py \ ${datadir}/polkit-1/actions/org.selinux.policy \ ${datadir}/dbus-1/system-services/org.selinux.service \ diff --git a/recipes-security/selinux/selinux-gui_3.2.bb b/recipes-security/selinux/selinux-gui_3.2.bb index 5818e49..5534ec6 100644 --- a/recipes-security/selinux/selinux-gui_3.2.bb +++ b/recipes-security/selinux/selinux-gui_3.2.bb @@ -10,9 +10,9 @@ require selinux_common.inc S = "${WORKDIR}/git/gui" -RDEPENDS_${PN} += "python3-core" +RDEPENDS:${PN} += "python3-core" -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/system-config-selinux/* \ ${datadir}/icons/hicolor/* \ ${datadir}/polkit-1/actions/org.selinux.config.policy \ diff --git a/recipes-security/selinux/selinux-init_0.1.bb b/recipes-security/selinux/selinux-init_0.1.bb index ebe7399..c97316e 100644 --- a/recipes-security/selinux/selinux-init_0.1.bb +++ b/recipes-security/selinux/selinux-init_0.1.bb @@ -7,7 +7,7 @@ boot time. \ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ coreutils \ libselinux-bin \ policycoreutils-secon \ diff --git a/recipes-security/selinux/selinux-initsh.inc b/recipes-security/selinux/selinux-initsh.inc index 0a6cf4b..f6a3d85 100644 --- a/recipes-security/selinux/selinux-initsh.inc +++ b/recipes-security/selinux/selinux-initsh.inc @@ -9,15 +9,15 @@ SELINUX_SCRIPT_DST ?= "${SELINUX_SCRIPT_SRC}" INITSCRIPT_NAME ?= "${SELINUX_SCRIPT_DST}" INITSCRIPT_PARAMS ?= "start 00 S ." -CONFFILES_${PN} += "${sysconfdir}/init.d/${SELINUX_SCRIPT_DST}" +CONFFILES:${PN} += "${sysconfdir}/init.d/${SELINUX_SCRIPT_DST}" PACKAGE_ARCH ?= "${MACHINE_ARCH}" inherit update-rc.d systemd -SYSTEMD_SERVICE_${PN} = "${SELINUX_SCRIPT_SRC}.service" +SYSTEMD_SERVICE:${PN} = "${SELINUX_SCRIPT_SRC}.service" -FILES_${PN} += "/.autorelabel" +FILES:${PN} += "/.autorelabel" do_install () { install -d ${D}${sysconfdir}/init.d/ @@ -36,6 +36,6 @@ do_install () { fi } -sysroot_stage_all_append () { +sysroot_stage_all:append () { sysroot_stage_dir ${D}${sysconfdir} ${SYSROOT_DESTDIR}${sysconfdir} } diff --git a/recipes-security/selinux/selinux-labeldev_0.1.bb b/recipes-security/selinux/selinux-labeldev_0.1.bb index 2a0bca9..d29efec 100644 --- a/recipes-security/selinux/selinux-labeldev_0.1.bb +++ b/recipes-security/selinux/selinux-labeldev_0.1.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Set SELinux labels for /dev." LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ coreutils \ libselinux-bin \ policycoreutils-setfiles \ diff --git a/recipes-security/selinux/selinux-python_3.2.bb b/recipes-security/selinux/selinux-python_3.2.bb index a827a90..a954676 100644 --- a/recipes-security/selinux/selinux-python_3.2.bb +++ b/recipes-security/selinux/selinux-python_3.2.bb @@ -17,12 +17,12 @@ S = "${WORKDIR}/git/python" EXTRA_OEMAKE += "LIBSEPOLA=${STAGING_LIBDIR}/libsepol.a" DEPENDS += "python3 libsepol libselinux" -RDEPENDS_${BPN}-audit2allow += "\ +RDEPENDS:${BPN}-audit2allow += "\ python3-core \ libselinux-python \ ${BPN}-sepolgen \ " -RDEPENDS_${BPN}-chcat += "\ +RDEPENDS:${BPN}-chcat += "\ python3-core \ python3-codecs \ python3-shell \ @@ -31,7 +31,7 @@ RDEPENDS_${BPN}-chcat += "\ libselinux-python \ ${BPN} \ " -RDEPENDS_${BPN} += "\ +RDEPENDS:${BPN} += "\ python3-core \ python3-codecs \ python3-io \ @@ -43,7 +43,7 @@ RDEPENDS_${BPN} += "\ libsemanage-python \ setools \ " -RDEPENDS_${BPN}-semanage += "\ +RDEPENDS:${BPN}-semanage += "\ python3-core \ python3-ipy \ python3-compression \ @@ -52,13 +52,13 @@ RDEPENDS_${BPN}-semanage += "\ libselinux-python \ ${BPN} \ " -RDEPENDS_${BPN}-sepolicy += "\ +RDEPENDS:${BPN}-sepolicy += "\ python3-core \ python3-codecs \ python3-syslog \ ${BPN} \ " -RDEPENDS_${BPN}-sepolgen-ifgen += "\ +RDEPENDS:${BPN}-sepolgen-ifgen += "\ python3-core \ libselinux-python \ " @@ -71,33 +71,33 @@ PACKAGES =+ "\ ${PN}-sepolgen \ ${PN}-sepolicy \ " -FILES_${PN}-audit2allow = "\ +FILES:${PN}-audit2allow = "\ ${bindir}/audit2allow \ ${bindir}/audit2why \ " -FILES_${PN}-chcat = "\ +FILES:${PN}-chcat = "\ ${bindir}/chcat \ " -FILES_${PN}-semanage = "\ +FILES:${PN}-semanage = "\ ${sbindir}/semanage \ ${datadir}/bash-completion/completions/semanage \ " # The ${bindir}/sepolgen is a symlink to ${bindir}/sepolicy -FILES_${PN}-sepolicy += "\ +FILES:${PN}-sepolicy += "\ ${bindir}/sepolgen \ ${bindir}/sepolicy \ ${datadir}/bash-completion/completions/sepolicy \ " -FILES_${PN}-sepolgen-ifgen += "\ +FILES:${PN}-sepolgen-ifgen += "\ ${bindir}/sepolgen-ifgen \ ${bindir}/sepolgen-ifgen-attr-helper \ " -FILES_${PN}-sepolgen += "\ +FILES:${PN}-sepolgen += "\ ${libdir}/python${PYTHON_BASEVERSION}/site-packages/sepolgen* \ ${localstatedir}/lib/sepolgen/perm_map \ " -FILES_${PN} += "\ +FILES:${PN} += "\ ${libdir}/python${PYTHON_BASEVERSION}/site-packages/seobject.py* \ ${libdir}/python${PYTHON_BASEVERSION}/site-packages/sepolicy*.egg-info \ ${libdir}/python${PYTHON_BASEVERSION}/site-packages/sepolicy/* \ diff --git a/recipes-security/selinux/selinux-sandbox_3.2.bb b/recipes-security/selinux/selinux-sandbox_3.2.bb index 2c6a823..a20982c 100644 --- a/recipes-security/selinux/selinux-sandbox_3.2.bb +++ b/recipes-security/selinux/selinux-sandbox_3.2.bb @@ -15,7 +15,7 @@ S = "${WORKDIR}/git/sandbox" DEPENDS += "libcap-ng libselinux" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ python3-core \ python3-math \ python3-shell \ @@ -24,7 +24,7 @@ RDEPENDS_${PN} += "\ selinux-python \ " -FILES_${PN} += "\ +FILES:${PN} += "\ ${datadir}/sandbox/sandboxX.sh \ ${datadir}/sandbox/start \ " diff --git a/recipes-security/selinux/semodule-utils_3.2.bb b/recipes-security/selinux/semodule-utils_3.2.bb index 7773d5b..a8bca0e 100644 --- a/recipes-security/selinux/semodule-utils_3.2.bb +++ b/recipes-security/selinux/semodule-utils_3.2.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=393a5ca445f6965873eca0259a17f833" require selinux_common.inc DEPENDS += "libsepol" -RDEPENDS_${PN}-dev = "" +RDEPENDS:${PN}-dev = "" EXTRA_OEMAKE += "LIBSEPOLA=${STAGING_LIBDIR}/libsepol.a" @@ -21,9 +21,9 @@ PACKAGES =+ "\ ${PN}-semodule-package \ " -FILES_${PN}-semodule-expand += "${bindir}/semodule_expand" -FILES_${PN}-semodule-link += "${bindir}/semodule_link" -FILES_${PN}-semodule-package += "\ +FILES:${PN}-semodule-expand += "${bindir}/semodule_expand" +FILES:${PN}-semodule-link += "${bindir}/semodule_link" +FILES:${PN}-semodule-package += "\ ${bindir}/semodule_package \ ${bindir}/semodule_unpackage \ " diff --git a/recipes-security/setools/setools_4.4.0.bb b/recipes-security/setools/setools_4.4.0.bb index 4dd094f..528e78f 100644 --- a/recipes-security/setools/setools_4.4.0.bb +++ b/recipes-security/setools/setools_4.4.0.bb @@ -23,18 +23,18 @@ LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=83a5eb6974c11f30785e90d0eeccf40c \ DEPENDS += "bison-native flex-native swig-native python3 python3-cython-native libsepol libselinux" -DEPENDS_class-native += "libselinux python3-setuptools python3-cython python3-networkx" +DEPENDS:class-native += "libselinux python3-setuptools python3-cython python3-networkx" -RDEPENDS_${PN} += "python3-networkx python3-decorator python3-setuptools \ +RDEPENDS:${PN} += "python3-networkx python3-decorator python3-setuptools \ python3-logging python3-json libselinux-python" -RDEPENDS_${PN}_class-native = "" +RDEPENDS:${PN}:class-native = "" -RPROVIDES_${PN} += "${PN}-console" +RPROVIDES:${PN} += "${PN}-console" inherit setuptools3 -do_install_append() { +do_install:append() { # Need PyQt5 support, disable gui tools rm -f ${D}${bindir}/apol rm -rf ${D}${libdir}/${PYTHON_DIR}/site-packages/setoolsgui diff --git a/recipes-support/attr/attr_selinux.inc b/recipes-support/attr/attr_selinux.inc index ba0314e..7b45842 100644 --- a/recipes-support/attr/attr_selinux.inc +++ b/recipes-support/attr/attr_selinux.inc @@ -1,5 +1,5 @@ inherit selinux -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "file://fix-ptest-failures-when-selinux-enabled.patch" diff --git a/recipes-support/libpcre/libpcre_selinux.inc b/recipes-support/libpcre/libpcre_selinux.inc index 3810078..2da7073 100644 --- a/recipes-support/libpcre/libpcre_selinux.inc +++ b/recipes-support/libpcre/libpcre_selinux.inc @@ -1,4 +1,4 @@ -do_install_append () { +do_install:append () { # This code creates libpcre for both the dev machine (SDK native) # and for cross-compiling (machine arch). For Linux (SDK Linux native # + all machine arch), symlinks to the .so files have to be created, @@ -15,4 +15,4 @@ do_install_append () { fi } -FILES_${PN} += "${base_libdir}/libpcre.so.*" +FILES:${PN} += "${base_libdir}/libpcre.so.*" -- 2.25.1
|
|
|
|
[meta-selinux][PATCH 2/3] layer.conf: set default refpolicy provider
Yi Zhao
Currently there is no default refpolicy provider and the user must
specify it in local.conf. Set the default refpolicy provider to refpolicy-targeted in case the user doesn't set it. Signed-off-by: Yi Zhao <yi.zhao@...> --- conf/layer.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/layer.conf b/conf/layer.conf index aeed565..673cc13 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -29,3 +29,5 @@ LAYERDEPENDS_selinux = " \ core \ meta-python \ " + +PREFERRED_PROVIDER_virtual/refpolicy ??= "refpolicy-targeted" -- 2.25.1
|
|
|
|
[meta-selinux][PATCH 1/3] refpolicy: update file context for chfn/chsh
Yi Zhao
The util-linux has provided chfn and chsh since oe-core commit
804c6b5bd3d398d5ea2a45d6bcc23c76e328ea3f. Update the file context for them. Signed-off-by: Yi Zhao <yi.zhao@...> --- ...ge-update-file-context-for-chfn-chsh.patch | 34 +++++++++++++++++++ .../refpolicy/refpolicy_common.inc | 1 + 2 files changed, 35 insertions(+) create mode 100644 recipes-security/refpolicy/refpolicy/0091-fc-usermanage-update-file-context-for-chfn-chsh.patch diff --git a/recipes-security/refpolicy/refpolicy/0091-fc-usermanage-update-file-context-for-chfn-chsh.patch b/recipes-security/refpolicy/refpolicy/0091-fc-usermanage-update-file-context-for-chfn-chsh.patch new file mode 100644 index 0000000..370bc64 --- /dev/null +++ b/recipes-security/refpolicy/refpolicy/0091-fc-usermanage-update-file-context-for-chfn-chsh.patch @@ -0,0 +1,34 @@ +From 311d4759340f2af1e1e157d571802e4367e0a46b Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@...> +Date: Mon, 2 Aug 2021 09:38:39 +0800 +Subject: [PATCH] fc/usermanage: update file context for chfn/chsh + +The util-linux has provided chfn and chsh since oe-core commit +804c6b5bd3d398d5ea2a45d6bcc23c76e328ea3f. Update the file context for +them. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@...> +--- + policy/modules/admin/usermanage.fc | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/policy/modules/admin/usermanage.fc b/policy/modules/admin/usermanage.fc +index 6a051f8a5..bf1ff09ab 100644 +--- a/policy/modules/admin/usermanage.fc ++++ b/policy/modules/admin/usermanage.fc +@@ -5,8 +5,10 @@ ifdef(`distro_debian',` + /usr/bin/chage -- gen_context(system_u:object_r:passwd_exec_t,s0) + /usr/bin/chfn -- gen_context(system_u:object_r:chfn_exec_t,s0) + /usr/bin/chfn\.shadow -- gen_context(system_u:object_r:chfn_exec_t,s0) ++/usr/bin/chfn\.util-linux -- gen_context(system_u:object_r:chfn_exec_t,s0) + /usr/bin/chsh -- gen_context(system_u:object_r:chfn_exec_t,s0) + /usr/bin/chsh\.shadow -- gen_context(system_u:object_r:chfn_exec_t,s0) ++/usr/bin/chsh\.util-linux -- gen_context(system_u:object_r:chfn_exec_t,s0) + /usr/bin/crack_[a-z]* -- gen_context(system_u:object_r:crack_exec_t,s0) + /usr/bin/cracklib-[a-z]* -- gen_context(system_u:object_r:crack_exec_t,s0) + /usr/bin/gpasswd -- gen_context(system_u:object_r:groupadd_exec_t,s0) +-- +2.17.1 + diff --git a/recipes-security/refpolicy/refpolicy_common.inc b/recipes-security/refpolicy/refpolicy_common.inc index 6e460cb..1bacaa9 100644 --- a/recipes-security/refpolicy/refpolicy_common.inc +++ b/recipes-security/refpolicy/refpolicy_common.inc @@ -108,6 +108,7 @@ SRC_URI += " \ file://0088-policy-modules-services-bind-make-named_t-domain-MLS.patch \ file://0089-policy-modules-services-rpc-make-rpcd_t-MLS-trusted-.patch \ file://0090-policy-modules-system-systemd-make-_systemd_t-MLS-tr.patch \ + file://0091-fc-usermanage-update-file-context-for-chfn-chsh.patch \ " S = "${WORKDIR}/refpolicy" -- 2.25.1
|
|
|
|
[ANNOUNCEMENT] Yocto Project 3.3.2 (hardknott-25.0.2) is Released
Vineela
Hello,
We are pleased to announce the Yocto Project 3.3.2 (hardknott-25.0.2) Release is now available for download.
http://downloads.yoctoproject.org/releases/yocto/yocto-3.3.2/poky-hardknott-25.0.2.tar.bz2 http://mirrors.kernel.org/yocto/yocto/yocto-3.3.2/poky-hardknott-25.0.2.tar.bz2
A gpg signed version of these release notes is available at:
http://downloads.yoctoproject.org/releases/yocto/yocto-3.3.2/RELEASENOTES
Full Test Report:
http://downloads.yoctoproject.org/releases/yocto/yocto-3.3.2/testreport.txt
Thank you for everyone's contributions to this release.
Vineela Tummalapalli, Yocto Project Build and Release
- -------------------------- yocto-3.3.2 Release Notes - -------------------------- - -------------------------- Repositories/Downloads - --------------------------
Repository Name: poky Repository Location: https://git.yoctoproject.org/git/poky Branch: hardknott Tag: yocto-3.3.2 Git Revision: 31c639eb8664059eb4ed711be9173c223b4cc940 Release Artefact: poky-hardknott-25.0.2 sha: 367049275bb85bac112aaa017a2c85eb292f61b0a54f4a93dcc3b4baf9ee4338 Download Locations: http://downloads.yoctoproject.org/releases/yocto/yocto-3.3.2/poky-hardknott-25.0.2.tar.bz2 http://mirrors.kernel.org/yocto/yocto/yocto-3.3.2/poky-hardknott-25.0.2.tar.bz2
Repository Name: openembedded-core Repository Location: https://git.openembedded.org/openembedded-core Branch: hardknott Tag: 2021-04.2-hardknott Git Revision: e458c15627e7b27392d158cbb9417f66424aa7d5 Release Artefact: oecore-hardknott-25.0.2 sha: 422a3d86a45d5b00e06e475330cf61ac33c15a51e8352331b5c344e4e4bb3f25 Download Locations: http://downloads.yoctoproject.org/releases/yocto/yocto-3.3.2/oecore-hardknott-25.0.2.tar.bz2 http://mirrors.kernel.org/yocto/yocto/yocto-3.3.2/oecore-hardknott-25.0.2.tar.bz2
Repository Name: meta-mingw Repository Location: https://git.yoctoproject.org/git/meta-mingw Branch: hardknott Tag: yocto-3.3.2 Git Revision: 422b96cb2b6116442be1f40dfb5bd77447d1219e Release Artefact: meta-mingw-hardknott-25.0.2 sha: 985ce3e81a1c2b93500714bfe0ec0c1f30b8f66f8ff349ffe617e1b9292ce80a Download Locations: http://downloads.yoctoproject.org/releases/yocto/yocto-3.3.2/meta-mingw-hardknott-25.0.2.tar.bz2 http://mirrors.kernel.org/yocto/yocto/yocto-3.3.2/meta-mingw-hardknott-25.0.2.tar.bz2
Repository Name: meta-gplv2 Repository Location: https://git.yoctoproject.org/git/meta-gplv2 Branch: hardknott Tag: yocto-3.3.2 Git Revision: 9e119f333cc8f53bd3cf64326f826dbc6ce3db0f Release Artefact: meta-gplv2-hardknott-25.0.2 sha: 817c412acc13c929dfcc36818d81e1f2d42ae4ce65548724921a011a8643fd03 Download Locations: http://downloads.yoctoproject.org/releases/yocto/yocto-3.3.2/meta-gplv2-hardknott-25.0.2.tar.bz2 http://mirrors.kernel.org/yocto/yocto/yocto-3.3.2/meta-gplv2-hardknott-25.0.2.tar.bz2
Repository Name: bitbake Repository Location: https://git.openembedded.org/bitbake Branch: 1.50 Tag: 2021-04.2-hardknott Git Revision: 731fb52eb03338c0bdb2a2256c22c64c22bcbace Release Artefact: bitbake-hardknott-25.0.2 sha: 9504b632da89d28400847f5255a12444016ab5e77dd156701e0b7573a7aaba3e Download Locations: http://downloads.yoctoproject.org/releases/yocto/yocto-3.3.2/bitbake-hardknott-25.0.2.tar.bz2 http://mirrors.kernel.org/yocto/yocto/yocto-3.3.2/bitbake-hardknott-25.0.2.tar.bz2
epository Name: yocto-docs Repository Location: https://git.yoctoproject.org/git/yocto-docs Branch: hardknott Tag: yocto-3.3.2 Git Revision: dae6a0209d69c267d3cbace6589b0ac73e06abce
- --------------- Contributors - --------------- Alejandro Hernandez Samaniego Alexander Kanavin Andrea Adami Andrej Valek Anuj Mittal Asfak Rahman Bastian Krause Bruce Ashfield Changqing Li Daniel McGregor Florian Amstutz Guillaume Champagne Harald Brinkmann Jain Sangeeta jbouchard Joshua Watt Kai Kang Khairul Rohaizzat Jamaluddin Khem Raj Marek Vasut Michael Halstead Michael Ho Ming Liu Mingli Yu Nicolas Dechesne Nikolay Papenkov Peter Kjellerstedt Richard Purdie Robert P. J. Day Ross Burton Sakib Sajal Scott Weaver Stefan Ghinea Stephen Jolley Steve Sakoman Tony Tascioglu Trevor Gamblin Vinay Kumar Wadim Egorov wangmy Yi Zhao zhengruoqin Zqiang
- --------------- Known Issues - --------------- Bug 14388 - AB-INT PTEST: valgrind failed helgrind/tests/hg05_race2
- --------------- Security Fixes - --------------- curl: Fix CVE-2021-22897 curl: Fix CVE-2021-22898 binutils: Fix CVE-2021-20197 rxvt-unicode: fix CVE-2021-33477 libconvert-asn1-perl: fix CVE-2013-7488 avahi: apply fix for CVE-2021-3468 libx11: fix CVE-2021-31535 curl: cleanup CVE patches for hardknott expat: set CVE_PRODUCT curl: fix CVE-2021-22876 curl: fix CVE-2021-22890 qemu: Exclude CVE-2020-3550[4/5/6] from cve-check xinetd: Exclude CVE-2013-4342 from cve-check cve-extra-exclusions.inc: add exclusion list for intractable CVE's grub: Exclude CVE-2019-14865 from cve-check grub2: Add CVE whitelist entries for issues fixed in 2.06 libxml2: Fix CVE-2021-3541 libxml2: Fix CVE-2021-3518 libxml2: fix CVE-2021-3537 libxml2: fix CVE-2021-3516 libxml2: fix CVE-2021-3517 cups: whitelist CVE-2021-25317 avahi: Exclude CVE-2021-26720 from cve-check librsvg: Exclude CVE-2018-1000041 from cve-check coreutils: Exclude CVE-2016-2781 from cve-check tiff: Exclude CVE-2015-7313 from cve-check bluez: Exclude CVE-2020-12352 CVE-2020-24490 from cve-check ghostscript: Exclude CVE-2013-6629 from cve-check cpio: Exclude CVE-2010-4226 from cve-check unzip: Exclude CVE-2008-0888 from cve-check openssh: Exclude CVE-2008-3844 from cve-check openssh: Exclude CVE-2007-2768 from cve-check logrotate: Exclude CVE-2011-1548,1549,1550 from cve-check jquery: Exclude CVE-2007-2379 from cve-check qemu: Exclude CVE-2018-18438 from cve-check qemu: Exclude CVE-2007-0998 from cve-check qemu: Exclude CVE-2017-5957 from cve-check builder: whitelist CVE-2008-4178 (a different builder) libnotify: whitelist CVE-2013-7381 (specific to the NodeJS bindings) glibc: Document and whitelist CVE-2019-1010022-25
- --------------- Fixes - --------------- bitbake: data_smart: Allow colon in variable expansion regex bitbake: data_smart/parse: Allow ':' characters in variable/function names poky.conf: bump version for 3.3.2 hardknott release documentation: prepare for 3.3.2 release xserver-xorg: Fix builds without glx busybox: add tmpdir option into mktemp applet kernel-devsrc: fix scripts prepare for powerpc kernel-devsrc: fix scripts/prepare for ARM64 dwarfsrcfiles: Avoid races over debug-link files oeqa/selftest/multiprocesslauch: Fix test race go: upgrade 1.16.4 -> 1.16.5 go: upgrade 1.16.3 -> 1.16.4 linux-yocto-dev: base AUTOREV on specified version boost-build-native: workaround one rarely hang problem on fedora34 glibc-testsuite: Fix build failures when directly running recipe runqemu: Remove potential lock races around tap device handling perl: correct libpth and glibpth busybox: upgrade 1.33.0 -> 1.33.1 linux-firmware: Package RSI 911x WiFi firmware linux-yocto/5.10: scsi-debug needs scsi-disk linux-yocto/5.4: update to v5.4.129 linux-yocto/5.10: update to v5.10.47 openssh: Remove temporary keys before generating new ones oeqa/selftest/archiver: Allow tests to ignore empty directories devtool: deploy-target: Fix preserving attributes when using --strip sstate/staging: Handle directory creation race issue oeqa/selftest/runcmd: Tweal test timeouts bitbake: fetch2: add check for empty SRC_URI hash string bitbake: fetch/svn: Fix parsing revision of SVN repos with redirects bsps/5.10: update to v5.10.43 lttng-modules: update to v2.12.6 kernel-devsrc: adjust NM and OBJTOOL variables for target kern-tools: Kconfiglib: add support for bare 'modules' keyword kern-tools: add dropped options to audit output curl: fix build when proxy is not enabled in PACKAGECONFIG libgcrypt: upgrade 1.9.2 -> 1.9.3 kernel-devicetree: Fix interaction when packaging disabled sstate.bbclass: fix errors about read-only sstate mirrors Use the label provided when formating a dos partition linux-yocto/5.10: rcu: Fix stall-warning deadlock due to non-release of rcu_node ->lock linux-yocto/5.4: update to v5.4.128 linux-yocto/5.10: features/nft_tables: refresh config options linux-yocto/5.10: update to v5.10.46 kernel: Fix interaction when packaging disabled selftest/fetch: Avoid occasional selftest failure from poor temp file name choice ifupdown: Skip wrong test item package_pkgdata: Avoid task hash mismatches for generic task changes devtool upgrade: rebase override-only patches as well uboot-sign.bbclass: fix some install commands linux-yocto/5.10: cgroup1: fix leaked context root causing sporadic NULL deref in LTP linux-yocto/5.10: update to v5.10.43 linux-yocto/5.10: update to v5.10.42 kernel.bbclass: fix do_sizecheck() comparison perf: Use python3targetconfig to ensure we use target libraries valgrind: Actually install list of non-deterministic ptests valgrind: remove buggy ptest from arm64 linuxloader: Be aware of riscv32 ldso linux-yocto/5.4: update to v5.4.125 lttng-tools: upgrade 2.12.3 -> 2.12.4 linux-yocto/5.4: update to v5.4.124 native.bbclass: Do not remove "-native" in the middle of recipe names util-linux.inc: Do not modify BPN linux-firmware: upgrade 20210315 -> 20210511 image-live.bbclass: order do_bootimg after do_rootfs linux-yocto/5.4: update to v5.4.123 linux-yocto/5.10: update to v5.10.41 linux-yocto/5.4: update to v5.4.120 linux-yocto/5.10: update to v5.10.38 linux-yocto/5.4: update to v5.4.119 linux-yocto/5.10: update to v5.10.37 linux-yocto/5.4: update to v5.4.118 linux-yocto/5.10: update to v5.10.36 linux-yocto/5.10: ktypes/standard: disable obsolete crypto options by default linux-yocto/5.4: update to v5.4.117 linux-yocto/5.10: update to v5.10.35 classes/reproducible_build: Use atomic rename for SDE file valgrind: Improve non-deterministic ptest reliability valgrind: fix a typo python3: upgrade 3.9.4 -> 3.9.5 oeqa/runtime/rpm: Drop log message counting test component package_rpm: pass XZ_THREADS to rpm pkgconfig: update SRC_URI flex: correct license information bind: upgrade 9.16.15 -> 9.16.16 bind: upgrade 9.16.13 -> 9.16.15 bind: upgrade 9.16.12 -> 9.16.13 lib/oe/gpg_sign.py: Fix gpg verification sstate: Ignore sstate signing key boost: fix do_fetch failure baremetal-image: Fix post process command rootfs_update_timestamp ltp: Disable problematic tests causing autobuilder hangs ccache: add packageconfig docs option sstate: Handle manifest 'corruption' issue glibc: Add 8GB VM usage cap for usermode test suite uninative: Upgrade to 3.2 (gcc11 support) meta/lib/oe/rootfs.py: Fix typo "Restoreing" -> "Restoring" image.bbclass: fix comment "pacackages" -> "packages" bitbake: server/process: Handle error in heartbeat funciton in OOM case bitbake: fetch2/wget: when checking latest versions, consider all numerical directories
|
|
|
|
Re: [meta-rockchip][PATCH 1/2] layer: Convert to new override syntax
On Tue, Aug 3, 2021 at 12:47 PM Trevor Woerner <twoerner@...> wrote:
please use v2
|
|
|
|
[meta-rockchip][PATCH v2 2/2] layer.conf: Drop compatibility with older than hardknott releases
New override syntax requires it
Signed-off-by: Khem Raj <raj.khem@...> --- v2: Rebase conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/layer.conf b/conf/layer.conf index f97fb69..25b0a99 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -14,7 +14,7 @@ BBFILE_PRIORITY_rockchip = "1" # This should only be incremented on significant changes that will # cause compatibility issues with other layers LAYERVERSION_rockchip = "1" -LAYERSERIES_COMPAT_rockchip = "hardknott" +LAYERSERIES_COMPAT_rockchip = "honister" LAYERDEPENDS_rockchip = "core meta-arm" BBFILES_DYNAMIC += " \ -- 2.32.0
|
|
|