diff --git a/.oebuild/common.yaml b/.oebuild/common.yaml index d9e19a43bd5b7704d02e1e8a9428bfce0478926c..5a2c6eb7706b6e784a1b55c47f52135ceaa5b14f 100644 --- a/.oebuild/common.yaml +++ b/.oebuild/common.yaml @@ -2,9 +2,9 @@ repos: yocto-poky: url: https://gitee.com/openeuler/yocto-poky.git path: yocto-poky - refspec: v3.3.6 + refspec: v4.0.10 yocto-meta-openembedded: url: https://gitee.com/openeuler/yocto-meta-openembedded.git path: yocto-meta-openembedded - refspec: dev_hardknott + refspec: kirkstone diff --git a/.oebuild/env.yaml b/.oebuild/env.yaml index 19be36c2049185a8903f43ab459d20ccadf228ea..6f0b8e135d6609e542d50844f2728e160ef94508 100644 --- a/.oebuild/env.yaml +++ b/.oebuild/env.yaml @@ -1 +1 @@ -docker_tag: latest +docker_tag: refactor diff --git a/.oebuild/features/clang.yaml b/.oebuild/features/clang.yaml index ba55ed5daa7ba447d0fb757bab6dc3ad7c4e14a8..f6b9c51a6a944d947373465ce2598074a18356af 100644 --- a/.oebuild/features/clang.yaml +++ b/.oebuild/features/clang.yaml @@ -3,9 +3,9 @@ type: feature support: aarch64-std|raspberrypi4-64 local_conf: | - DISTRO_FEATURES_append = " clang " - DISTRO_FEATURES_NATIVE_append = " clang " - EXTERNAL_TOOLCHAIN_CLANG_BIN = "${EXTERNAL_TOOLCHAIN_aarch64}/bin" + DISTRO_FEATURES:append = " clang " + DISTRO_FEATURES_NATIVE:append = " clang " + EXTERNAL_TOOLCHAIN_CLANG_BIN = "${EXTERNAL_TOOLCHAIN:aarch64}/bin" layers: - yocto-meta-openeuler/meta-clang diff --git a/.oebuild/features/musl.yaml b/.oebuild/features/musl.yaml index 2f7c910638dddce0645a58c3227f83e83bd7eaca..f9f5baa4d2e983f351931fe046b4f72e39443f58 100644 --- a/.oebuild/features/musl.yaml +++ b/.oebuild/features/musl.yaml @@ -3,7 +3,7 @@ type: feature support: aarch64-std|raspberrypi4-64 local_conf: | - EXTERNAL_TARGET_SYS_aarch64 = "aarch64-openeuler-linux-musl" + EXTERNAL_TARGET_SYS:aarch64 = "aarch64-openeuler-linux-musl" TCLIBC = "musl" TCMODE-LIBC = "musl" TCMODE-CRYPT = "musl" diff --git a/.oebuild/features/openeuler-mcs.yaml b/.oebuild/features/openeuler-mcs.yaml index e9dd4a90f8863603d796fab59d8e24cb33df9faf..5c2c29c08e186950b453762ff08db64ae238849e 100644 --- a/.oebuild/features/openeuler-mcs.yaml +++ b/.oebuild/features/openeuler-mcs.yaml @@ -8,7 +8,7 @@ layers: local_conf: | MCS_FEATURES ?= "openamp zephyr lopper-devicetree" - DISTRO_FEATURES_append = " mcs " + DISTRO_FEATURES:append = " mcs " repos: Jailhouse: diff --git a/.oebuild/features/openeuler-qt.yaml b/.oebuild/features/openeuler-qt.yaml index 34ac45781a31dafe2fc66b5d455c0df140659c09..f99fe6d820251e81e8105f8e9c76721dc6351266 100644 --- a/.oebuild/features/openeuler-qt.yaml +++ b/.oebuild/features/openeuler-qt.yaml @@ -9,7 +9,7 @@ repos: refspec: dev_hardknott local_conf: | - DISTRO_FEATURES_append = " opengl wayland" + DISTRO_FEATURES:append = " opengl wayland" layers: - yocto-meta-openembedded/meta-oe diff --git a/.oebuild/features/openeuler-ros.yaml b/.oebuild/features/openeuler-ros.yaml index fbe047344a8e325cb8f1fe74a86d5bf6944466ec..8aa961e42e556214a018f7b1659c408d85b482fb 100644 --- a/.oebuild/features/openeuler-ros.yaml +++ b/.oebuild/features/openeuler-ros.yaml @@ -8,7 +8,7 @@ repos: yocto-meta-ros: url: https://gitee.com/openeuler/yocto-meta-ros.git path: yocto-meta-ros - refspec: dev_hardknott + refspec: dev_honister layers: - yocto-meta-ros/meta-ros-common @@ -16,4 +16,4 @@ layers: - yocto-meta-ros/meta-ros2-humble local_conf: | - DISTRO_FEATURES_append = " ros " + DISTRO_FEATURES:append = " ros " diff --git a/.oebuild/local.conf.sample b/.oebuild/local.conf.sample index 6d0fdc9225838a92cf9078ea9ce7bda6b7879076..fc5cebae89ddc6d45b9e5b1785b032959a75e3b2 100644 --- a/.oebuild/local.conf.sample +++ b/.oebuild/local.conf.sample @@ -2,9 +2,10 @@ # This file is your local configuration file and is where all local user settings # are placed. The comments in this file give some guide to the options a new user # to the system might want to change but pretty much any configuration option can -# be set in this file. More adventurous users can look at local.conf.extended -# which contains other examples of configuration which can be placed in this file -# but new users likely won't need any of them initially. +# be set in this file. More adventurous users can look at +# local.conf.sample.extended which contains other examples of configuration which +# can be placed in this file but new users likely won't need any of them +# initially. # # Lines starting with the '#' character are commented out and in some cases the # default values are provided as comments to show people example syntax. Enabling @@ -184,7 +185,7 @@ PATCHRESOLVE = "noop" # # Monitor the disk space during the build. If there is less that 1GB of space or less # than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully -# shutdown the build. If there is less than 100MB or 1K inodes, perform a hard abort +# shutdown the build. If there is less than 100MB or 1K inodes, perform a hard halt # of the build. The reason for this is that running completely out of space can corrupt # files and damages the build in ways which may not be easily recoverable. # It's necessary to monitor /tmp, if there is no space left the build will fail @@ -194,10 +195,10 @@ BB_DISKMON_DIRS ??= "\ STOPTASKS,${DL_DIR},1G,100K \ STOPTASKS,${SSTATE_DIR},1G,100K \ STOPTASKS,/tmp,100M,100K \ - ABORT,${TMPDIR},100M,1K \ - ABORT,${DL_DIR},100M,1K \ - ABORT,${SSTATE_DIR},100M,1K \ - ABORT,/tmp,10M,1K" + HALT,${TMPDIR},100M,1K \ + HALT,${DL_DIR},100M,1K \ + HALT,${SSTATE_DIR},100M,1K \ + HALT,/tmp,10M,1K" # # Shared-state files from other locations @@ -206,7 +207,7 @@ BB_DISKMON_DIRS ??= "\ # used to accelerate build time. This variable can be used to configure the system # to search other mirror locations for these objects before it builds the data itself. # -# This can be a filesystem directory, or a remote url such as http or ftp. These +# This can be a filesystem directory, or a remote url such as https or ftp. These # would contain the sstate-cache results from previous builds (possibly from other # machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the # cache locations to check for the shared objects. @@ -214,34 +215,36 @@ BB_DISKMON_DIRS ??= "\ # at the end as shown in the examples below. This will be substituted with the # correct path within the directory structure. #SSTATE_MIRRORS ?= "\ -#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ +#file://.* https://someserver.tld/share/sstate/PATH;downloadfilename=PATH \ #file://.* file:///some/local/dir/sstate/PATH" # # Yocto Project SState Mirror # # The Yocto Project has prebuilt artefacts available for its releases, you can enable -# use of these by uncommenting the following line. This will mean the build uses +# use of these by uncommenting the following lines. This will mean the build uses # the network to check for artefacts at the start of builds, which does slow it down # equally, it will also speed up the builds by not having to build things if they are # present in the cache. It assumes you can download something faster than you can build it # which will depend on your network. +# Note: For this to work you also need hash-equivalence passthrough to the matching server # -#SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/2.5/PATH;downloadfilename=PATH" +#BB_HASHSERVE_UPSTREAM = "hashserv.yocto.io:8687" +#SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/all/PATH;downloadfilename=PATH" # # Qemu configuration # # By default native qemu will build with a builtin VNC server where graphical output can be # seen. The line below enables the SDL UI frontend too. -#PACKAGECONFIG_append:pn-qemu-system-native = " sdl" +#PACKAGECONFIG:append:pn-qemu-system-native = " sdl" # By default libsdl2-native will be built, if you want to use your host's libSDL instead of # the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below. #ASSUME_PROVIDED += "libsdl2-native" # You can also enable the Gtk UI frontend, which takes somewhat longer to build, but adds # a handy set of menus for controlling the emulator. -#PACKAGECONFIG_append:pn-qemu-system-native = " gtk+" +#PACKAGECONFIG:append:pn-qemu-system-native = " gtk+" # # Hash Equivalence @@ -276,8 +279,8 @@ require conf/distro/include/openeuler_hosttools.inc PATCHTOOL = "patch" TCMODE = "external-openeuler" -INHERIT_remove = "uninative" -PATCHDEPENDENCY_remove = "patch-replacement-native:do_populate_sysroot" +INHERIT:remove = "uninative" +PATCHDEPENDENCY:remove = "patch-replacement-native:do_populate_sysroot" # openEuler software package dir # all openeEuler software packages will be downloaded by specific tool @@ -301,14 +304,14 @@ OPENEULER_NATIVESDK_SYSROOT = "/opt/buildtools/nativesdk/sysroots/x86_64-pokysdk # # openeuler_gcc_arm64le # openeuler_gcc_arm32le" -EXTERNAL_TOOLCHAIN_arm = "/usr1/openeuler/gcc/openeuler_gcc_arm32le" -EXTERNAL_TOOLCHAIN_aarch64 = "/usr1/openeuler/gcc/openeuler_gcc_arm64le" -EXTERNAL_TOOLCHAIN_x86-64 = "/usr1/openeuler/gcc/openeuler_gcc_x86_64" -EXTERNAL_TOOLCHAIN_riscv64 = "/usr1/openeuler/gcc/openeuler_gcc_riscv64" -EXTERNAL_TARGET_SYS_arm = "arm-openeuler-linux-gnueabi" -EXTERNAL_TARGET_SYS_aarch64 = "aarch64-openeuler-linux-gnu" -EXTERNAL_TARGET_SYS_x86-64 = "x86_64-openeuler-linux-gnu" -EXTERNAL_TARGET_SYS_riscv64 = "riscv64-openeuler-linux-gnu" +EXTERNAL_TOOLCHAIN:arm = "/usr1/openeuler/gcc/openeuler_gcc_arm32le" +EXTERNAL_TOOLCHAIN:aarch64 = "/usr1/openeuler/gcc/openeuler_gcc_arm64le" +EXTERNAL_TOOLCHAIN:x86-64 = "/usr1/openeuler/gcc/openeuler_gcc_x86_64" +EXTERNAL_TOOLCHAIN:riscv64 = "/usr1/openeuler/gcc/openeuler_gcc_riscv64" +EXTERNAL_TARGET_SYS:arm = "arm-openeuler-linux-gnueabi" +EXTERNAL_TARGET_SYS:aarch64 = "aarch64-openeuler-linux-gnu" +EXTERNAL_TARGET_SYS:x86-64 = "x86_64-openeuler-linux-gnu" +EXTERNAL_TARGET_SYS:riscv64 = "riscv64-openeuler-linux-gnu" # default openeuler platform OPENEULER_PLATFORM = "aarch64-std" diff --git a/.oebuild/manifest.yaml b/.oebuild/manifest.yaml index 2805d945bf77fe4b4be3792661402a1ee67ab792..e270289c4cebf6adab59add65ae8705845e38207 100644 --- a/.oebuild/manifest.yaml +++ b/.oebuild/manifest.yaml @@ -170,7 +170,7 @@ manifest_list: version: 603b423090de124bbeb2126857b7a8b10cc0d016 glog: remote_url: https://gitee.com/src-openeuler/glog.git - version: 036df3dc807fba0bb0ead788c08933fcc7a9e080 + version: cbd825ec8b2698ef9f79f44dea31359b137c247c gmp: remote_url: https://gitee.com/src-openeuler/gmp.git version: 5a5e303b40e80a2266244c539c2f0fdfd35b0d8f @@ -293,7 +293,7 @@ manifest_list: version: 1fdb406ad64c058565318a1d378406c848c82bd4 libffi: remote_url: https://gitee.com/src-openeuler/libffi.git - version: efed57920ddaa573f7c17e3a5c6c7c279478cb38 + version: e2da93464db46f7fb4e676b2aa4350301e2968e2 libgcrypt: remote_url: https://gitee.com/src-openeuler/libgcrypt.git version: 6c7dc4542be4cd481e0a7fe0352839ee64e88b0b @@ -531,6 +531,9 @@ manifest_list: python-docutils: remote_url: https://gitee.com/src-openeuler/python-docutils.git version: 257be78ad8bbc4d29d03baef211f14d850d59734 + python-docopt: + remote_url: https://gitee.com/src-openeuler/python-docopt.git + version: 6de180c379485aa23cdb01054e27c0852ad0ec43 python-humanfriendly: remote_url: https://gitee.com/src-openeuler/python-humanfriendly.git version: 08a6f88833ba4f41057974c8fb7221ce2b1973bc @@ -555,6 +558,9 @@ manifest_list: python-packaging: remote_url: https://gitee.com/src-openeuler/python-packaging.git version: fbc94756803f39c61adde2931c5fe32a104f1d6b + python-pathlib2: + remote_url: https://gitee.com/src-openeuler/python-pathlib2.git + version: 678955fa7a0433bd52acb1b5f85c4d625ef6e453 python-pep8: remote_url: https://gitee.com/src-openeuler/python-pep8.git version: a3ae17fd37d420597e4ddbb28d9e92ef47a5036a @@ -578,7 +584,7 @@ manifest_list: version: 8ac8a08e26e79790a02fb647378e305f7d848a6c python3: remote_url: https://gitee.com/src-openeuler/python3.git - version: a4c17510088534a5ac3e7a7302aaf88b96814798 + version: 5f848e0a95c52a971c1d11e6a4910905320ae73e qt5-qtbase: remote_url: https://gitee.com/src-openeuler/qt5-qtbase.git version: c41d3f406aa9fa6ae271dabea1f706cc23bc1951 @@ -662,7 +668,7 @@ manifest_list: version: 9fd2e6f9b698396a887208d2426a8c479d5d8771 tinyxml2: remote_url: https://gitee.com/src-openeuler/tinyxml2.git - version: e0e993959c2d780e6a7e2b01a5bd0866971324e5 + version: 29d8318f8837dccf7205d0a72ec6823d6d5aa09f tslib: remote_url: https://gitee.com/src-openeuler/tslib.git version: 1370aeba6969b893018bd157b49aa2c64e7fe2da @@ -716,19 +722,19 @@ manifest_list: version: fbe5a7627b629a9400c2d7e7099c1934b592e355 yocto-meta-openembedded: remote_url: https://gitee.com/openeuler/yocto-meta-openembedded.git - version: 54204353f2953d0cd36a8d5ed35ce9a560852ff7 + version: a82d92c8a6525da01524bf8f4a60bf6b35dcbb3d yocto-meta-qt5: remote_url: https://gitee.com/openeuler/yocto-meta-qt5.git - version: 43f8f539d40070a70fe89136db89bf5bb1dfe7ed + version: bff5bd937f0776166e81a63f3dd39ede348ef758 yocto-meta-ros: remote_url: https://gitee.com/openeuler/yocto-meta-ros.git - version: 5e89706808f08397dda040395acfe9fc294b229f + version: 6e559558c8c7ddf1b828a5f82d33eb0274bc2fc3 yocto-opkg-utils: remote_url: https://gitee.com/src-openeuler/yocto-opkg-utils.git version: 1d04472046d0225e013dd7e18c62dddf82025969 yocto-poky: remote_url: https://gitee.com/openeuler/yocto-poky.git - version: 230e29ee70a751dea2bbba1d69b6fa803db51353 + version: f53ab3a2ff206a130cdc843839dd0ea5ec4ad02f yocto-pseudo: remote_url: https://gitee.com/src-openeuler/yocto-pseudo.git version: 3c4978a07fbb5a0c6288e77ae5b24ee33ddf34f9 diff --git a/.oebuild/platform/aarch64-std.yaml b/.oebuild/platform/aarch64-std.yaml index 653a47d920e100d1f3f25eb58758d586acd03de5..c3c1f5eb6804a1df1b59c04fa3d82ac645072dcb 100644 --- a/.oebuild/platform/aarch64-std.yaml +++ b/.oebuild/platform/aarch64-std.yaml @@ -2,4 +2,4 @@ type: platform machine: qemu-aarch64 -toolchain_type: EXTERNAL_TOOLCHAIN_aarch64 +toolchain_type: EXTERNAL_TOOLCHAIN:aarch64 diff --git a/.oebuild/platform/arm-std.yaml b/.oebuild/platform/arm-std.yaml index 729ca593c892741037a8029bea691cad9f9ce9b5..8e718c4b02eeb2f57ea619fb75095823d85c1507 100644 --- a/.oebuild/platform/arm-std.yaml +++ b/.oebuild/platform/arm-std.yaml @@ -2,4 +2,4 @@ type: platform machine: qemu-arm -toolchain_type: EXTERNAL_TOOLCHAIN_arm +toolchain_type: EXTERNAL_TOOLCHAIN:arm diff --git a/.oebuild/platform/hi3093.yaml b/.oebuild/platform/hi3093.yaml index 2b5fee86ee18c98a00bde6fe2680a645a0d3e4a1..6b4ad642eccfbfc1dc1173cbe09537fba26d9e4c 100644 --- a/.oebuild/platform/hi3093.yaml +++ b/.oebuild/platform/hi3093.yaml @@ -2,7 +2,7 @@ type: platform machine: hi3093 -toolchain_type: EXTERNAL_TOOLCHAIN_aarch64 +toolchain_type: EXTERNAL_TOOLCHAIN:aarch64 layers: - yocto-meta-openeuler/bsp/meta-hisilicon diff --git a/.oebuild/platform/ok3568.yaml b/.oebuild/platform/ok3568.yaml index eb475b0ea8c39bff273df1ce886f6d1e53e5e7a3..f9d8d874857e676d95b6b06cdcf9741f17b8ceb2 100644 --- a/.oebuild/platform/ok3568.yaml +++ b/.oebuild/platform/ok3568.yaml @@ -2,7 +2,7 @@ type: platform machine: ok3568 -toolchain_type: EXTERNAL_TOOLCHAIN_aarch64 +toolchain_type: EXTERNAL_TOOLCHAIN:aarch64 layers: - yocto-meta-openeuler/bsp/meta-rockchip diff --git a/.oebuild/platform/raspberrypi4-64.yaml b/.oebuild/platform/raspberrypi4-64.yaml index 4c9869e8d68a6d055180cff41f068d42182daa0c..3df85671ec3f160cbe9142955eaad5deef1b5b11 100644 --- a/.oebuild/platform/raspberrypi4-64.yaml +++ b/.oebuild/platform/raspberrypi4-64.yaml @@ -2,7 +2,7 @@ type: platform machine: raspberrypi4-64 -toolchain_type: EXTERNAL_TOOLCHAIN_aarch64 +toolchain_type: EXTERNAL_TOOLCHAIN:aarch64 layers: - yocto-meta-openeuler/bsp/meta-raspberrypi diff --git a/.oebuild/platform/riscv64-std.yaml b/.oebuild/platform/riscv64-std.yaml index 8655da9790b509119502f4dec078f0d580de6627..bb58e7c48e28874891dc34dce9a57619ec071098 100644 --- a/.oebuild/platform/riscv64-std.yaml +++ b/.oebuild/platform/riscv64-std.yaml @@ -2,4 +2,4 @@ type: platform machine: qemu-riscv64 -toolchain_type: EXTERNAL_TOOLCHAIN_riscv64 +toolchain_type: EXTERNAL_TOOLCHAIN:riscv64 diff --git a/.oebuild/platform/ryd-3568.yaml b/.oebuild/platform/ryd-3568.yaml index b0d0baa7c3e813b23375bcd3d2e32b40f02d89d7..f5e1f941a7931e75a7619f94a07ef1532ed3972c 100644 --- a/.oebuild/platform/ryd-3568.yaml +++ b/.oebuild/platform/ryd-3568.yaml @@ -2,7 +2,7 @@ type: platform machine: ryd-3568 -toolchain_type: EXTERNAL_TOOLCHAIN_aarch64 +toolchain_type: EXTERNAL_TOOLCHAIN:aarch64 layers: - yocto-meta-openeuler/bsp/meta-rockchip diff --git a/.oebuild/platform/visionfive2.yaml b/.oebuild/platform/visionfive2.yaml index a8dcf48a49124cc61c5ae51d2587371af88536fb..55a11c65ebf1b0a061bf39f698a198406e31980a 100644 --- a/.oebuild/platform/visionfive2.yaml +++ b/.oebuild/platform/visionfive2.yaml @@ -2,7 +2,7 @@ type: platform machine: starfive-dubhe -toolchain_type: EXTERNAL_TOOLCHAIN_riscv64 +toolchain_type: EXTERNAL_TOOLCHAIN:riscv64 layers: - yocto-meta-openeuler/bsp/meta-visionfive2 diff --git a/.oebuild/platform/x86-64-std.yaml b/.oebuild/platform/x86-64-std.yaml index 96e4b25a63ffc63ea3e97c21bd99e330a5b58b66..0028fcf8128dd72093e3007d0a0a300f8bc14395 100644 --- a/.oebuild/platform/x86-64-std.yaml +++ b/.oebuild/platform/x86-64-std.yaml @@ -2,4 +2,4 @@ type: platform machine: generic-x86-64 -toolchain_type: EXTERNAL_TOOLCHAIN_x86-64 +toolchain_type: EXTERNAL_TOOLCHAIN:x86-64 diff --git a/bsp/meta-hisilicon/conf/layer.conf b/bsp/meta-hisilicon/conf/layer.conf index d5f760d81e87187b457d36ed649cfdb4b3730818..67d2c96c5410114cecb39707587afb872828702e 100644 --- a/bsp/meta-hisilicon/conf/layer.conf +++ b/bsp/meta-hisilicon/conf/layer.conf @@ -9,8 +9,8 @@ BBFILE_COLLECTIONS += "hisilicon" BBFILE_PATTERN_hisilicon = "^${LAYERDIR}/" BBFILE_PRIORITY_hisilicon = "6" -LAYERDEPENDS_hisilicon = "core" -LAYERSERIES_COMPAT_hisilicon = "hardknott" +LAYERDEPENDS:hisilicon = "core" +LAYERSERIES_COMPAT_hisilicon = "kirkstone" # enable .bb under qt5-layer/ when exist meta-qt5 BBFILES_DYNAMIC += " \ diff --git a/bsp/meta-hisilicon/conf/machine/include/hi1711.inc b/bsp/meta-hisilicon/conf/machine/include/hi1711.inc index 63029ac2c12237dabe17534f99fb3a71b1d0d513..aae8117637f83e7ee6e873998c4084fe948f8bee 100644 --- a/bsp/meta-hisilicon/conf/machine/include/hi1711.inc +++ b/bsp/meta-hisilicon/conf/machine/include/hi1711.inc @@ -21,7 +21,7 @@ SERIAL_CONSOLES = "115200;ttyS0" # arm and arm64 both support -mlittle-endian so no # need to consider compat32. TUNE_CCARGS .= " -mlittle-endian" -IMAGE_INSTALL_append = " kernel-modules" +IMAGE_INSTALL:append = " kernel-modules" # auto load module during startup KERNEL_MODULE_AUTOLOAD = "" diff --git a/bsp/meta-hisilicon/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/bsp/meta-hisilicon/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend index b2aebdd5534043929ff9bf35fba496abecbaff30..b7c723af090c0fae0b4c5fcae814980877dfc98b 100644 --- a/bsp/meta-hisilicon/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend +++ b/bsp/meta-hisilicon/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend @@ -1,19 +1,19 @@ PACKAGECONFIG_GL = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'gl', \ bb.utils.contains('DISTRO_FEATURES', 'opengl', 'eglfs gles2', \ '', d), d)}" -PACKAGECONFIG_GL_append = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', ' kms', '', d)}" -PACKAGECONFIG_GL_append = " gbm" +PACKAGECONFIG_GL:append = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', ' kms', '', d)}" +PACKAGECONFIG_GL:append = " gbm" PACKAGECONFIG_FONTS = "fontconfig" -PACKAGECONFIG_append = " libinput examples tslib xkbcommon" -PACKAGECONFIG_remove = "tests" +PACKAGECONFIG:append = " libinput examples tslib xkbcommon" +PACKAGECONFIG:remove = "tests" OE_QTBASE_EGLFS_DEVICE_INTEGRATION = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'eglfs_brcm', d)}" -do_configure_prepend() { +do_configure:prepend() { # Add the appropriate EGLFS_DEVICE_INTEGRATION if [ "${@d.getVar('OE_QTBASE_EGLFS_DEVICE_INTEGRATION')}" != "" ]; then echo "EGLFS_DEVICE_INTEGRATION = ${OE_QTBASE_EGLFS_DEVICE_INTEGRATION}" >> ${S}/mkspecs/oe-device-extra.pri fi } -RDEPENDS_${PN}_append = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" -DEPENDS_append = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" +RDEPENDS:${PN}:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" +DEPENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" diff --git a/bsp/meta-hisilicon/recipes-core/busybox/busybox_%.bbappend b/bsp/meta-hisilicon/recipes-core/busybox/busybox_%.bbappend index 6227aa91e52a4b3487191fcdd6f29349e91948af..c8801f6441ab3f691a1232b0508181784812f4a3 100644 --- a/bsp/meta-hisilicon/recipes-core/busybox/busybox_%.bbappend +++ b/bsp/meta-hisilicon/recipes-core/busybox/busybox_%.bbappend @@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files/:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files/:" -SRC_URI_append = " \ +SRC_URI:append = " \ file://devmem.cfg \ " diff --git a/bsp/meta-hisilicon/recipes-core/images/hi1711.inc b/bsp/meta-hisilicon/recipes-core/images/hi1711.inc index 17d26821aed8fcd18b14393a9f8e0edd3639b58e..01160bb034fbbb996c71277b29172faa6f2c2989 100644 --- a/bsp/meta-hisilicon/recipes-core/images/hi1711.inc +++ b/bsp/meta-hisilicon/recipes-core/images/hi1711.inc @@ -1,5 +1,5 @@ IMAGE_FSTYPES = "cpio.gz" -IMAGE_FSTYPES_remove = "iso" +IMAGE_FSTYPES:remove = "iso" IMAGE_FSTYPES_DEBUGFS = "cpio.gz" INITRAMFS_MAXSIZE = "476591" diff --git a/bsp/meta-hisilicon/recipes-core/packagegroups/packagegroup-base.bbappend b/bsp/meta-hisilicon/recipes-core/packagegroups/packagegroup-base.bbappend index d3a59a30727519b7c0ab5873319f17e1e284e4e6..285693793e8db74687c7592c8e4566510e6e0329 100644 --- a/bsp/meta-hisilicon/recipes-core/packagegroups/packagegroup-base.bbappend +++ b/bsp/meta-hisilicon/recipes-core/packagegroups/packagegroup-base.bbappend @@ -1,3 +1,3 @@ -RDEPENDS_packagegroup-base_append += " \ +RDEPENDS:packagegroup-base:append = " \ e2fsprogs-resize2fs \ " diff --git a/bsp/meta-hisilicon/recipes-core/packagegroups/packagegroup-core-boot.bbappend b/bsp/meta-hisilicon/recipes-core/packagegroups/packagegroup-core-boot.bbappend index 3704a22c21fef4a60e565520aae24abaa23a3916..79080ebe34d50c6a0347ffc30efeaade9ac2deed 100644 --- a/bsp/meta-hisilicon/recipes-core/packagegroups/packagegroup-core-boot.bbappend +++ b/bsp/meta-hisilicon/recipes-core/packagegroups/packagegroup-core-boot.bbappend @@ -1,5 +1,5 @@ # we add bootfile -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ bootfile \ 3093-watchdog \ " diff --git a/bsp/meta-hisilicon/recipes-core/watchdog/3093-watchdog.bb b/bsp/meta-hisilicon/recipes-core/watchdog/3093-watchdog.bb index e5e4abdad53105ffd4395eec42a0d2a2d494cd8f..df87d603ce7c26addf066932803e634436394fce 100644 --- a/bsp/meta-hisilicon/recipes-core/watchdog/3093-watchdog.bb +++ b/bsp/meta-hisilicon/recipes-core/watchdog/3093-watchdog.bb @@ -11,7 +11,7 @@ SRC_URI = "file://close_wdog.sh \ #INITSCRIPT_NAME = "close_wdog.sh" #INITSCRIPT_PARAMS = "start 16 5 ." -FILES_${PN} = "${sysconfdir}" +FILES:${PN} = "${sysconfdir}" do_install () { install -d ${D}${sysconfdir}/init.d diff --git a/bsp/meta-hisilicon/recipes-graphics/mesa/mesa_%.bbappend b/bsp/meta-hisilicon/recipes-graphics/mesa/mesa_%.bbappend index 33cefa79ff43d1a441529a1acde10a8727f02ab3..04f39580b54a2c6d37c815bfbe07d04fc7864fb4 100644 --- a/bsp/meta-hisilicon/recipes-graphics/mesa/mesa_%.bbappend +++ b/bsp/meta-hisilicon/recipes-graphics/mesa/mesa_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_append_hi1711 = " gallium vc4 v3d kmsro ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)}" +PACKAGECONFIG:append:hi1711 = " gallium vc4 v3d kmsro ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)}" diff --git a/bsp/meta-hisilicon/recipes-kernel/linux/linux-hisilicon.inc b/bsp/meta-hisilicon/recipes-kernel/linux/linux-hisilicon.inc index d12693a9a85e8713cfd38f3aa2f8bb2f9910d46a..a81e8961836c1a8fffed40d7e30cf79b3193a6b4 100644 --- a/bsp/meta-hisilicon/recipes-kernel/linux/linux-hisilicon.inc +++ b/bsp/meta-hisilicon/recipes-kernel/linux/linux-hisilicon.inc @@ -1,7 +1,7 @@ # add recipes-kernel path to find patch and defconfig -FILESEXTRAPATHS_append := "${THISDIR}/files/:" +FILESEXTRAPATHS:append := "${THISDIR}/files/:" # add prebuild tools to make uImage -SRC_URI_append = " \ +SRC_URI:append = " \ file://dtbs \ file://tools \ " @@ -10,12 +10,12 @@ SRC_URI_append = " \ PATCHTOOL = "git" # add method to do_compile task to produce bootable Image -do_compile_append_hi1711(){ +do_compile:append:hi1711(){ ../tools/mkimage -A arm -O linux -T kernel -C none -a 0x98280000 -e 0x98280040 -n linux-5.10.0 -d ${KERNEL_OUTPUT_DIR}/zImage uImage } # add uImage to $D -do_install_append(){ +do_install:append(){ cp uImage ${D}/boot cp ../dtbs/hi3093*.dtb ${D}/boot } diff --git a/bsp/meta-hisilicon/recipes-mcs/mcs-linux/mcs-km.bbappend b/bsp/meta-hisilicon/recipes-mcs/mcs-linux/mcs-km.bbappend index f60171a5c173c64f602b56b214c55316fd54d160..ae503536fb4367d7c76183ad43736a4d040a96e5 100644 --- a/bsp/meta-hisilicon/recipes-mcs/mcs-linux/mcs-km.bbappend +++ b/bsp/meta-hisilicon/recipes-mcs/mcs-linux/mcs-km.bbappend @@ -1,3 +1,3 @@ # adapted for hi1711 -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRC_URI_append = " file://0001-mcs_km-adapted-for-hi3093.patch" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +SRC_URI:append = " file://0001-mcs_km-adapted-for-hi3093.patch" diff --git a/bsp/meta-hisilicon/recipes-mcs/mcs-linux/mcs-linux.bbappend b/bsp/meta-hisilicon/recipes-mcs/mcs-linux/mcs-linux.bbappend index 83d6736053f73e0250e6cfea2e2e9103406e958d..2841c412a675f36402391d83b77ea4e4dface793 100644 --- a/bsp/meta-hisilicon/recipes-mcs/mcs-linux/mcs-linux.bbappend +++ b/bsp/meta-hisilicon/recipes-mcs/mcs-linux/mcs-linux.bbappend @@ -1,12 +1,12 @@ # adapted for hi1711 -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRC_URI_append = " file://0001-rpmsg_main-set-phy_shared_mem-to-0x90000000.patch" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +SRC_URI:append = " file://0001-rpmsg_main-set-phy_shared_mem-to-0x90000000.patch" # install uniproton in /firmware/ -do_install_append (){ +do_install:append (){ install -d ${D}/firmware install -D ${S}/rpmsg_pty_demo/Uniproton_hi3093.bin ${D}/firmware/ } -FILES_${PN} += "/firmware" +FILES:${PN} += "/firmware" diff --git a/bsp/meta-openeuler-bsp/classes/sdcard_image-rpi.bbclass b/bsp/meta-openeuler-bsp/classes/sdcard_image-rpi.bbclass index 57c2f7685f88526a967cfdd607d24bb417b1ef3b..0c4483bc56f40f7f55c4a82cfb59d168c38928cd 100644 --- a/bsp/meta-openeuler-bsp/classes/sdcard_image-rpi.bbclass +++ b/bsp/meta-openeuler-bsp/classes/sdcard_image-rpi.bbclass @@ -26,12 +26,12 @@ inherit image_types # 0 4MiB 4MiB + 48MiB 4MiB + 48Mib + SDIMG_ROOTFS # This image depends on the rootfs image -IMAGE_TYPEDEP_rpi-sdimg = "${SDIMG_ROOTFS_TYPE}" +IMAGE_TYPEDEP:rpi-sdimg = "${SDIMG_ROOTFS_TYPE}" # Kernel image name -SDIMG_KERNELIMAGE_raspberrypi ?= "kernel.img" -SDIMG_KERNELIMAGE_raspberrypi2 ?= "kernel7.img" -SDIMG_KERNELIMAGE_raspberrypi3-64 ?= "kernel8.img" +SDIMG_KERNELIMAGE:raspberrypi ?= "kernel.img" +SDIMG_KERNELIMAGE:raspberrypi2 ?= "kernel7.img" +SDIMG_KERNELIMAGE:raspberrypi3-64 ?= "kernel8.img" # Boot partition volume id # Shorten raspberrypi to just rpi to keep it under 11 characters @@ -78,24 +78,10 @@ SDIMG_VFAT_DEPLOY ?= "${RPI_USE_U_BOOT}" SDIMG_VFAT = "${IMAGE_NAME}.vfat" SDIMG_LINK_VFAT = "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.vfat" -def split_overlays(d, out, ver=None): - dts = d.getVar("KERNEL_DEVICETREE") - # Device Tree Overlays are assumed to be suffixed by '-overlay.dtb' (4.1.x) or by '.dtbo' (4.4.9+) string and will be put in a dedicated folder - if out: - overlays = oe.utils.str_filter_out('\S+\-overlay\.dtb$', dts, d) - overlays = oe.utils.str_filter_out('\S+\.dtbo$', overlays, d) - else: - overlays = oe.utils.str_filter('\S+\-overlay\.dtb$', dts, d) + \ - " " + oe.utils.str_filter('\S+\.dtbo$', dts, d) - - return overlays - - uefi_configuration() { echo "uefi_configuration make nothing" } - -IMAGE_CMD_rpi-sdimg () { +IMAGE_CMD:rpi-sdimg () { # Align partitions BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1) @@ -105,7 +91,7 @@ IMAGE_CMD_rpi-sdimg () { echo "Creating filesystem with Boot partition ${BOOT_SPACE_ALIGNED} KiB and RootFS $ROOTFS_SIZE KiB" # Check if we are building with device tree support - DTS="${KERNEL_DEVICETREE}" + DTS="${@make_dtb_boot_files(d)}" # Initialize sdcard image file dd if=/dev/zero of=${SDIMG} bs=1024 count=0 seek=${SDIMG_SIZE} @@ -128,17 +114,20 @@ IMAGE_CMD_rpi-sdimg () { mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/armstubs/${ARMSTUB} ::/ || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/armstubs/${ARMSTUB} into boot.img" fi if test -n "${DTS}"; then - # Copy board device trees to root folder - for dtbf in ${@split_overlays(d, True)}; do - dtb=`basename $dtbf` - mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/$dtb ::$dtb || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/$dtb into boot.img" - done - - # Copy device tree overlays to dedicated folder + # Copy board device trees (including overlays) + # There is an assumption here - no DTB in other directories than root + # and root/overlays. mmd/mcopy are not very flexible tools. mmd -i ${WORKDIR}/boot.img overlays - for dtbf in ${@split_overlays(d, False)}; do - dtb=`basename $dtbf` - mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/$dtb ::overlays/$dtb || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/$dtb into boot.img" + for entry in ${DTS} ; do + # Split entry at optional ';' + if [ $(echo "$entry" | grep -c \;) = "0" ] ; then + DEPLOY_FILE="$entry" + DEST_FILENAME="$entry" + else + DEPLOY_FILE="$(echo "$entry" | cut -f1 -d\;)" + DEST_FILENAME="$(echo "$entry" | cut -f2- -d\;)" + fi + mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${DEPLOY_FILE} ::${DEST_FILENAME} || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/${DEPLOY_FILE} into boot.img" done fi if [ "${RPI_USE_U_BOOT}" = "1" ]; then diff --git a/bsp/meta-openeuler-bsp/conf/layer.conf b/bsp/meta-openeuler-bsp/conf/layer.conf index a891932f43745f2199cde1836071e943d589b3e8..4bce50cc39b5e0750338764a894ab40714b885a5 100644 --- a/bsp/meta-openeuler-bsp/conf/layer.conf +++ b/bsp/meta-openeuler-bsp/conf/layer.conf @@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "openeuler-bsp" BBFILE_PATTERN_openeuler-bsp = "^${LAYERDIR}/" BBFILE_PRIORITY_openeuler-bsp = "25" -LAYERSERIES_COMPAT_openeuler-bsp = "hardknott honister" +LAYERSERIES_COMPAT_openeuler-bsp = "kirkstone" #no bb file under meta-openeuler-bsp, set it to 1 to ignore "No bb files" warning BBFILE_PATTERN_IGNORE_EMPTY_openeuler-bsp = "1" @@ -21,4 +21,4 @@ raspberrypi:${LAYERDIR}/raspberrypi/*/*/*.bbappend \ " #enable find .inc under raspberrypi/, included in .bb -BBPATH_append =. ":${LAYERDIR}/raspberrypi" +BBPATH:append = ":${LAYERDIR}/raspberrypi" diff --git a/bsp/meta-openeuler-bsp/conf/machine/openeuler-raspberrypi4-64.conf b/bsp/meta-openeuler-bsp/conf/machine/openeuler-raspberrypi4-64.conf index 59256c2e3b540977aaf38eccda51283418effc92..cb7f7a7421a22655f12e6c3d9077ea8c61d0a181 100644 --- a/bsp/meta-openeuler-bsp/conf/machine/openeuler-raspberrypi4-64.conf +++ b/bsp/meta-openeuler-bsp/conf/machine/openeuler-raspberrypi4-64.conf @@ -60,7 +60,7 @@ KERNEL_MODULE_AUTOLOAD = "${INSTALLMODULES}" AUTO-EXPAND-FS = "1" # remove bcm2711-rpi-4-b.dtb from kernel_devicetree -RPI_KERNEL_DEVICETREE_remove = " \ +RPI_KERNEL_DEVICETREE:remove = " \ broadcom/bcm2711-rpi-4-b.dtb \ " @@ -71,4 +71,4 @@ RPI_KERNEL_DEVICETREE_remove = " \ # see yocto-meta-ros/meta-ros2-foxy/recipes-bbappends/navigation2/navigation2_0.4.7-1.bbappend file # line 4: ROS_EXEC_DEPENDS:remove = "${@bb.utils.contains_any('ROS_WORLD_SKIP_GROUPS', ['qt5', 'pyqt5', 'ogre'], 'nav2-rviz-plugins', '', d)}" # so remove pacakgegroup-rosslam when adding qt5 -DISTRO_FEATURES_append = " ros-camera ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', '', 'ros-slam', d)}" +DISTRO_FEATURES:append = " ros-camera ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', '', 'ros-slam', d)}" diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/bootfiles/rpi-bootfiles.bbappend b/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/bootfiles/rpi-bootfiles.bbappend index 3260a71f7c23ced07dcdea17dcbce8107165b882..d8903c632cac44e5184e2c80dd4fcebf0b9786bb 100644 --- a/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/bootfiles/rpi-bootfiles.bbappend +++ b/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/bootfiles/rpi-bootfiles.bbappend @@ -12,7 +12,7 @@ do_deploy[depends] += "${@bb.utils.contains('DISTRO_FEATURES', 'mcs', 'grub-efi: # fix runtime error: Could not find DRM device! # instead of bcm2711-rpi-4-b.dtb from kernel_devicetree -do_deploy_append() { +do_deploy:append() { cp ${S}/bcm2711-rpi-4-b.dtb ${DEPLOYDIR}/${BOOTFILES_DIR_NAME} } diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend b/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend index fda521b888ac9e220d1d7d24f24daaf0114544f1..2676ed09b9d8f19099bd86a884f624f74608da85 100644 --- a/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend +++ b/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" SRC_URI = "file://config.txt \ " diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/uefi/rpi-tf-a.bb b/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/uefi/rpi-tf-a.bb index 03f27939b067fdfd8c6faf4c2bd1b251c7c2c405..d488e3670255cb53407c07074f51f838a9622b2b 100644 --- a/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/uefi/rpi-tf-a.bb +++ b/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/uefi/rpi-tf-a.bb @@ -18,13 +18,13 @@ export LDFLAGS="" EXTRA_OEMAKE="CROSS_COMPILE=${TARGET_PREFIX} " export LDFLAGS="" -do_compile_append() { +do_compile:append() { oe_runmake PLAT=rpi4 RPI3_PRELOADED_DTB_BASE=0x1F0000 PRELOADED_BL33_BASE=0x20000 SUPPORT_VFP=1 SMC_PCI_SUPPORT=1 DEBUG=0 all } -do_install_append() { +do_install:append() { install -d ${D}${datadir} install ${B}/build/rpi4/release/bl31.bin ${D}${datadir} } -FILES_${PN} += "${datadir}/bl31.bin" +FILES:${PN} += "${datadir}/bl31.bin" diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_%.bbappend b/bsp/meta-openeuler-bsp/raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_%.bbappend index aed31e1a544bf7166d3a28172f42d6a6770e7bcd..ae1f12adcb7db9a5e2ba51f212618e05308bfbed 100644 --- a/bsp/meta-openeuler-bsp/raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_%.bbappend +++ b/bsp/meta-openeuler-bsp/raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_%.bbappend @@ -9,7 +9,7 @@ SRC_URI = "\ S = "${WORKDIR}/${BP}" -do_install_append() { +do_install:append() { # we do not use udev package, so pass /dev/ttyAMA0 directly. sed -i "s/\/dev\/serial1/\/dev\/ttyAMA0/g" ${D}${bindir}/btuart } diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/auto-expand-fs/auto-expand-fs.bb b/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/auto-expand-fs/auto-expand-fs.bb index 6c714fc8c89f821f25a0c622dc26679c175369af..c7d82b2c16ac6ba419cabdca67ff542f4f5c4d86 100644 --- a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/auto-expand-fs/auto-expand-fs.bb +++ b/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/auto-expand-fs/auto-expand-fs.bb @@ -4,7 +4,7 @@ SECTION = "base" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -RDEPENDS_${PN} = "parted util-linux-findmnt e2fsprogs-resize2fs" +RDEPENDS:${PN} = "parted util-linux-findmnt e2fsprogs-resize2fs" # As the recipe doesn't inherit systemd.bbclass, we need to set this variable # manually to avoid unnecessary postinst/preinst generated. @@ -27,7 +27,7 @@ INITSCRIPT_PARAMS = "defaults" S = "${WORKDIR}" -FILES_${PN} = "/usr/lib/init_resize.sh ${sysconfdir}/init.d/resize2fs_once" +FILES:${PN} = "/usr/lib/init_resize.sh ${sysconfdir}/init.d/resize2fs_once" do_install () { install -d ${D}${sysconfdir}/init.d/ @@ -36,4 +36,4 @@ do_install () { install -m 0755 ${WORKDIR}/init_resize.sh ${D}/usr/lib/ } -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/mcs.inc b/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/mcs.inc index 8d2b3bee342d17df9dd666f085fac91da028d274..10edda2f5564577946230580f1b53fee1274be71 100644 --- a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/mcs.inc +++ b/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/mcs.inc @@ -47,7 +47,7 @@ install_mcs_overlays() { } # make no login and standard PATH -set_permissions_from_rootfs_append() { +set_permissions_from_rootfs:append() { cd "${IMAGE_ROOTFS}" if [ -f ./etc/inittab ]; then sed -i "s#respawn:/sbin/getty.*#respawn:-/bin/sh#g" ./etc/inittab @@ -78,4 +78,4 @@ change_bootfiles_to_enable_uefi() { sed -i 's/linux \/Image /linux \/Image.gz /' ${DEPLOY_DIR_IMAGE}/EFI/BOOT/grub.cfg } -IMAGE_PREPROCESS_COMMAND_append += "change_bootfiles_to_enable_uefi" +IMAGE_PREPROCESS_COMMAND:append = "change_bootfiles_to_enable_uefi" diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/openeuler-image-mcs.bbappend b/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/openeuler-image-mcs.bbappend index 493956f29c74fe8dfcedd53c1c11098948498e0c..82c753b3f34ceba555e6a27a173510f36fc27ee4 100644 --- a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/openeuler-image-mcs.bbappend +++ b/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/openeuler-image-mcs.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" # fix mkfs.ext4 running error, add -E no_copy_xattrs to mkfs.ext4 WKS_FILE = "sdimage-rpi.wks" WKS_FILE_DEPENDS = "" diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/openeuler-image-tiny.bbappend b/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/openeuler-image-tiny.bbappend index 80594cb9ba6da3a688adb1991002210422273135..32f0c14dccf85b0bfee51e188ba830fbf38632af 100644 --- a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/openeuler-image-tiny.bbappend +++ b/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/openeuler-image-tiny.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" #fix mkfs.ext4 running error, add -E no_copy_xattrs to mkfs.ext4 WKS_FILE = "sdimage-rpi.wks" WKS_FILE_DEPENDS = "" diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/openeuler-image.bbappend b/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/openeuler-image.bbappend index b22b3ac269f23b0b357849dd9503947a3f1b3337..8b8ba12356c09a4a2dfcc3e348f6a738d395725d 100644 --- a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/openeuler-image.bbappend +++ b/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/images/openeuler-image.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" #fix mkfs.ext4 running error, add -E no_copy_xattrs to mkfs.ext4 WKS_FILE = "sdimage-rpi.wks" WKS_FILE_DEPENDS = "" diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/packagegroups/packagegroup-base.bbappend b/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/packagegroups/packagegroup-base.bbappend index bdd50aa93dc915daea720dfa91a2c51f7526054c..a418dcbb27638a698e0bf18f4ea07cd3317467eb 100644 --- a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/packagegroups/packagegroup-base.bbappend +++ b/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/packagegroups/packagegroup-base.bbappend @@ -1,4 +1,4 @@ -RDEPENDS_packagegroup-base_append += " \ +RDEPENDS:packagegroup-base:append = " \ e2fsprogs-resize2fs \ linux-firmware-rpidistro-bcm43455 \ wpa-supplicant \ diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/packagegroups/packagegroup-core-boot.bbappend b/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/packagegroups/packagegroup-core-boot.bbappend index 04a7c33f2131703290d9ad70a60ea41e2c1b13fb..183c278f17406d999bacc9bd5f8cfa94f985e45b 100644 --- a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/packagegroups/packagegroup-core-boot.bbappend +++ b/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/packagegroups/packagegroup-core-boot.bbappend @@ -1,3 +1,3 @@ -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ${@oe.utils.conditional("AUTO-EXPAND-FS", "1", "auto-expand-fs", "", d)} \ " diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/udev/files/99-com.rules b/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/udev/files/99-com.rules new file mode 100644 index 0000000000000000000000000000000000000000..25e4cf6773cc9e2f74ede45075822ff67b586ae4 --- /dev/null +++ b/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/udev/files/99-com.rules @@ -0,0 +1,41 @@ +SUBSYSTEM=="input", GROUP="input", MODE="0660" +SUBSYSTEM=="i2c-dev", GROUP="i2c", MODE="0660" +SUBSYSTEM=="spidev", GROUP="spi", MODE="0660" +SUBSYSTEM=="bcm2835-gpiomem", GROUP="gpio", MODE="0660" +SUBSYSTEM=="rpivid-*", GROUP="video", MODE="0660" + +KERNEL=="vcsm-cma", GROUP="video", MODE="0660" +SUBSYSTEM=="dma_heap", GROUP="video", MODE="0660" + +SUBSYSTEM=="gpio", GROUP="gpio", MODE="0660" +SUBSYSTEM=="gpio", KERNEL=="gpiochip*", ACTION=="add", PROGRAM="/bin/sh -c 'chgrp -R gpio /sys/class/gpio && chmod -R g=u /sys/class/gpio'" +SUBSYSTEM=="gpio", ACTION=="add", PROGRAM="/bin/sh -c 'chgrp -R gpio /sys%p && chmod -R g=u /sys%p'" + +# PWM export results in a "change" action on the pwmchip device (not "add" of a new device), so match actions other than "remove". +SUBSYSTEM=="pwm", ACTION!="remove", PROGRAM="/bin/sh -c 'chgrp -R gpio /sys%p && chmod -R g=u /sys%p'" + +KERNEL=="ttyAMA[0-9]*|ttyS[0-9]*", PROGRAM="/bin/sh -c '\ + ALIASES=/proc/device-tree/aliases; \ + TTYNODE=$$(readlink /sys/class/tty/%k/device/of_node | sed 's/base/:/' | cut -d: -f2); \ + if [ -e $$ALIASES/bluetooth ] && [ $$TTYNODE/bluetooth = $$(strings $$ALIASES/bluetooth) ]; then \ + echo 1; \ + elif [ -e $$ALIASES/console ]; then \ + if [ $$TTYNODE = $$(strings $$ALIASES/console) ]; then \ + echo 0;\ + else \ + exit 1; \ + fi \ + elif [ $$TTYNODE = $$(strings $$ALIASES/serial0) ]; then \ + echo 0; \ + elif [ $$TTYNODE = $$(strings $$ALIASES/serial1) ]; then \ + echo 1; \ + else \ + exit 1; \ + fi \ +'", SYMLINK+="serial%c" + +ACTION=="add", SUBSYSTEM=="vtconsole", KERNEL=="vtcon1", RUN+="/bin/sh -c '\ + if echo RPi-Sense FB | cmp -s /sys/class/graphics/fb0/name; then \ + echo 0 > /sys$devpath/bind; \ + fi; \ +'" diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/udev/udev-rules-rpi.bbappend b/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/udev/udev-rules-rpi.bbappend new file mode 100644 index 0000000000000000000000000000000000000000..4aab0633ba31fc01da7afc5fe2ef5ef8bfcd342b --- /dev/null +++ b/bsp/meta-openeuler-bsp/raspberrypi/recipes-core/udev/udev-rules-rpi.bbappend @@ -0,0 +1,15 @@ + +SRC_URI:remove = "git://github.com/RPi-Distro/raspberrypi-sys-mods;protocol=https;branch=master \ +" + +FILESEXTRAPATHS:prepend := "${THISDIR}/files/:" + +SRC_URI:append = " \ + file://99-com.rules \ +" + +do_install () { + install -d ${D}${sysconfdir}/udev/rules.d + install -m 0644 ${WORKDIR}/99-com.rules ${D}${sysconfdir}/udev/rules.d/ + install -m 0644 ${WORKDIR}/can.rules ${D}${sysconfdir}/udev/rules.d/ +} \ No newline at end of file diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_%.bbappend b/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_%.bbappend index 12c6f762981f457f3b5e0eeb8bd395a05c686075..6c6079348cee52d5ac39038f32e9af5e3104da8b 100644 --- a/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_%.bbappend +++ b/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_%.bbappend @@ -24,7 +24,7 @@ NO_GENERIC_LICENSE[Firmware-broadcom_bcm43xx-rpidistro] = "License/LICENCE.broad # cp ./LICENCE.broadcom_bcm43xx ${D}${nonarch_base_libdir}/firmware/LICENCE.broadcom_bcm43xx-rpidistro # but this license file is at ${S}/License in openeuler source package # so copy it to ${S} in do_compile function -do_compile_append() { +do_compile:append() { cp ./License/LICENCE.broadcom_brcm80211 ./LICENCE.broadcom_bcm43xx } @@ -34,7 +34,7 @@ do_compile_append() { do_install() { install -d ${D}${nonarch_base_libdir}/firmware/brcm ${D}${nonarch_base_libdir}/firmware/cypress - cp ./LICENCE.broadcom_bcm43xx ${D}${nonarch_base_libdir}/firmware/LICENCE.broadcom_bcm43xx-rpidistro + cp ./LICENCE.broadcom_bcm43xx ${D}${nonarch_base_libdir}/firmware/LICENSE.broadcom_bcm43xx-rpidistro for fw in \ brcmfmac43430-sdio \ @@ -66,12 +66,7 @@ do_install() { cp ./regulatory* ${D}${nonarch_base_libdir}/firmware } -PACKAGES += "\ - ${PN}-bcm43436 \ - ${PN}-bcm43436s \ -" - -FILES_${PN}-bcm43455 += " \ +FILES:${PN}-bcm43455 += " \ ${nonarch_base_libdir}/firmware/regulatory* \ ${nonarch_base_libdir}/firmware/cypress/cyfmac43455-sdio* \ " diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux/linux-openeuler-rpi.inc b/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux/linux-openeuler-rpi.inc index 579f0acb7e81624847c79684c7ddcb5e5aaa02ed..af8e91abb6cc1f9a7cc250f7e119377a526b1b3c 100644 --- a/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux/linux-openeuler-rpi.inc +++ b/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux/linux-openeuler-rpi.inc @@ -1,7 +1,7 @@ # apply RPI kernel patch -FILESEXTRAPATHS_append := "${THISDIR}/files/:" +FILESEXTRAPATHS:append := "${THISDIR}/files/:" # export symbol for jailhouse -SRC_URI_append = "${@bb.utils.contains('MCS_FEATURES', 'jailhouse', \ +SRC_URI:append = "${@bb.utils.contains('MCS_FEATURES', 'jailhouse', \ ' file://Jailhouse/jailhouse_fix_rpi4_compile_error.patch \ file://enable_cpu_hotplug.patch', '', d)}" diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux/linux-openeuler-rt.bbappend b/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux/linux-openeuler-rt.bbappend index 26ff4f06d5000c9831832ce33e17a4f2cff01a33..cb6268234119f0c56060d05dcef6063896eab290 100644 --- a/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux/linux-openeuler-rt.bbappend +++ b/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux/linux-openeuler-rt.bbappend @@ -1,5 +1,5 @@ # For the Raspberry Pi, we don't need to apply the aarch64 patches -SRC_URI_remove_raspberrypi4 += " \ +SRC_URI:remove:raspberrypi4 += " \ file://src-kernel-5.10/0001-modify-openeuler_defconfig-for-rt62.patch \ " @@ -13,7 +13,7 @@ require linux-openeuler-rpi.inc COMPATIBLE_MACHINE = "raspberrypi4-64" OPENEULER_KERNEL_CONFIG = "${S}/arch/${ARCH}/configs/bcm2711_defconfig" -do_configure_prepend() { +do_configure:prepend() { sed -i '$a CONFIG_ACPI=y' ${OPENEULER_KERNEL_CONFIG} cp -f "${OPENEULER_KERNEL_CONFIG}" .config } diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux/linux-openeuler.bbappend b/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux/linux-openeuler.bbappend index 30ae72f9e014ec0492b62ace777089d3fde1d417..ddbd151602840f7a9ad5290635168624a5582dfd 100644 --- a/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux/linux-openeuler.bbappend +++ b/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/linux/linux-openeuler.bbappend @@ -4,7 +4,7 @@ SRC_URI += "\ require linux-openeuler-rpi.inc OPENEULER_KERNEL_CONFIG = "${S}/arch/${ARCH}/configs/bcm2711_defconfig" -do_configure_prepend() { +do_configure:prepend() { sed -i '$a CONFIG_ACPI=y' ${OPENEULER_KERNEL_CONFIG} cp -f "${OPENEULER_KERNEL_CONFIG}" .config } diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/lopper/lopper-ops.bbappend b/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/lopper/lopper-ops.bbappend index 7f6cf72d5c055f6dd95fa55bf9aced690af3c1cd..59ff2eb673fde3883da4289fe5cd137460d367d5 100644 --- a/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/lopper/lopper-ops.bbappend +++ b/bsp/meta-openeuler-bsp/raspberrypi/recipes-kernel/lopper/lopper-ops.bbappend @@ -1,2 +1,2 @@ # Use the operation files from current layer -FILESEXTRAPATHS_prepend := "${THISDIR}/:" +FILESEXTRAPATHS:prepend := "${THISDIR}/:" diff --git a/bsp/meta-raspberrypi/.readthedocs.yaml b/bsp/meta-raspberrypi/.readthedocs.yaml new file mode 100644 index 0000000000000000000000000000000000000000..454f385aa13f6dc3e0a3782487eaa6a3dd193294 --- /dev/null +++ b/bsp/meta-raspberrypi/.readthedocs.yaml @@ -0,0 +1,6 @@ +version: 2 + +python: + version: "3.7" + install: + - requirements: docs/requirements.txt diff --git a/bsp/meta-raspberrypi/README.md b/bsp/meta-raspberrypi/README.md index 7e95cc4415d77740cb012cd49af46ef49b55df71..712b9a28c5223d0e800e8a97ea1598da61b3747a 100644 --- a/bsp/meta-raspberrypi/README.md +++ b/bsp/meta-raspberrypi/README.md @@ -2,22 +2,18 @@ Yocto BSP layer for the Raspberry Pi boards - . -[![Build Status](https://yocto-ci.resin.io/job/meta-raspberrypi1/badge/icon)](https://yocto-ci.resin.io/job/meta-raspberrypi1) -[![Build Status](https://yocto-ci.resin.io/job/meta-raspberrypi2/badge/icon)](https://yocto-ci.resin.io/job/meta-raspberrypi2) -[![Build Status](https://yocto-ci.resin.io/job/meta-raspberrypi3/badge/icon)](https://yocto-ci.resin.io/job/meta-raspberrypi3) -[![Build Status](https://yocto-ci.resin.io/job/meta-raspberrypi4/badge/icon)](https://yocto-ci.resin.io/job/meta-raspberrypi4) [![Documentation Status](https://readthedocs.org/projects/meta-raspberrypi/badge/?version=latest)](https://meta-raspberrypi.readthedocs.io/en/latest/?badge=latest) -[![Matrix](https://img.shields.io/matrix/meta-raspberrypi:cub.icu.svg?server_fqdn=matrix.cub.icu)](https://matrix.to/#/#meta-raspberrypi:cub.icu) +[![Matrix](https://img.shields.io/badge/chat-meta--raspberrypi-brightgreen)](https://matrix.to/#/#meta-raspberrypi:matrix.org) -| | | -|:-: | :-: | -| Build server sponsored by | [![balena.io](./img/balena.png)](https://www.balena.io/). | +| | | +|:-: | :-: | +| Build server sponsored by | [balena.io](https://www.balena.io/) | ## Quick links * Git repository web frontend: -* Mailing list (yocto mailing list): +* Mailing list (yocto mailing list): * Issues management (Github Issues): * Documentation: @@ -43,11 +39,6 @@ This layer depends on: * branch: master * revision: HEAD -* URI: git://git.openembedded.org/meta-openembedded - * layers: meta-oe, meta-multimedia, meta-networking, meta-python - * branch: master - * revision: HEAD - ## Quick Start 1. source poky/oe-init-build-env rpi-build @@ -77,8 +68,15 @@ local_conf_header: To configure the machine, you have to update the `machine` variable. And the same for the `distro`. -For further information, you can read more at +For further information, you can read more at + +## Contributing + +You can send patches using the GitHub pull request process or/and through the +Yocto mailing list. Refer to the +[documentation](https://meta-raspberrypi.readthedocs.io/en/latest/contributing.html) +for more information. ## Maintainers -* Andrei Gherzan `` +* Andrei Gherzan `` diff --git a/bsp/meta-raspberrypi/classes/sdcard_image-rpi.bbclass b/bsp/meta-raspberrypi/classes/sdcard_image-rpi.bbclass index e803a0da955df8bb853c97f666bfb95fcac3901f..a7b9ac82fbacb6e52efe7ddccc3b80098dceabdb 100644 --- a/bsp/meta-raspberrypi/classes/sdcard_image-rpi.bbclass +++ b/bsp/meta-raspberrypi/classes/sdcard_image-rpi.bbclass @@ -23,12 +23,12 @@ inherit image_types # 0 4MiB 4MiB + 48MiB 4MiB + 48Mib + SDIMG_ROOTFS # This image depends on the rootfs image -IMAGE_TYPEDEP_rpi-sdimg = "${SDIMG_ROOTFS_TYPE}" +IMAGE_TYPEDEP:rpi-sdimg = "${SDIMG_ROOTFS_TYPE}" # Kernel image name -SDIMG_KERNELIMAGE_raspberrypi ?= "kernel.img" -SDIMG_KERNELIMAGE_raspberrypi2 ?= "kernel7.img" -SDIMG_KERNELIMAGE_raspberrypi3-64 ?= "kernel8.img" +SDIMG_KERNELIMAGE:raspberrypi ?= "kernel.img" +SDIMG_KERNELIMAGE:raspberrypi2 ?= "kernel7.img" +SDIMG_KERNELIMAGE:raspberrypi3-64 ?= "kernel8.img" # Boot partition volume id # Shorten raspberrypi to just rpi to keep it under 11 characters @@ -75,19 +75,7 @@ SDIMG_VFAT_DEPLOY ?= "${RPI_USE_U_BOOT}" SDIMG_VFAT = "${IMAGE_NAME}.vfat" SDIMG_LINK_VFAT = "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.vfat" -def split_overlays(d, out, ver=None): - dts = d.getVar("KERNEL_DEVICETREE") - # Device Tree Overlays are assumed to be suffixed by '-overlay.dtb' (4.1.x) or by '.dtbo' (4.4.9+) string and will be put in a dedicated folder - if out: - overlays = oe.utils.str_filter_out('\S+\-overlay\.dtb$', dts, d) - overlays = oe.utils.str_filter_out('\S+\.dtbo$', overlays, d) - else: - overlays = oe.utils.str_filter('\S+\-overlay\.dtb$', dts, d) + \ - " " + oe.utils.str_filter('\S+\.dtbo$', dts, d) - - return overlays - -IMAGE_CMD_rpi-sdimg () { +IMAGE_CMD:rpi-sdimg () { # Align partitions BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1) @@ -97,7 +85,7 @@ IMAGE_CMD_rpi-sdimg () { echo "Creating filesystem with Boot partition ${BOOT_SPACE_ALIGNED} KiB and RootFS $ROOTFS_SIZE KiB" # Check if we are building with device tree support - DTS="${KERNEL_DEVICETREE}" + DTS="${@make_dtb_boot_files(d)}" # Initialize sdcard image file dd if=/dev/zero of=${SDIMG} bs=1024 count=0 seek=${SDIMG_SIZE} @@ -120,17 +108,20 @@ IMAGE_CMD_rpi-sdimg () { mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/armstubs/${ARMSTUB} ::/ || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/armstubs/${ARMSTUB} into boot.img" fi if test -n "${DTS}"; then - # Copy board device trees to root folder - for dtbf in ${@split_overlays(d, True)}; do - dtb=`basename $dtbf` - mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/$dtb ::$dtb || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/$dtb into boot.img" - done - - # Copy device tree overlays to dedicated folder + # Copy board device trees (including overlays) + # There is an assumption here - no DTB in other directories than root + # and root/overlays. mmd/mcopy are not very flexible tools. mmd -i ${WORKDIR}/boot.img overlays - for dtbf in ${@split_overlays(d, False)}; do - dtb=`basename $dtbf` - mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/$dtb ::overlays/$dtb || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/$dtb into boot.img" + for entry in ${DTS} ; do + # Split entry at optional ';' + if [ $(echo "$entry" | grep -c \;) = "0" ] ; then + DEPLOY_FILE="$entry" + DEST_FILENAME="$entry" + else + DEPLOY_FILE="$(echo "$entry" | cut -f1 -d\;)" + DEST_FILENAME="$(echo "$entry" | cut -f2- -d\;)" + fi + mcopy -v -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${DEPLOY_FILE} ::${DEST_FILENAME} || bbfatal "mcopy cannot copy ${DEPLOY_DIR_IMAGE}/${DEPLOY_FILE} into boot.img" done fi if [ "${RPI_USE_U_BOOT}" = "1" ]; then diff --git a/bsp/meta-raspberrypi/conf/layer.conf b/bsp/meta-raspberrypi/conf/layer.conf index 4a0539a0984c15cf482ad3964865d59a9b6b46b8..d7ad4ed2a20ed182841b00d25e40fd47e1e39057 100644 --- a/bsp/meta-raspberrypi/conf/layer.conf +++ b/bsp/meta-raspberrypi/conf/layer.conf @@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "raspberrypi" BBFILE_PATTERN_raspberrypi := "^${LAYERDIR}/" BBFILE_PRIORITY_raspberrypi = "9" -LAYERSERIES_COMPAT_raspberrypi = "hardknott honister" +LAYERSERIES_COMPAT_raspberrypi = "kirkstone" LAYERDEPENDS_raspberrypi = "core" # Additional license directories. @@ -34,9 +34,7 @@ BBFILES_DYNAMIC += " \ qt5-layer:${LAYERDIR}/dynamic-layers/qt5-layer/*/*/*.bbappend \ multimedia-layer:${LAYERDIR}/dynamic-layers/multimedia-layer/*/*/*.bb \ multimedia-layer:${LAYERDIR}/dynamic-layers/multimedia-layer/*/*/*.bbappend \ - ros2-layer:${LAYERDIR}/dynamic-layers/ros2-layer/*/*/*.bb \ - ros2-layer:${LAYERDIR}/dynamic-layers/ros2-layer/*/*/*.bbappend \ " -DEFAULT_TEST_SUITES_remove_rpi = "parselogs" -DEFAULT_TEST_SUITES_append_rpi = " parselogs_rpi" +DEFAULT_TEST_SUITES:remove:rpi = "parselogs" +DEFAULT_TEST_SUITES:append:rpi = " parselogs_rpi" diff --git a/bsp/meta-raspberrypi/conf/machine/include/rpi-base.inc b/bsp/meta-raspberrypi/conf/machine/include/rpi-base.inc index a800078473b1eeade1e28e5e7506ee91e663bf59..a2edf064b6e46f5a2c99227735aed43d8a88699d 100644 --- a/bsp/meta-raspberrypi/conf/machine/include/rpi-base.inc +++ b/bsp/meta-raspberrypi/conf/machine/include/rpi-base.inc @@ -22,6 +22,8 @@ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \ overlays/gpio-ir.dtbo \ overlays/gpio-ir-tx.dtbo \ overlays/gpio-key.dtbo \ + overlays/gpio-poweroff.dtbo \ + overlays/gpio-shutdown.dtbo \ overlays/hifiberry-amp.dtbo \ overlays/hifiberry-dac.dtbo \ overlays/hifiberry-dacplus.dtbo \ @@ -29,6 +31,7 @@ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \ overlays/justboom-both.dtbo \ overlays/justboom-dac.dtbo \ overlays/justboom-digi.dtbo \ + overlays/i2c-gpio.dtbo \ overlays/i2c-rtc.dtbo \ overlays/imx219.dtbo \ overlays/imx477.dtbo \ @@ -36,6 +39,7 @@ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \ overlays/iqaudio-dacplus.dtbo \ overlays/mcp2515-can0.dtbo \ overlays/mcp2515-can1.dtbo \ + overlays/mcp3008.dtbo \ overlays/miniuart-bt.dtbo \ overlays/pitft22.dtbo \ overlays/pitft28-capacitive.dtbo \ @@ -45,11 +49,13 @@ RPI_KERNEL_DEVICETREE_OVERLAYS ?= " \ overlays/rpi-ft5406.dtbo \ overlays/rpi-poe.dtbo \ overlays/vc4-fkms-v3d.dtbo \ + overlays/vc4-fkms-v3d-pi4.dtbo \ overlays/vc4-kms-v3d.dtbo \ overlays/vc4-kms-v3d-pi4.dtbo \ overlays/vc4-kms-dsi-7inch.dtbo \ overlays/w1-gpio.dtbo \ overlays/w1-gpio-pullup.dtbo \ + overlays/wm8960-soundcard.dtbo \ " RPI_KERNEL_DEVICETREE ?= " \ @@ -95,6 +101,7 @@ MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc" MACHINE_EXTRA_RRECOMMENDS += "kernel-modules udev-rules-rpi" MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "${@oe.utils.conditional('ENABLE_I2C', '1', 'kernel-module-i2c-dev kernel-module-i2c-bcm2708', '', d)}" MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "${@oe.utils.conditional('ENABLE_IR', '1', 'kernel-module-gpio-ir kernel-module-gpio-ir-tx', '', d)}" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "${@oe.utils.conditional('ENABLE_GPIO_SHUTDOWN', '1', 'gpio-shutdown kernel-module-gpio-keys', '', d)}" SERIAL_CONSOLES_CHECK ??= "${SERIAL_CONSOLES}" @@ -109,7 +116,6 @@ def make_dtb_boot_files(d): # Generate IMAGE_BOOT_FILES entries for device tree files listed in # KERNEL_DEVICETREE. alldtbs = d.getVar('KERNEL_DEVICETREE') - imgtyp = d.getVar('KERNEL_IMAGETYPE') def transform(dtb): base = os.path.basename(dtb) @@ -143,4 +149,4 @@ do_image_wic[recrdeps] = "do_build" # The kernel image is installed into the FAT32 boot partition and does not need # to also be installed into the rootfs. -RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" +RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" diff --git a/bsp/meta-raspberrypi/conf/machine/include/rpi-default-settings.inc b/bsp/meta-raspberrypi/conf/machine/include/rpi-default-settings.inc index bb18496c9d4808cd8f10d580747f8b546d670c74..b788f146fc4f2bad391067294cd3a764525789d6 100644 --- a/bsp/meta-raspberrypi/conf/machine/include/rpi-default-settings.inc +++ b/bsp/meta-raspberrypi/conf/machine/include/rpi-default-settings.inc @@ -5,5 +5,5 @@ IMAGE_CLASSES += "sdcard_image-rpi" # RPI kernel has errors of its own which should be filtered # therefore use parselogs_rpi test instead of parselogs from oe-core # -DEFAULT_TEST_SUITES_append_rpi = " parselogs_rpi" -DEFAULT_TEST_SUITES_remove_rpi = " parselogs" +DEFAULT_TEST_SUITES:append:rpi = " parselogs_rpi" +DEFAULT_TEST_SUITES:remove:rpi = " parselogs" diff --git a/bsp/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc b/bsp/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc index 17d5bd6d59f1f4ff4e3cec462af024a5727362d1..8ff283936fb71c5e03965597016fbaa003bb4674 100644 --- a/bsp/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc +++ b/bsp/meta-raspberrypi/conf/machine/include/rpi-default-versions.inc @@ -1,3 +1,3 @@ # RaspberryPi BSP default versions -PREFERRED_VERSION_linux-raspberrypi ??= "5.10.%" +PREFERRED_VERSION_linux-raspberrypi ??= "5.15.%" diff --git a/bsp/meta-raspberrypi/conf/machine/include/tune-arm1176jzf-s.inc b/bsp/meta-raspberrypi/conf/machine/include/tune-arm1176jzf-s.inc index b9e0377fda4d010408f04ec78fda268fea8452f4..ce5f08ea7f6b7ae2fcdca98539324e2aa51ef10a 100644 --- a/bsp/meta-raspberrypi/conf/machine/include/tune-arm1176jzf-s.inc +++ b/bsp/meta-raspberrypi/conf/machine/include/tune-arm1176jzf-s.inc @@ -7,11 +7,11 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'arm1176jzfs', ' -mcpu=arm MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'arm1176jzfs', 'armv6:', '', d)}" AVAILTUNES += "arm1176jzfs" -ARMPKGARCH_tune-arm1176jzfs = "arm1176jzfs" -TUNE_FEATURES_tune-arm1176jzfs = "arm thumb vfp arm1176jzfs" -PACKAGE_EXTRA_ARCHS_tune-arm1176jzfs = "${PACKAGE_EXTRA_ARCHS_tune-armv6} arm1176jzfs" +ARMPKGARCH:tune-arm1176jzfs = "arm1176jzfs" +TUNE_FEATURES:tune-arm1176jzfs = "arm thumb vfp arm1176jzfs" +PACKAGE_EXTRA_ARCHS:tune-arm1176jzfs = "${PACKAGE_EXTRA_ARCHS:tune-armv6} arm1176jzfs" AVAILTUNES += "arm1176jzfshf" -ARMPKGARCH_tune-arm1176jzfshf = "${ARMPKGARCH_tune-arm1176jzfs}" -TUNE_FEATURES_tune-arm1176jzfshf = "${TUNE_FEATURES_tune-arm1176jzfs} callconvention-hard" -PACKAGE_EXTRA_ARCHS_tune-arm1176jzfshf = "${PACKAGE_EXTRA_ARCHS_tune-armv6thf} arm1176jzfshf-vfp" +ARMPKGARCH:tune-arm1176jzfshf = "${ARMPKGARCH:tune-arm1176jzfs}" +TUNE_FEATURES:tune-arm1176jzfshf = "${TUNE_FEATURES:tune-arm1176jzfs} callconvention-hard" +PACKAGE_EXTRA_ARCHS:tune-arm1176jzfshf = "${PACKAGE_EXTRA_ARCHS:tune-armv6thf} arm1176jzfshf-vfp" diff --git a/bsp/meta-raspberrypi/conf/machine/raspberrypi-cm.conf b/bsp/meta-raspberrypi/conf/machine/raspberrypi-cm.conf index f9371df6fb208f3f0727daf3f38a3b298f0afb3d..365d030ab0d305700c3e1df1480e9d4f776e992c 100644 --- a/bsp/meta-raspberrypi/conf/machine/raspberrypi-cm.conf +++ b/bsp/meta-raspberrypi/conf/machine/raspberrypi-cm.conf @@ -2,7 +2,7 @@ #@NAME: RaspberryPi Compute Module (CM1) #@DESCRIPTION: Machine configuration for the RaspberryPi Compute Module (CM1) -MACHINEOVERRIDES = "raspberrypi:${MACHINE}" +MACHINEOVERRIDES =. "raspberrypi:" include conf/machine/raspberrypi.conf ARMSTUB ?= "armstub.bin" diff --git a/bsp/meta-raspberrypi/conf/machine/raspberrypi-cm3.conf b/bsp/meta-raspberrypi/conf/machine/raspberrypi-cm3.conf index f1b81519f8d0d1fd147dd811928eee685c137d0f..2ffdfaf0015d80223e106c4cd0b4cc31e0ffe0b4 100644 --- a/bsp/meta-raspberrypi/conf/machine/raspberrypi-cm3.conf +++ b/bsp/meta-raspberrypi/conf/machine/raspberrypi-cm3.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the RaspberryPi Compute Module 3 (CM3) DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4" -require conf/machine/include/tune-cortexa7.inc +require conf/machine/include/arm/armv7a/tune-cortexa7.inc include conf/machine/include/rpi-base.inc SDIMG_KERNELIMAGE ?= "kernel7.img" diff --git a/bsp/meta-raspberrypi/conf/machine/raspberrypi0-2w-64.conf b/bsp/meta-raspberrypi/conf/machine/raspberrypi0-2w-64.conf new file mode 100644 index 0000000000000000000000000000000000000000..0264107d019ba2270e0934eb7ee5d0da52c02a92 --- /dev/null +++ b/bsp/meta-raspberrypi/conf/machine/raspberrypi0-2w-64.conf @@ -0,0 +1,17 @@ +#@TYPE: Machine +#@NAME: RaspberryPi0 2 Wifi Development Board +#@DESCRIPTION: Machine configuration for the RaspberryPi0 2 Wifi in 64 bits mode + +MACHINEOVERRIDES =. "raspberrypi3-64:" + +include conf/machine/raspberrypi3-64.conf + +MACHINE_EXTRA_RRECOMMENDS += "\ + linux-firmware-rpidistro-bcm43436 \ + linux-firmware-rpidistro-bcm43436s \ + bluez-firmware-rpidistro-bcm43430b0-hcd \ +" + +RPI_KERNEL_DEVICETREE = " \ + broadcom/bcm2710-rpi-zero-2.dtb \ + " diff --git a/bsp/meta-raspberrypi/conf/machine/raspberrypi0-2w.conf b/bsp/meta-raspberrypi/conf/machine/raspberrypi0-2w.conf new file mode 100644 index 0000000000000000000000000000000000000000..cc11b9d1ff7057ee889dfc216ffecdcb2cee6d5b --- /dev/null +++ b/bsp/meta-raspberrypi/conf/machine/raspberrypi0-2w.conf @@ -0,0 +1,17 @@ +#@TYPE: Machine +#@NAME: RaspberryPi0 2 Wifi Development Board +#@DESCRIPTION: Machine configuration for the RaspberryPi0 2 Wifi in 32 bits mode + +MACHINEOVERRIDES =. "raspberrypi3:" + +include conf/machine/raspberrypi3.conf + +MACHINE_EXTRA_RRECOMMENDS += "\ + linux-firmware-rpidistro-bcm43436 \ + linux-firmware-rpidistro-bcm43436s \ + bluez-firmware-rpidistro-bcm43430b0-hcd \ +" + +RPI_KERNEL_DEVICETREE = " \ + bcm2710-rpi-zero-2.dtb \ + " diff --git a/bsp/meta-raspberrypi/conf/machine/raspberrypi0.conf b/bsp/meta-raspberrypi/conf/machine/raspberrypi0.conf index 80297b563ce5564e15ac48b0094ba287071b3129..597918a618f4db392987c0371754246c6f0dfb50 100644 --- a/bsp/meta-raspberrypi/conf/machine/raspberrypi0.conf +++ b/bsp/meta-raspberrypi/conf/machine/raspberrypi0.conf @@ -2,7 +2,7 @@ #@NAME: RaspberryPi Zero Development Board #@DESCRIPTION: Machine configuration for the RaspberryPi Zero board (https://www.raspberrypi.org/blog/raspberry-pi-zero) -MACHINEOVERRIDES = "raspberrypi:${MACHINE}" +MACHINEOVERRIDES =. "raspberrypi:" include conf/machine/raspberrypi.conf SERIAL_CONSOLES ?= "115200;ttyAMA0" diff --git a/bsp/meta-raspberrypi/conf/machine/raspberrypi2.conf b/bsp/meta-raspberrypi/conf/machine/raspberrypi2.conf index 505c6f2ff1b1fdad79b4ef56283d5a86c131418b..403d15e8e8b644e85573f1b4595811dd52a68ee1 100644 --- a/bsp/meta-raspberrypi/conf/machine/raspberrypi2.conf +++ b/bsp/meta-raspberrypi/conf/machine/raspberrypi2.conf @@ -4,7 +4,7 @@ DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4" -require conf/machine/include/tune-cortexa7.inc +require conf/machine/include/arm/armv7a/tune-cortexa7.inc include conf/machine/include/rpi-base.inc SERIAL_CONSOLES ?= "115200;ttyAMA0" diff --git a/bsp/meta-raspberrypi/conf/machine/raspberrypi3-64.conf b/bsp/meta-raspberrypi/conf/machine/raspberrypi3-64.conf index 5394132195ee30b5cfdc7894e1a2d78a2ae0b9f0..ff22f489e8b6c2d143dfa036b1f4805a4416df0b 100644 --- a/bsp/meta-raspberrypi/conf/machine/raspberrypi3-64.conf +++ b/bsp/meta-raspberrypi/conf/machine/raspberrypi3-64.conf @@ -2,7 +2,7 @@ #@NAME: RaspberryPi 3 Development Board #@DESCRIPTION: Machine configuration for the RaspberryPi 3 in 64 bits mode -MACHINEOVERRIDES = "raspberrypi3:${MACHINE}" +MACHINEOVERRIDES =. "raspberrypi3:" MACHINE_EXTRA_RRECOMMENDS += "\ linux-firmware-rpidistro-bcm43430 \ @@ -11,7 +11,7 @@ MACHINE_EXTRA_RRECOMMENDS += "\ bluez-firmware-rpidistro-bcm4345c0-hcd \ " -require conf/machine/include/tune-cortexa53.inc +require conf/machine/include/arm/armv8a/tune-cortexa53.inc include conf/machine/include/rpi-base.inc RPI_KERNEL_DEVICETREE = " \ diff --git a/bsp/meta-raspberrypi/conf/machine/raspberrypi3.conf b/bsp/meta-raspberrypi/conf/machine/raspberrypi3.conf index dafb66e5a090eb6b9d4ca29f140dd96fae8e4937..1212498e6fda45843fdef9ae8dd1f045a721f70d 100644 --- a/bsp/meta-raspberrypi/conf/machine/raspberrypi3.conf +++ b/bsp/meta-raspberrypi/conf/machine/raspberrypi3.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the RaspberryPi 3 in 32 bits mode DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4" -require conf/machine/include/tune-cortexa7.inc +require conf/machine/include/arm/armv7a/tune-cortexa7.inc include conf/machine/include/rpi-base.inc MACHINE_EXTRA_RRECOMMENDS += "\ diff --git a/bsp/meta-raspberrypi/conf/machine/raspberrypi4-64.conf b/bsp/meta-raspberrypi/conf/machine/raspberrypi4-64.conf index 12c8954d946ae15572a0af5f9a288065d7989420..a6e20733aa18bd571c8184919fd9766b9d54f040 100644 --- a/bsp/meta-raspberrypi/conf/machine/raspberrypi4-64.conf +++ b/bsp/meta-raspberrypi/conf/machine/raspberrypi4-64.conf @@ -2,15 +2,19 @@ #@NAME: RaspberryPi 4 Development Board (64bit) #@DESCRIPTION: Machine configuration for the RaspberryPi 4 in 64 bits mode -MACHINEOVERRIDES = "raspberrypi4:${MACHINE}" +MACHINEOVERRIDES =. "raspberrypi4:" MACHINE_FEATURES += "pci" MACHINE_EXTRA_RRECOMMENDS += "\ linux-firmware-rpidistro-bcm43455 \ bluez-firmware-rpidistro-bcm4345c0-hcd \ + linux-firmware-rpidistro-bcm43456 \ + bluez-firmware-rpidistro-bcm4345c5-hcd \ " -require conf/machine/include/tune-cortexa72.inc +DEFAULTTUNE = "cortexa72" + +require conf/machine/include/arm/armv8a/tune-cortexa72.inc include conf/machine/include/rpi-base.inc RPI_KERNEL_DEVICETREE = " \ @@ -24,7 +28,7 @@ SERIAL_CONSOLES ?= "115200;ttyS0" UBOOT_MACHINE = "rpi_arm64_config" -VC4DTBO ?= "vc4-fkms-v3d" +VC4DTBO ?= "vc4-kms-v3d" # When u-boot is enabled we need to use the "Image" format and the "booti" # command to load the kernel diff --git a/bsp/meta-raspberrypi/conf/machine/raspberrypi4.conf b/bsp/meta-raspberrypi/conf/machine/raspberrypi4.conf index d6b1d1bd0ec65f9f855e1e72ed2c97c71c574bc5..86c57ed4aaa47b7c4b2e8f8f0ffe7e3cffe48ea2 100644 --- a/bsp/meta-raspberrypi/conf/machine/raspberrypi4.conf +++ b/bsp/meta-raspberrypi/conf/machine/raspberrypi4.conf @@ -3,13 +3,15 @@ #@DESCRIPTION: Machine configuration for the RaspberryPi 4 in 32 bit mode DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4" -require conf/machine/include/tune-cortexa7.inc +require conf/machine/include/arm/armv7a/tune-cortexa7.inc include conf/machine/include/rpi-base.inc MACHINE_FEATURES += "pci" MACHINE_EXTRA_RRECOMMENDS += "\ linux-firmware-rpidistro-bcm43455 \ bluez-firmware-rpidistro-bcm4345c0-hcd \ + linux-firmware-rpidistro-bcm43456 \ + bluez-firmware-rpidistro-bcm4345c5-hcd \ " # 'l' stands for LPAE @@ -17,5 +19,5 @@ SDIMG_KERNELIMAGE ?= "kernel7l.img" UBOOT_MACHINE = "rpi_4_32b_config" SERIAL_CONSOLES ?= "115200;ttyS0" -VC4DTBO ?= "vc4-fkms-v3d" +VC4DTBO ?= "vc4-kms-v3d" ARMSTUB ?= "armstub7.bin" diff --git a/bsp/meta-raspberrypi/docs/conf.py b/bsp/meta-raspberrypi/docs/conf.py index fcebbf1953239b6e1e52c3be5c1be9667e0c5041..e7a2491dde085e21068e88d83666996bd739507d 100644 --- a/bsp/meta-raspberrypi/docs/conf.py +++ b/bsp/meta-raspberrypi/docs/conf.py @@ -30,7 +30,7 @@ # Add any Sphinx extension module names here, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. -extensions = [] +extensions = ['myst_parser'] # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] @@ -50,7 +50,7 @@ master_doc = 'index' # General information about the project. project = 'meta-raspberrypi' -copyright = '2017, meta-raspberrypi contributors' +copyright = '2022, meta-raspberrypi contributors' author = 'meta-raspberrypi contributors' # The version info for the project you're documenting, acts as replacement for @@ -154,7 +154,7 @@ todo_include_todos = False # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] +#html_static_path = ['_static'] # Add any extra paths that contain custom files (such as robots.txt or # .htaccess) here, relative to this directory. These files are copied @@ -337,7 +337,3 @@ texinfo_documents = [ # If true, do not generate a @detailmenu in the "Top" node's menu. # # texinfo_no_detailmenu = False - -source_parsers = { - '.md': 'recommonmark.parser.CommonMarkParser', -} diff --git a/bsp/meta-raspberrypi/docs/contributing.md b/bsp/meta-raspberrypi/docs/contributing.md index 7d18400d473bacea3a87812105f98591b2b605f2..9ecb6cb8968fe97aa50d94d830ea3ed60dea9654 100644 --- a/bsp/meta-raspberrypi/docs/contributing.md +++ b/bsp/meta-raspberrypi/docs/contributing.md @@ -4,8 +4,8 @@ The main communication tool in use is the Yocto Project mailing list: -* -* +* +* Feel free to ask any kind of questions but please always prepend your email subject with `[meta-raspberrypi]` as this is the global *Yocto* mailing @@ -84,7 +84,11 @@ sure to use the following formatting for the message subject: Then, for sending patches to the mailing list, you may use this command: - git send-email --to yocto@yoctoproject.org + git send-email --to yocto@lists.yoctoproject.org + +When patches are sent through the mailing list, the maintainer will include +them in a GitHub pull request that will take the patches through the CI +workflows. This process happens periodically. ## GitHub issues diff --git a/bsp/meta-raspberrypi/docs/extra-apps.md b/bsp/meta-raspberrypi/docs/extra-apps.md index 53007dc1f022b6adb05d0dc52a086654739b1f89..dbbfb8ddb160d1fc9f7743c7b197332f0fc24a4d 100644 --- a/bsp/meta-raspberrypi/docs/extra-apps.md +++ b/bsp/meta-raspberrypi/docs/extra-apps.md @@ -6,4 +6,4 @@ omxplayer depends on libav which has a commercial license. So in order to be able to compile omxplayer you will need to whiteflag the commercial license in your local.conf: - LICENSE_FLAGS_WHITELIST = "commercial" + LICENSE_FLAGS_ACCEPTED = "commercial" diff --git a/bsp/meta-raspberrypi/docs/extra-build-config.md b/bsp/meta-raspberrypi/docs/extra-build-config.md index 1caf904fd57750377b71e4446174726007cae195..6c546794b78dfdf5b5755f00580169278090ce84 100644 --- a/bsp/meta-raspberrypi/docs/extra-build-config.md +++ b/bsp/meta-raspberrypi/docs/extra-build-config.md @@ -29,7 +29,7 @@ Accommodate the values above to your own needs (ex: ext3 / ext4). * `GPU_MEM_1024`: GPU memory in megabyte for the 1024MB Raspberry Pi. Ignored by the 256MB/512MB RP. Overrides gpu_mem. Max 944. Default not set. -See: +See: ## VC4 @@ -47,7 +47,7 @@ You can supply more licenses separated by comma. Example: KEY_DECODE_WVC1 = "0x12345678,0xabcdabcd,0x87654321" -See: +See: ## Disable overscan @@ -89,7 +89,7 @@ Example official settings for Turbo Mode in Raspberry Pi 2: SDRAM_FREQ = "500" OVER_VOLTAGE = "6" -See: +See: ## HDMI and composite video options @@ -99,14 +99,14 @@ selected according to the connected monitor's EDID information and the composite mode is defaulted to NTSC using a 4:3 aspect ratio. Check the config.txt for a detailed description of options and modes. The following variables are supported in local.conf: `HDMI_FORCE_HOTPLUG`, `HDMI_DRIVE`, `HDMI_GROUP`, `HDMI_MODE`, -`CONFIG_HDMI_BOOST`, `SDTV_MODE`, `SDTV_ASPECT` and `DISPLAY_ROTATE`. +`HDMI_CVT`, `CONFIG_HDMI_BOOST`, `SDTV_MODE`, `SDTV_ASPECT` and `DISPLAY_ROTATE`. Example to force HDMI output to 720p in CEA mode: HDMI_GROUP = "1" HDMI_MODE = "4" -See: +See: ## Video camera support with V4L2 drivers @@ -159,7 +159,7 @@ command (eg. bootz) to be used. To build an initramfs image: -* Set this 3 kernel variables (in kernel's do_configure_prepend in linux-raspberrypi.inc after the line kernel_configure_variable LOCALVERSION "\"\"" +* Set this 3 kernel variables (in kernel's do_configure:prepend in linux-raspberrypi.inc after the line kernel_configure_variable LOCALVERSION "\"\"" ) - kernel_configure_variable BLK_DEV_INITRD y - kernel_configure_variable INITRAMFS_SOURCE "" @@ -195,7 +195,7 @@ by tasks that image building task must depend upon, to ensure that the files are available when they are needed, so these component deploy tasks must be added to: RPI_SDIMG_EXTRA_DEPENDS. - RPI_SDIMG_EXTRA_DEPENDS_append = " example:do_deploy" + RPI_SDIMG_EXTRA_DEPENDS:append = " example:do_deploy" ## Enable SPI bus @@ -211,7 +211,7 @@ When using device tree kernels, set this variable to enable I2C: Furthermore, to auto-load I2C kernel modules set: - KERNEL_MODULE_AUTOLOAD_rpi += "i2c-dev i2c-bcm2708" + KERNEL_MODULE_AUTOLOAD:rpi += "i2c-dev i2c-bcm2708" ## Enable PiTFT support @@ -278,6 +278,18 @@ the header extension should set the following in local.conf: ENABLE_DWC2_HOST = "1" +## Set CPUs to be isolated from the standard Linux scheduler + +By default Linux will use all available CPUs for scheduling tasks. For real time +purposes there can be an advantage to isolating one or more CPUs from the +standard scheduler. It should be noted that CPU 0 is special, it is the only CPU +available during the early stages of the boot process and cannot be isolated. + +The string assigned to this variable may be a single CPU number, a comma +separated list ("1,2"), a range("1-3"), or a mixture of these ("1,3-5") + + ISOLATED_CPUS = "1-2" + ## Enable Openlabs 802.15.4 radio module When using device tree kernels, set this variable to enable the 802.15.4 hat: @@ -290,13 +302,13 @@ See: In order to use CAN with an MCP2515-based module, set the following variables: - ENABLE_SPI_BUS = "1" - ENABLE_CAN = "1" + ENABLE_SPI_BUS = "1" + ENABLE_CAN = "1" In case of dual CAN module (e.g. PiCAN2 Duo), set following variables instead: ENABLE_SPI_BUS = "1" - ENABLE_DUAL_CAN = "1" + ENABLE_DUAL_CAN = "1" Some modules may require setting the frequency of the crystal oscillator used on the particular board. The frequency is usually marked on the package of the crystal. By default, it is set to 16 MHz. To change that to 8 MHz, the following variable also has to be set: @@ -320,6 +332,24 @@ Appropriate kernel modules will be also included in the image. By default the GPIO pin for gpio-ir is set to 18 and the pin for gpio-ir-tx is 17. Both pins can be easily changed by modifying variables `GPIO_IR` and `GPIO_IR_TX`. +## Enable gpio-shutdown + +When using device tree kernels, set this variable to enable gpio-shutdown: + + ENABLE_GPIO_SHUTDOWN = "1" + +This will add the corresponding device tree overlay to config.txt and include +the gpio-keys kernel module in the image. If System V init is used, additional +mapping is applied to bind the button event to shutdown command. Systemd init +should handle the event out of the box. + +By default the feature uses gpio pin 3 (except RPi 1 Model B rev 1 enumerates +the pin as gpio 1). This conflicts with the I2C bus. If you set `ENABLE_I2C` +to `1` or enabled `PiTFT` support, or otherwise want to use another pin, use +`GPIO_SHUTDOWN_PIN` to assign another pin. Example using gpio pin 25: + + GPIO_SHUTDOWN_PIN = "25" + ## Manual additions to config.txt The `RPI_EXTRA_CONFIG` variable can be used to manually add additional lines to @@ -349,3 +379,44 @@ Also, this will enable adding Contiguous Memory Allocation value in the cmdline. Ref.: * * + +## WM8960 soundcard support + +Support for WM8960 based sound cards such as the WM8960 Hi-Fi Sound Card HAT for Raspberry Pi from Waveshare, and ReSpeaker 2 / 4 / 6 Mics Pi HAT from Seeed Studio, can be enabled in `local.conf` + + ```conf + MACHINE_FEATURES += "wm8960" + ``` + +You may need to adjust volume and toggle switches that are off by default + + ```bash + amixer -c1 sset 'Headphone',0 80%,80% + amixer -c1 sset 'Speaker',0 80%,80% + amixer -c1 sset 'Left Input Mixer Boost' toggle + amixer -c1 sset 'Left Output Mixer PCM' toggle + amixer -c1 sset 'Right Input Mixer Boost' toggle + amixer -c1 sset 'Right Output Mixer PCM' toggle + ``` + +Audio capture on ReSpeaker 2 / 4 / 6 Mics Pi HAT from Seeed Studio is very noisy. + +## Support for RTC devices + +The RaspberryPi boards don't feature an RTC module and the machine +configurations provided in this BSP layer have this assumption (until, if at +all, some later boards will come with one). + +`rtc` is handled as a `MACHINE_FEATURES` in the context of the build system +which means that if an attached device is provided for which support is needed, +the recommended way forward is to write a new machine configuration based on an +existing one. Check the documentation for +`MACHINE_FEATURES_BACKFILL_CONSIDERED` for how this is disabled for the +relevant machines. + +Even when `MACHINE_FEATURES` is tweaked to include the needed `rtc` string, +make sure that your kernel configuration is supporting the attached device and +the device tree is properly tweaked. Also, mind the runtime components that +take advantage of your RTC device. You can do that by checking what is +included/configured in the build system based on the inclusion of `rtc` in +`MACHINE_FEATURES`. diff --git a/bsp/meta-raspberrypi/docs/layer-contents.md b/bsp/meta-raspberrypi/docs/layer-contents.md index 5483708d83519ce44a50ff8c3e026dafc0b0192e..d12cb88f81eb40b1bfc072c1aae26155d3472222 100644 --- a/bsp/meta-raspberrypi/docs/layer-contents.md +++ b/bsp/meta-raspberrypi/docs/layer-contents.md @@ -5,6 +5,7 @@ * raspberrypi * raspberrypi0 * raspberrypi0-wifi +* raspberrypi0-2w-64 * raspberrypi2 * raspberrypi3 * raspberrypi3-64 (64 bit kernel & userspace) @@ -22,8 +23,7 @@ Note: The raspberrypi3 machines include support for Raspberry Pi 3B+. layer and some media samples. For other uses it's recommended to base images on `core-image-minimal` or -`core-image-base` as appropriate. The old image names (`rpi-hwup-image` and -`rpi-basic-image`) are deprecated. +`core-image-base` as appropriate. ## WiFi and Bluetooth Firmware diff --git a/bsp/meta-raspberrypi/docs/requirements.txt b/bsp/meta-raspberrypi/docs/requirements.txt new file mode 100644 index 0000000000000000000000000000000000000000..9e4694f9069ddb8e77362674547ccfb821e5cdb0 --- /dev/null +++ b/bsp/meta-raspberrypi/docs/requirements.txt @@ -0,0 +1 @@ +myst_parser diff --git a/bsp/meta-raspberrypi/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bbappend b/bsp/meta-raspberrypi/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bbappend index 5d3ab4dfd3b37e80f3642479b4c072861c37dcc5..22f8ce410703677959abed732f5a79bf41845ed8 100644 --- a/bsp/meta-raspberrypi/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bbappend +++ b/bsp/meta-raspberrypi/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI_append_rpi = " \ +SRC_URI:append:rpi = " \ file://lirc-gpio-ir-0.10.patch \ file://lircd.service \ " diff --git a/bsp/meta-raspberrypi/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-rpi-test.bbappend b/bsp/meta-raspberrypi/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-rpi-test.bbappend index 63fedbb54224a1cbf486a8a1580a837e2ffb015e..777653169c8ed04d4930496b1197d355dfa6d7d8 100644 --- a/bsp/meta-raspberrypi/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-rpi-test.bbappend +++ b/bsp/meta-raspberrypi/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-rpi-test.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -RDEPENDS_${PN} += "python3-sense-hat" +RDEPENDS:${PN} += "python3-sense-hat" diff --git a/bsp/meta-raspberrypi/dynamic-layers/meta-python/recipes-devtools/python/python3-sense-hat_2.2.0.bb b/bsp/meta-raspberrypi/dynamic-layers/meta-python/recipes-devtools/python/python3-sense-hat_2.2.0.bb index 6195d284bc61c46348d74d5c7da5968e0c61b8b8..fd67580f3fb208fe82040532bb608aab31611a2a 100644 --- a/bsp/meta-raspberrypi/dynamic-layers/meta-python/recipes-devtools/python/python3-sense-hat_2.2.0.bb +++ b/bsp/meta-raspberrypi/dynamic-layers/meta-python/recipes-devtools/python/python3-sense-hat_2.2.0.bb @@ -1,7 +1,7 @@ SUMMARY = "Python module to control the Raspberry Pi Sense HAT used in the Astro Pi mission" HOMEPAGE = "https://github.com/RPi-Distro/python-sense-hat" SECTION = "devel/python" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=d80fe312e1ff5fbd97369b093bf21cda" inherit setuptools3 pypi @@ -17,7 +17,7 @@ DEPENDS += " \ freetype \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ${PYTHON_PN}-numpy \ ${PYTHON_PN}-rtimu \ ${PYTHON_PN}-pillow \ diff --git a/bsp/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/libcamera/libcamera.bbappend b/bsp/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/libcamera/libcamera.bbappend index 8076ac79e8fa4c6386f2825f66b31a60fe03baab..2721cfe778292bc9ed3c908ff51b908f8a62de73 100644 --- a/bsp/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/libcamera/libcamera.bbappend +++ b/bsp/meta-raspberrypi/dynamic-layers/multimedia-layer/recipes-multimedia/libcamera/libcamera.bbappend @@ -1,2 +1,2 @@ PACKAGECONFIG[raspberrypi] = "-Dpipelines=raspberrypi" -PACKAGECONFIG_append_rpi = " raspberrypi" +PACKAGECONFIG:append:rpi = " raspberrypi" diff --git a/bsp/meta-raspberrypi/dynamic-layers/networking-layer/recipes-support/drbd/drbd_%.bbappend b/bsp/meta-raspberrypi/dynamic-layers/networking-layer/recipes-support/drbd/drbd_%.bbappend index 933aaf6c42969f7185c6d773a5b87a10ac958535..d15f34ce9c69822ca28a993bf63232e63228eca6 100644 --- a/bsp/meta-raspberrypi/dynamic-layers/networking-layer/recipes-support/drbd/drbd_%.bbappend +++ b/bsp/meta-raspberrypi/dynamic-layers/networking-layer/recipes-support/drbd/drbd_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -COMPATIBLE_MACHINE_rpi = "(null)" +COMPATIBLE_MACHINE:rpi = "(null)" diff --git a/bsp/meta-raspberrypi/dynamic-layers/openembedded-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend b/bsp/meta-raspberrypi/dynamic-layers/openembedded-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend index 25423d088843f66ba0773bfa1b3ed391f19c6581..8d458c815f0ca0a229b36582072e23dc676c5238 100644 --- a/bsp/meta-raspberrypi/dynamic-layers/openembedded-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend +++ b/bsp/meta-raspberrypi/dynamic-layers/openembedded-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend @@ -1 +1 @@ -RDEPENDS_packagegroup-meta-oe-kernel_remove_rpi = "bpftool" +RDEPENDS:packagegroup-meta-oe-kernel:remove:rpi = "bpftool" diff --git a/bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb b/bsp/meta-raspberrypi/dynamic-layers/openembedded-layer/recipes-devtools/python3-adafruit-blinka_6.2.2.bb similarity index 87% rename from bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb rename to bsp/meta-raspberrypi/dynamic-layers/openembedded-layer/recipes-devtools/python3-adafruit-blinka_6.2.2.bb index ac7a549ef8401bbfc209134c63fa5e5b144929d6..9e1e357a8b374f7b6234301a2e276c489b205060 100644 --- a/bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb +++ b/bsp/meta-raspberrypi/dynamic-layers/openembedded-layer/recipes-devtools/python3-adafruit-blinka_6.2.2.bb @@ -12,7 +12,7 @@ inherit setuptools3 DEPENDS += "python3-setuptools-scm-native" -do_install_append() { +do_install:append() { # it ships ./bcm283x/pulseio/libgpiod_pulsein which is a prebuilt # 32bit binary therefore we should make this specific to 32bit rpi machines (based on bcm283x) only if [ ${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '1', '0', d)} = "0" ]; then @@ -20,11 +20,14 @@ do_install_append() { fi } -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ libgpiod \ python3-adafruit-platformdetect \ python3-adafruit-pureio \ python3-core \ " -RDEPENDS_${PN}_append_rpi = " rpi-gpio" +RDEPENDS:${PN}:append:rpi = " rpi-gpio" + +COMPATIBLE_HOST:libc-musl:class-target = "null" + diff --git a/bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-busdevice_5.0.5.bb b/bsp/meta-raspberrypi/dynamic-layers/openembedded-layer/recipes-devtools/python3-adafruit-circuitpython-busdevice_5.0.5.bb similarity index 88% rename from bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-busdevice_5.0.5.bb rename to bsp/meta-raspberrypi/dynamic-layers/openembedded-layer/recipes-devtools/python3-adafruit-circuitpython-busdevice_5.0.5.bb index bb33bccbf6880cd1d488b07c73245a0dc30f3686..93491d43cc9973dc94a75445e8c138d98a80acf4 100644 --- a/bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-busdevice_5.0.5.bb +++ b/bsp/meta-raspberrypi/dynamic-layers/openembedded-layer/recipes-devtools/python3-adafruit-circuitpython-busdevice_5.0.5.bb @@ -12,7 +12,8 @@ inherit setuptools3 DEPENDS += "python3-setuptools-scm-native" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ python3-adafruit-blinka \ python3-core \ " +COMPATIBLE_HOST:libc-musl:class-target = "null" diff --git a/bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motor_3.2.6.bb b/bsp/meta-raspberrypi/dynamic-layers/openembedded-layer/recipes-devtools/python3-adafruit-circuitpython-motor_3.2.6.bb similarity index 88% rename from bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motor_3.2.6.bb rename to bsp/meta-raspberrypi/dynamic-layers/openembedded-layer/recipes-devtools/python3-adafruit-circuitpython-motor_3.2.6.bb index 25207fe521f0cb77197a22b78a9543609a64ceb3..3233c8f2bcb997824be27282a0f51c941c02795f 100644 --- a/bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motor_3.2.6.bb +++ b/bsp/meta-raspberrypi/dynamic-layers/openembedded-layer/recipes-devtools/python3-adafruit-circuitpython-motor_3.2.6.bb @@ -12,7 +12,8 @@ inherit setuptools3 DEPENDS += "python3-setuptools-scm-native" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ python3-adafruit-blinka \ python3-core \ " +COMPATIBLE_HOST:libc-musl:class-target = "null" diff --git a/bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motorkit_1.6.1.bb b/bsp/meta-raspberrypi/dynamic-layers/openembedded-layer/recipes-devtools/python3-adafruit-circuitpython-motorkit_1.6.1.bb similarity index 91% rename from bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motorkit_1.6.1.bb rename to bsp/meta-raspberrypi/dynamic-layers/openembedded-layer/recipes-devtools/python3-adafruit-circuitpython-motorkit_1.6.1.bb index baf9c85b35e2eb60d3a1d48d2c5fbad44bbe70bf..39fe76aab750a18d3b686b6212045948387994cd 100644 --- a/bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motorkit_1.6.1.bb +++ b/bsp/meta-raspberrypi/dynamic-layers/openembedded-layer/recipes-devtools/python3-adafruit-circuitpython-motorkit_1.6.1.bb @@ -12,7 +12,7 @@ inherit setuptools3 DEPENDS += "python3-setuptools-scm-native" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ python3-adafruit-blinka \ python3-adafruit-circuitpython-busdevice \ python3-adafruit-circuitpython-motor \ @@ -20,3 +20,4 @@ RDEPENDS_${PN} += " \ python3-adafruit-circuitpython-register \ python3-core \ " +COMPATIBLE_HOST:libc-musl:class-target = "null" diff --git a/bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-pca9685_3.3.4.bb b/bsp/meta-raspberrypi/dynamic-layers/openembedded-layer/recipes-devtools/python3-adafruit-circuitpython-pca9685_3.3.4.bb similarity index 89% rename from bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-pca9685_3.3.4.bb rename to bsp/meta-raspberrypi/dynamic-layers/openembedded-layer/recipes-devtools/python3-adafruit-circuitpython-pca9685_3.3.4.bb index f287b5e31ddaa1eec5e18a6348a17745f4b289d3..f7f0ff162b7da43aad996ea38d6e8f2f44d5f382 100644 --- a/bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-pca9685_3.3.4.bb +++ b/bsp/meta-raspberrypi/dynamic-layers/openembedded-layer/recipes-devtools/python3-adafruit-circuitpython-pca9685_3.3.4.bb @@ -12,9 +12,10 @@ inherit setuptools3 DEPENDS += "python3-setuptools-scm-native" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ python3-adafruit-blinka \ python3-adafruit-circuitpython-busdevice \ python3-adafruit-circuitpython-register \ python3-core \ " +COMPATIBLE_HOST:libc-musl:class-target = "null" diff --git a/bsp/meta-raspberrypi/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/bsp/meta-raspberrypi/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend index e48f31d117534c4c58a4c982f2fdb7f7b2fa2c3e..6d3de3f8a7177ad191886d466e33160365e456f9 100644 --- a/bsp/meta-raspberrypi/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend +++ b/bsp/meta-raspberrypi/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend @@ -1,19 +1,19 @@ -PACKAGECONFIG_GL_rpi = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'gl', \ +PACKAGECONFIG_GL:rpi = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'gl', \ bb.utils.contains('DISTRO_FEATURES', 'opengl', 'eglfs gles2', \ '', d), d)}" -PACKAGECONFIG_GL_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', ' kms', '', d)}" -PACKAGECONFIG_GL_append_rpi = " gbm" -PACKAGECONFIG_FONTS_rpi = "fontconfig" -PACKAGECONFIG_append_rpi = " libinput examples tslib xkbcommon" -PACKAGECONFIG_remove_rpi = "tests" +PACKAGECONFIG_GL:append:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', ' kms', '', d)}" +PACKAGECONFIG_GL:append:rpi = " gbm" +PACKAGECONFIG_FONTS:rpi = "fontconfig" +PACKAGECONFIG:append:rpi = " libinput examples tslib xkbcommon" +PACKAGECONFIG:remove:rpi = "tests" -OE_QTBASE_EGLFS_DEVICE_INTEGRATION_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'eglfs_brcm', d)}" +OE_QTBASE_EGLFS_DEVICE_INTEGRATION:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'eglfs_brcm', d)}" -do_configure_prepend_rpi() { +do_configure:prepend:rpi() { # Add the appropriate EGLFS_DEVICE_INTEGRATION if [ "${@d.getVar('OE_QTBASE_EGLFS_DEVICE_INTEGRATION')}" != "" ]; then echo "EGLFS_DEVICE_INTEGRATION = ${OE_QTBASE_EGLFS_DEVICE_INTEGRATION}" >> ${S}/mkspecs/oe-device-extra.pri fi } -RDEPENDS_${PN}_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" -DEPENDS_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" +RDEPENDS:${PN}:append:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" +DEPENDS:append:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" diff --git a/bsp/meta-raspberrypi/dynamic-layers/ros2-layer/recipes-core/images/openeuler-image-ros.bbappend b/bsp/meta-raspberrypi/dynamic-layers/ros2-layer/recipes-core/images/openeuler-image-ros.bbappend deleted file mode 100644 index 2a602295b8ed81c060b9755f6cf4740d17dcce79..0000000000000000000000000000000000000000 --- a/bsp/meta-raspberrypi/dynamic-layers/ros2-layer/recipes-core/images/openeuler-image-ros.bbappend +++ /dev/null @@ -1,10 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -#fix mkfs.ext4 running error, add -E no_copy_xattrs to mkfs.ext4 -WKS_FILE = "sdimage-rpi.wks" -WKS_FILE_DEPENDS = "" - -# add ros slam demo for rpi4 -IMAGE_INSTALL += " \ -packagegroup-rosslam \ -packagegroup-roscamera \ -" diff --git a/bsp/meta-raspberrypi/dynamic-layers/ros2-layer/recipes-ros/originbot/originbot-base_%.bbappend b/bsp/meta-raspberrypi/dynamic-layers/ros2-layer/recipes-ros/originbot/originbot-base_%.bbappend deleted file mode 100644 index 9926f857365d8c6bb76d371d6031d28d82a23354..0000000000000000000000000000000000000000 --- a/bsp/meta-raspberrypi/dynamic-layers/ros2-layer/recipes-ros/originbot/originbot-base_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -# we use ttyS0 as originbot base serial port in rpi4 as default -do_configure_prepend_class-target() { - sed -i 's:ttyS3:ttyS0:g' ${S}/launch/robot.launch.py -} - diff --git a/bsp/meta-raspberrypi/dynamic-layers/ros2-layer/recipes-ros/originbot/originbot-bringup_%.bbappend b/bsp/meta-raspberrypi/dynamic-layers/ros2-layer/recipes-ros/originbot/originbot-bringup_%.bbappend deleted file mode 100644 index 10b7b9564992b37b6db55a7ab9ec12cf7e666e7f..0000000000000000000000000000000000000000 --- a/bsp/meta-raspberrypi/dynamic-layers/ros2-layer/recipes-ros/originbot/originbot-bringup_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -# we use ttyUSB0 as ydlidar serial port in rpi4 as default -do_configure_prepend_class-target() { - sed -i 's:dev\/ydlidar:dev\/ttyUSB0:g' ${S}/param/ydlidar.yaml -} - diff --git a/bsp/meta-raspberrypi/kas-poky-rpi.yml b/bsp/meta-raspberrypi/kas-poky-rpi.yml index d629e817f1ebc34247de4caf7cb37673e55d592c..2ab4770a4a5b0ec60f9ae289c8071e30181f1d93 100644 --- a/bsp/meta-raspberrypi/kas-poky-rpi.yml +++ b/bsp/meta-raspberrypi/kas-poky-rpi.yml @@ -42,10 +42,10 @@ local_conf_header: reduce_diskspace: | INHERIT += "rm_work_and_downloads" standard: | - CONF_VERSION = "1" + CONF_VERSION = "2" PACKAGE_CLASSES = "package_rpm" SDKMACHINE = "x86_64" - USER_CLASSES = "buildstats image-mklibs image-prelink" + USER_CLASSES = "buildstats" PATCHRESOLVE = "noop" debug-tweaks: | EXTRA_IMAGE_FEATURES = "debug-tweaks" diff --git a/bsp/meta-raspberrypi/lib/oeqa/runtime/cases/parselogs_rpi.py b/bsp/meta-raspberrypi/lib/oeqa/runtime/cases/parselogs_rpi.py index 4a9431034544961ebbd2ddad4212f70e0b8fbc25..49226ae8168390dad9aff0ad825192636e089821 100644 --- a/bsp/meta-raspberrypi/lib/oeqa/runtime/cases/parselogs_rpi.py +++ b/bsp/meta-raspberrypi/lib/oeqa/runtime/cases/parselogs_rpi.py @@ -1,12 +1,6 @@ from oeqa.runtime.cases.parselogs import * rpi_errors = [ - 'bcmgenet fd580000.genet: failed to get enet-eee clock', - 'bcmgenet fd580000.genet: failed to get enet-wol clock', - 'bcmgenet fd580000.genet: failed to get enet clock', - 'bcmgenet fd580000.ethernet: failed to get enet-eee clock', - 'bcmgenet fd580000.ethernet: failed to get enet-wol clock', - 'bcmgenet fd580000.ethernet: failed to get enet clock', ] ignore_errors['raspberrypi4'] = rpi_errors + common_errors diff --git a/bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb b/bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb index 3ebd1e61c2478ef39102e0a053531d8db412569c..6fb3a1bcc3d8b8c86c02369e4c9335a5dfacaf5f 100644 --- a/bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb +++ b/bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb @@ -7,7 +7,9 @@ INHIBIT_DEFAULT_DEPS = "1" inherit deploy nopackages CMDLINE_DWC_OTG ?= "dwc_otg.lpm_enable=0" -CMDLINE_ROOTFS ?= "root=/dev/mmcblk0p2 rootfstype=ext4 rootwait" + +CMDLINE_ROOT_FSTYPE ?= "rootfstype=ext4" +CMDLINE_ROOTFS ?= "root=/dev/mmcblk0p2 ${CMDLINE_ROOT_FSTYPE} rootwait" CMDLINE_SERIAL ?= "${@oe.utils.conditional("ENABLE_UART", "1", "console=serial0,115200", "", d)}" @@ -27,7 +29,27 @@ CMDLINE_LOGO ?= '${@oe.utils.conditional("DISABLE_RPI_BOOT_LOGO", "1", "logo.nol # to enable kernel debugging. CMDLINE_DEBUG ?= "" +# Add a request to isolate processors from the Linux scheduler. ISOLATED_CPUS +# may have the form of a comma separated list of processor numbers "0,1,3", a +# range "0-2", a combination of the two "0-1,3", or a single processor you may +# not specify ALL processors simultaneously +def setup_isolcpus(d): + string = "" + if d.getVar('ISOLATED_CPUS'): + string = 'isolcpus=' + d.getVar('ISOLATED_CPUS') + return string + +CMDLINE_ISOL_CPUS ?= "${@setup_isolcpus(d)}" + +# Add RNDIS capabilities (must be after rootwait) +# example: +# CMDLINE_RNDIS = "modules-load=dwc2,g_ether g_ether.host_addr= g_ether.dev_addr=" +# if the MAC addresses are omitted, random values will be used +CMDLINE_RNDIS ?= "" + CMDLINE = " \ + ${CMDLINE_ISOL_CPUS} \ ${CMDLINE_DWC_OTG} \ ${CMDLINE_SERIAL} \ ${CMDLINE_ROOTFS} \ @@ -36,10 +58,11 @@ CMDLINE = " \ ${CMDLINE_LOGO} \ ${CMDLINE_PITFT} \ ${CMDLINE_DEBUG} \ + ${CMDLINE_RNDIS} \ " do_compile() { - echo "${@' '.join('${CMDLINE}'.split())}" > "${WORKDIR}/cmdline.txt" + echo "${@' '.join(d.getVar('CMDLINE').split())}" > "${WORKDIR}/cmdline.txt" } do_deploy() { @@ -49,3 +72,5 @@ do_deploy() { addtask deploy before do_build after do_install do_deploy[dirs] += "${DEPLOYDIR}/${BOOTFILES_DIR_NAME}" + +PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bb b/bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bb index 1e48ca3a438e2505d921e37c889ad990b4fbf7be..d9d8bb05acd24d0072b0c148cafa59664f44bc81 100644 --- a/bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bb +++ b/bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bb @@ -30,6 +30,12 @@ GPIO_IR_TX ?= "17" CAN_OSCILLATOR ?= "16000000" +ENABLE_UART ??= "" + +WM8960="${@bb.utils.contains("MACHINE_FEATURES", "wm8960", "1", "0", d)}" + +GPIO_SHUTDOWN_PIN ??= "" + inherit deploy nopackages do_deploy() { @@ -103,6 +109,9 @@ do_deploy() { if [ -n "${HDMI_MODE}" ]; then sed -i '/#hdmi_mode=/ c\hdmi_mode=${HDMI_MODE}' $CONFIG fi + if [ -n "${HDMI_CVT}" ]; then + echo 'hdmi_cvt=${HDMI_CVT}' >> $CONFIG + fi if [ -n "${CONFIG_HDMI_BOOST}" ]; then sed -i '/#config_hdmi_boost=/ c\config_hdmi_boost=${CONFIG_HDMI_BOOST}' $CONFIG fi @@ -169,9 +178,11 @@ do_deploy() { fi # UART support - if [ "${ENABLE_UART}" = "1" ]; then + if [ "${ENABLE_UART}" = "1" ] || [ "${ENABLE_UART}" = "0" ] ; then echo "# Enable UART" >>$CONFIG - echo "enable_uart=1" >>$CONFIG + echo "enable_uart=${ENABLE_UART}" >>$CONFIG + elif [ -n "${ENABLE_UART}" ]; then + bbfatal "Invalid value for ENABLE_UART [${ENABLE_UART}]. The value for ENABLE_UART can be 0 or 1." fi # Infrared support @@ -210,7 +221,7 @@ do_deploy() { fi # DWC2 USB peripheral support - if [ "${ENABLE_DWC2_PERIPHERAL}" = "1" ]; then + if ([ "${ENABLE_DWC2_PERIPHERAL}" = "1" ] && [ "${ENABLE_DWC2_OTG}" != "1" ]); then echo "# Enable USB peripheral mode" >> $CONFIG echo "dtoverlay=dwc2,dr_mode=peripheral" >> $CONFIG fi @@ -220,6 +231,12 @@ do_deploy() { echo "# Enable USB host mode" >> $CONFIG echo "dtoverlay=dwc2,dr_mode=host" >> $CONFIG fi + + # DWC2 USB OTG support + if ([ "${ENABLE_DWC2_OTG}" = "1" ] && [ "${ENABLE_DWC2_PERIPHERAL}" != "1" ]); then + echo "# Enable USB OTG mode" >> $CONFIG + echo "dtoverlay=dwc2,dr_mode=otg" >> $CONFIG + fi # AT86RF23X support if [ "${ENABLE_AT86RF}" = "1" ]; then @@ -238,6 +255,22 @@ do_deploy() { echo "dtoverlay=mcp2515-can0,oscillator=${CAN_OSCILLATOR},interrupt=25" >>$CONFIG fi + + if [ "${ENABLE_GPIO_SHUTDOWN}" = "1" ]; then + if ([ "${ENABLE_I2C}" = "1" ] || [ "${PITFT}" = "1" ]) && [ -z "${GPIO_SHUTDOWN_PIN}" ]; then + # By default GPIO shutdown uses the same pin as the (master) I2C SCL. + # If I2C is configured and an alternative pin is not configured for + # gpio-shutdown, there is a configuration conflict. + bbfatal "I2C and gpio-shutdown are both enabled and using the same pins!" + fi + echo "# Enable gpio-shutdown" >> $CONFIG + if [ -z "${GPIO_SHUTDOWN_PIN}" ]; then + echo "dtoverlay=gpio-shutdown" >> $CONFIG + else + echo "dtoverlay=gpio-shutdown,gpio_pin=${GPIO_SHUTDOWN_PIN}" >> $CONFIG + fi + fi + # Append extra config if the user has provided any printf "${RPI_EXTRA_CONFIG}\n" >> $CONFIG @@ -251,9 +284,15 @@ do_deploy() { ;; esac fi + + # WM8960 support + if [ "${WM8960}" = "1" ]; then + echo "# Enable WM8960" >> $CONFIG + echo "dtoverlay=wm8960-soundcard" >> $CONFIG + fi } -do_deploy_append_raspberrypi3-64() { +do_deploy:append:raspberrypi3-64() { echo "# have a properly sized image" >> $CONFIG echo "disable_overscan=1" >> $CONFIG @@ -261,6 +300,12 @@ do_deploy_append_raspberrypi3-64() { echo "dtparam=audio=on" >> $CONFIG } +do_deploy:append() { + if grep -q -E '^.{80}.$' ${DEPLOYDIR}/${BOOTFILES_DIR_NAME}/config.txt; then + bbwarn "config.txt contains lines longer than 80 characters, this is not supported" + fi +} + addtask deploy before do_build after do_install do_deploy[dirs] += "${DEPLOYDIR}/${BOOTFILES_DIR_NAME}" diff --git a/bsp/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc b/bsp/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc index 6358fba4f52a2c182c3badf40325f0ec6f04c867..a7404400e3dd2c49671552f801aad6fdea998935 100644 --- a/bsp/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc +++ b/bsp/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc @@ -1,9 +1,9 @@ -RPIFW_DATE ?= "20210421" -SRCREV ?= "2ac4de4eaac5c1d1b25acec4a5e0a9fdb16f0c91" -RPIFW_SRC_URI ?= "https://github.com/raspberrypi/firmware/archive/${SRCREV}.tar.gz;downloadfilename=raspberrypi-firmware-${SRCREV}.tar.gz" -RPIFW_S ?= "${WORKDIR}/firmware-${SRCREV}" +RPIFW_DATE ?= "20220830" + +RPIFW_SRC_URI ?= "https://archive.raspberrypi.com/debian/pool/main/r/raspberrypi-firmware/raspberrypi-firmware_1.${RPIFW_DATE}.orig.tar.xz" +RPIFW_S ?= "${WORKDIR}/raspberrypi-firmware-1.${RPIFW_DATE}" SRC_URI = "${RPIFW_SRC_URI}" -SRC_URI[sha256sum] = "c687aa1b5127a8dc0773e8aefb1f009f24bf71ccb4c9e8b40a1d46cbbb7bee0c" +SRC_URI[sha256sum] = "2b27e4b3c4d2664a0a1d0dd8602bd80ea41dd006eb0ad9c67d7b659c9c8bb4e5" PV = "${RPIFW_DATE}" diff --git a/bsp/meta-raspberrypi/recipes-bsp/common/raspberrypi-tools.inc b/bsp/meta-raspberrypi/recipes-bsp/common/raspberrypi-tools.inc index 7879c0af5f73aa0a4eea6c2dd1be12a8ea37fc53..dc372abee3db4446467047d042a6f2a43d6ac045 100644 --- a/bsp/meta-raspberrypi/recipes-bsp/common/raspberrypi-tools.inc +++ b/bsp/meta-raspberrypi/recipes-bsp/common/raspberrypi-tools.inc @@ -1,9 +1,11 @@ -RPITOOLS_DATE ?= "20201008" -SRCREV ?= "fc0e73c13865450e95edd046200e42a6e52d8256" -RPITOOLS_SRC_URI ?= "https://github.com/raspberrypi/tools/archive/${SRCREV}.tar.gz;downloadfilename=raspberrypi-tools-${SRCREV}.tar.gz" -RPITOOLS_S ?= "${WORKDIR}/tools-${SRCREV}" +RPITOOLS_DATE ?= "20211101" +SRCREV ?= "13474ee775d0c5ec8a7da4fb0a9fa84187abfc87" +RPITOOLS_SRC_URI ?= "git://github.com/raspberrypi/tools;protocol=https;branch=master" +RPITOOLS_S ?= "${WORKDIR}/git" SRC_URI = "${RPITOOLS_SRC_URI}" -SRC_URI[sha256sum] = "05217b942150830225e8ee04a8f16b8ecc2ffbbe5dd815541b15333f783e805e" PV = "${RPITOOLS_DATE}" + +BB_GIT_SHALLOW = "1" + diff --git a/bsp/meta-raspberrypi/recipes-bsp/formfactor/formfactor_%.bbappend b/bsp/meta-raspberrypi/recipes-bsp/formfactor/formfactor_%.bbappend index 72d991c7e590bcac43dd2ab6da2de898cd36f829..4fc41d0580112b0fc8c8d4d7cdd4dc49e4de49ea 100644 --- a/bsp/meta-raspberrypi/recipes-bsp/formfactor/formfactor_%.bbappend +++ b/bsp/meta-raspberrypi/recipes-bsp/formfactor/formfactor_%.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" diff --git a/bsp/meta-raspberrypi/recipes-bsp/gpio-shutdown/files/bind_gpio_shutdown.tab b/bsp/meta-raspberrypi/recipes-bsp/gpio-shutdown/files/bind_gpio_shutdown.tab new file mode 100644 index 0000000000000000000000000000000000000000..00cc4857d87da37420d9f73782516def17715634 --- /dev/null +++ b/bsp/meta-raspberrypi/recipes-bsp/gpio-shutdown/files/bind_gpio_shutdown.tab @@ -0,0 +1,2 @@ +# Action on special keypress (Key Power) +kb::kbrequest:/sbin/shutdown -t1 -a -h -P now diff --git a/bsp/meta-raspberrypi/recipes-bsp/gpio-shutdown/files/gpio-shutdown-keymap.sh b/bsp/meta-raspberrypi/recipes-bsp/gpio-shutdown/files/gpio-shutdown-keymap.sh new file mode 100644 index 0000000000000000000000000000000000000000..bae50daf14cdb3c95e486ef5e6a25f01e0c44ee1 --- /dev/null +++ b/bsp/meta-raspberrypi/recipes-bsp/gpio-shutdown/files/gpio-shutdown-keymap.sh @@ -0,0 +1,13 @@ +#!/bin/sh +## +# Bind the gpio-shutdown keycode as Keyboard signal and load it to the +# keymap during startup. +## +case "$1" in + start) + # Inject the gpio keycode to keymap + echo "keycode 116 = KeyboardSignal" | loadkeys + ;; + *) + ;; +esac diff --git a/bsp/meta-raspberrypi/recipes-bsp/gpio-shutdown/gpio-shutdown.bb b/bsp/meta-raspberrypi/recipes-bsp/gpio-shutdown/gpio-shutdown.bb new file mode 100644 index 0000000000000000000000000000000000000000..d6908400bdf6e6de56d0e6905219b361663293f0 --- /dev/null +++ b/bsp/meta-raspberrypi/recipes-bsp/gpio-shutdown/gpio-shutdown.bb @@ -0,0 +1,31 @@ +SUMMARY = "GPIO shutdown bindings for SysV init" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" + +SRC_URI = "file://bind_gpio_shutdown.tab \ + file://gpio-shutdown-keymap.sh \ +" + +inherit update-rc.d + +INITSCRIPT_NAME = "gpio-shutdown-keymap.sh" +# Run only once during startup +INITSCRIPT_PARAMS = "start 99 S ." + +do_install() { + # The files are only needed if using SysV init. + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${sysconfdir} \ + ${D}${sysconfdir}/inittab.d \ + ${D}${sysconfdir}/init.d + + install -m 0755 ${WORKDIR}/gpio-shutdown-keymap.sh ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/bind_gpio_shutdown.tab ${D}${sysconfdir}/inittab.d/ + elif ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + # Systemd init does not require any configuration. + # Note: cannot have an empty branch, hence the redundant dir install. + install -d ${D}${sysconfdir} + else + bbwarn "Not using sysvinit or systemd. The gpio-shutdown may require additional configuration." + fi +} diff --git a/bsp/meta-raspberrypi/recipes-bsp/u-boot/files/0001-dm-core-Move-ofdata_to_platdata-call-earlier.patch b/bsp/meta-raspberrypi/recipes-bsp/u-boot/files/0001-dm-core-Move-ofdata_to_platdata-call-earlier.patch deleted file mode 100644 index 996ad10740ffe21ba0890b5117a56246c45ea4fb..0000000000000000000000000000000000000000 --- a/bsp/meta-raspberrypi/recipes-bsp/u-boot/files/0001-dm-core-Move-ofdata_to_platdata-call-earlier.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 336d86ebd146905cf4384912f4f27699b6e37c72 Mon Sep 17 00:00:00 2001 -From: Simon Glass -Date: Sun, 29 Dec 2019 21:19:17 -0700 -Subject: [PATCH] dm: core: Move ofdata_to_platdata() call earlier - -This method is supposed to extract platform data from the device tree. It -should be done before the device itself is probed. Move it earlier in the -device_probe() function. - -Upstream-Status: Backport - -Signed-off-by: Simon Glass ---- - drivers/core/device.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/drivers/core/device.c b/drivers/core/device.c -index 4e03708..291ff4c 100644 ---- a/drivers/core/device.c -+++ b/drivers/core/device.c -@@ -375,6 +375,13 @@ int device_probe(struct udevice *dev) - return 0; - } - -+ if (drv->ofdata_to_platdata && -+ (CONFIG_IS_ENABLED(OF_PLATDATA) || dev_has_of_node(dev))) { -+ ret = drv->ofdata_to_platdata(dev); -+ if (ret) -+ goto fail; -+ } -+ - seq = uclass_resolve_seq(dev); - if (seq < 0) { - ret = seq; -@@ -411,13 +418,6 @@ int device_probe(struct udevice *dev) - goto fail; - } - -- if (drv->ofdata_to_platdata && -- (CONFIG_IS_ENABLED(OF_PLATDATA) || dev_has_of_node(dev))) { -- ret = drv->ofdata_to_platdata(dev); -- if (ret) -- goto fail; -- } -- - /* Only handle devices that have a valid ofnode */ - if (dev_of_valid(dev)) { - /* --- -2.7.4 - diff --git a/bsp/meta-raspberrypi/recipes-bsp/u-boot/files/0001-rpi-always-set-fdt_addr-with-firmware-provided-FDT-address.patch b/bsp/meta-raspberrypi/recipes-bsp/u-boot/files/0001-rpi-always-set-fdt_addr-with-firmware-provided-FDT-address.patch new file mode 100644 index 0000000000000000000000000000000000000000..c375c406c9f52ba06a90b6142b82db61a7c89f4c --- /dev/null +++ b/bsp/meta-raspberrypi/recipes-bsp/u-boot/files/0001-rpi-always-set-fdt_addr-with-firmware-provided-FDT-address.patch @@ -0,0 +1,50 @@ +From: Mauro Salvini +To: u-boot@lists.denx.de +Subject: [PATCH] rpi: always set fdt_addr with firmware-provided FDT address +Date: Wed, 12 May 2021 14:39:45 +0200 [thread overview] +Message-ID: <20210512123945.25649-1-m.salvini@koansoftware.com> (raw) + +Raspberry firmware prepares the FDT blob in memory at an address +that depends on both the memory size and the blob size [1]. +After commit ade243a211d6 ("rpi: passthrough of the firmware provided FDT +blob") this FDT is passed to kernel through fdt_addr environment variable, +handled in set_fdt_addr() function in board file. + +When u-boot environment is persistently saved, if a change happens +in loaded FDT (e.g. for a new overlay applied), firmware produces a FDT +address different from the saved one, but u-boot still use the saved +one because set_fdt_addr() function does not overwrite the fdt_addr +variable. So, for example, if there is a script that uses fdt commands for +e.g. manipulate the bootargs, boot hangs with error + +libfdt fdt_check_header(): FDT_ERR_BADMAGIC + +Removing the fdt_addr variable in saved environment allows to boot. + +With this patch set_fdt_addr() function always overwrite fdt_addr value. + +[1] https://www.raspberrypi.org/forums//viewtopic.php?f=107&t=134018 + +Signed-off-by: Mauro Salvini +Cc: C?dric Schieli +Cc: Matthias Brugger +--- + board/raspberrypi/rpi/rpi.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c +index df52a4689f..611013471e 100644 +--- a/board/raspberrypi/rpi/rpi.c ++++ b/board/raspberrypi/rpi/rpi.c +@@ -318,9 +318,6 @@ static void set_fdtfile(void) + */ + static void set_fdt_addr(void) + { +- if (env_get("fdt_addr")) +- return; +- + if (fdt_magic(fw_dtb_pointer) != FDT_MAGIC) + return; + +-- +2.17.1 \ No newline at end of file diff --git a/bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend b/bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend index cdfe5bb8ba80b9fbb6634880686565d6c10e9700..e50acf5fb35890e24c7c021e73bc0567b4cdf5fc 100644 --- a/bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/bsp/meta-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend @@ -1,15 +1,14 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -SRC_URI_append_rpi = " \ +SRC_URI:append:rpi = " \ file://fw_env.config \ " -# special fix for raspberrypi-cm3 -SRC_URI_append_raspberrypi-cm3 = " file://0001-dm-core-Move-ofdata_to_platdata-call-earlier.patch" +SRC_URI:append:rpi = " file://0001-rpi-always-set-fdt_addr-with-firmware-provided-FDT-address.patch" -DEPENDS_append_rpi = " u-boot-default-script" +DEPENDS:append:rpi = " u-boot-default-script" -do_install_append_rpi () { +do_install:append:rpi () { install -d ${D}${sysconfdir} install -m 0644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config } diff --git a/bsp/meta-raspberrypi/recipes-connectivity/bluez5/bluez5_%.bbappend b/bsp/meta-raspberrypi/recipes-connectivity/bluez5/bluez5_%.bbappend index d1a07a46128d8fc2ae44f6643cba0ca780e4929f..09d410350b08c4906297720ab65078a47d028512 100644 --- a/bsp/meta-raspberrypi/recipes-connectivity/bluez5/bluez5_%.bbappend +++ b/bsp/meta-raspberrypi/recipes-connectivity/bluez5/bluez5_%.bbappend @@ -1,10 +1,10 @@ -FILESEXTRAPATHS_prepend_rpi := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:rpi := "${THISDIR}/${PN}:" -SRC_URI_append_rpi = "\ +SRC_URI:append:rpi = "\ file://0001-bcm43xx-Add-bcm43xx-3wire-variant.patch \ file://0002-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch \ file://0003-Increase-firmware-load-timeout-to-30s.patch \ file://0004-Move-the-43xx-firmware-into-lib-firmware.patch \ " -RDEPENDS_${PN}_append_rpi = " pi-bluetooth" +RDEPENDS:${PN}:append:rpi = " pi-bluetooth" diff --git a/bsp/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth/0001-bthelper-correct-path-for-hciconfig-under-Yocto.patch b/bsp/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth/0001-bthelper-correct-path-for-hciconfig-under-Yocto.patch index 45b43c725e915811f41064d0a3e7aa55516038b6..079377e0e97d09456294938ac75bc2a6be48b412 100644 --- a/bsp/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth/0001-bthelper-correct-path-for-hciconfig-under-Yocto.patch +++ b/bsp/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth/0001-bthelper-correct-path-for-hciconfig-under-Yocto.patch @@ -8,20 +8,33 @@ Signed-off-by: Peter A. Bigot Signed-off-by: Andrei Gherzan --- - usr/bin/bthelper | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + usr/bin/bthelper | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr/bin/bthelper b/usr/bin/bthelper -index af597e5..5de84f6 100755 +index 2133fbc..1fc9245 100755 --- a/usr/bin/bthelper +++ b/usr/bin/bthelper -@@ -10,7 +10,7 @@ fi +@@ -12,8 +12,8 @@ fi + dev=$1 - dev="$1" # Need to bring hci up before looking at MAC as it can be all zeros during init --/bin/hciconfig "$dev" up --/bin/hciconfig "$dev" | grep -qE "BD Address: (B8:27:EB|DC:A6:32):" || exit 0 -+/usr/bin/hciconfig "$dev" up -+/usr/bin/hciconfig "$dev" | grep -qE "BD Address: (B8:27:EB|DC:A6:32):" || exit 0 - /usr/bin/hcitool -i "$dev" cmd 0x3f 0x1c 0x01 0x02 0x00 0x01 0x01 > /dev/null +-/bin/hciconfig $dev up +-if ! /bin/hciconfig $dev | grep -q "Bus: UART"; then ++/usr/bin/hciconfig $dev up ++if ! /usr/bin/hciconfig $dev | grep -q "Bus: UART"; then + echo Not a UART-attached BT Modem + exit 0 + fi +@@ -26,7 +26,7 @@ if ( /usr/bin/hcitool -i $dev dev | grep -q -E '\s43:4[35]:' ); then + BDADDR=`printf '0x%02x 0x%02x 0x%02x 0xeb 0x27 0xb8' $((0x$B3 ^ 0xaa)) $((0x$B2 ^ 0xaa)) $((0x$B1 ^ 0xaa))` + /usr/bin/hcitool -i $dev cmd 0x3f 0x001 $BDADDR +- /bin/hciconfig $dev reset ++ /usr/bin/hciconfig $dev reset + else + echo Raspberry Pi BDADDR already set + fi +-- +2.31.1 + diff --git a/bsp/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_0.1.12.bb b/bsp/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_0.1.17.bb similarity index 68% rename from bsp/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_0.1.12.bb rename to bsp/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_0.1.17.bb index 6ad81c4c7efd68f4a1283676f3990420e9ceb0bf..1c3daffcb3e0a82d20d0da1fabf2ec0163db99a0 100644 --- a/bsp/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_0.1.12.bb +++ b/bsp/meta-raspberrypi/recipes-connectivity/pi-bluetooth/pi-bluetooth_0.1.17.bb @@ -10,16 +10,18 @@ SRC_URI = "\ git://github.com/RPi-Distro/pi-bluetooth;branch=master;protocol=https \ file://0001-bthelper-correct-path-for-hciconfig-under-Yocto.patch \ " -SRCREV = "cbdbcb66bcc5b9af05f1a9fffe2254c872bb0ace" +SRCREV = "fd4775bf90e037551532fc214a958074830bb80d" S = "${WORKDIR}/git" +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'update-rc.d', d)} # hciuart.service replaces what was brcm43438.service -inherit systemd -SYSTEMD_SERVICE_${PN} = "\ +SYSTEMD_SERVICE:${PN} = "\ hciuart.service \ bthelper@.service \ " +INITSCRIPT_NAME = "btuart" +INITSCRIPT_PARAMS = "start 18 2 3 4 5 ." do_install() { install -d ${D}${sysconfdir}/udev/rules.d @@ -33,15 +35,23 @@ do_install() { install -d ${D}${systemd_system_unitdir} install -m 0644 ${S}/debian/pi-bluetooth.bthelper@.service ${D}${systemd_system_unitdir}/bthelper@.service install -m 0644 ${S}/debian/pi-bluetooth.hciuart.service ${D}${systemd_system_unitdir}/hciuart.service + else + install -d ${D}${sysconfdir}/init.d/ + cat > ${WORKDIR}/btuart.init << EOF +#!/bin/sh +/usr/bin/btuart +EOF + install -m 0755 ${WORKDIR}/btuart.init ${D}${sysconfdir}/init.d/btuart + sed -i -e 's:TAG+="systemd".*$:RUN+="/usr/bin/bthelper %k":' ${D}${sysconfdir}/udev/rules.d/90-pi-bluetooth.rules fi } -FILES_${PN} = "\ +FILES:${PN} = "\ ${bindir} \ ${sysconfdir} \ ${systemd_unitdir}/system \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ udev-rules-rpi \ " diff --git a/bsp/meta-raspberrypi/recipes-core/images/rpi-basic-image.bb b/bsp/meta-raspberrypi/recipes-core/images/rpi-basic-image.bb deleted file mode 100644 index 77a3d7b2b4d52652947585d7c94c5e47270382a4..0000000000000000000000000000000000000000 --- a/bsp/meta-raspberrypi/recipes-core/images/rpi-basic-image.bb +++ /dev/null @@ -1,15 +0,0 @@ -# Base this image on core-image-minimal -include recipes-core/images/core-image-minimal.bb - -# Include modules in rootfs -IMAGE_INSTALL += " \ - kernel-modules \ - " - -SPLASH = "psplash-raspberrypi" - -IMAGE_FEATURES += "ssh-server-dropbear splash" - -do_image_prepend() { - bb.warn("The image 'rpi-basic-image' is deprecated, please use 'core-image-base' instead") -} diff --git a/bsp/meta-raspberrypi/recipes-core/images/rpi-hwup-image.bb b/bsp/meta-raspberrypi/recipes-core/images/rpi-hwup-image.bb deleted file mode 100644 index 86e9b6daf78e34b3dcf112adb168e45305a2cc7a..0000000000000000000000000000000000000000 --- a/bsp/meta-raspberrypi/recipes-core/images/rpi-hwup-image.bb +++ /dev/null @@ -1,11 +0,0 @@ -# Base this image on core-image-minimal -include recipes-core/images/core-image-minimal.bb - -# Include modules in rootfs -IMAGE_INSTALL += " \ - kernel-modules \ - " - -do_image_prepend() { - bb.warn("The image 'rpi-hwup-image' is deprecated, please use 'core-image-base' instead") -} diff --git a/bsp/meta-raspberrypi/recipes-core/images/rpi-test-image.bb b/bsp/meta-raspberrypi/recipes-core/images/rpi-test-image.bb index c2f5f73209504260c347e9de993f071215ee76a5..360b20dc757986c95b53ca1d98569d641a59c070 100644 --- a/bsp/meta-raspberrypi/recipes-core/images/rpi-test-image.bb +++ b/bsp/meta-raspberrypi/recipes-core/images/rpi-test-image.bb @@ -3,4 +3,4 @@ include recipes-core/images/core-image-base.bb COMPATIBLE_MACHINE = "^rpi$" -IMAGE_INSTALL_append = " packagegroup-rpi-test" +IMAGE_INSTALL:append = " packagegroup-rpi-test" diff --git a/bsp/meta-raspberrypi/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend b/bsp/meta-raspberrypi/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend index 500d871e4bb3757c7a4c1e95cf2f918bff455395..1cc1dfc45f45a5fac986c716c0112fc58aa25114 100644 --- a/bsp/meta-raspberrypi/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend +++ b/bsp/meta-raspberrypi/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend @@ -1,2 +1,2 @@ # mesa-demos needs gles1 and userland driver does not have it, works ok with vc4 graphics driver -X11GLTOOLS_remove_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'mesa-demos', d)}" +X11GLTOOLS:remove:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'mesa-demos', d)}" diff --git a/bsp/meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb b/bsp/meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb index a3f4ac9ae93466509689078c57669babccf88f36..ff8f8a4d62a975b324598bb87d82cb3fef7de612 100644 --- a/bsp/meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb +++ b/bsp/meta-raspberrypi/recipes-core/packagegroups/packagegroup-rpi-test.bb @@ -10,12 +10,16 @@ COMPATIBLE_MACHINE = "^rpi$" OMXPLAYER = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'omxplayer', d)}" -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ ${OMXPLAYER} \ bcm2835-tests \ + raspi-gpio \ rpio \ rpi-gpio \ pi-blaster \ + python3-adafruit-circuitpython-register \ + python3-adafruit-platformdetect \ + python3-adafruit-pureio \ python3-rtimu \ connman \ connman-client \ @@ -23,7 +27,7 @@ RDEPENDS_${PN} = "\ bluez5 \ " -RRECOMMENDS_${PN} = "\ +RRECOMMENDS:${PN} = "\ ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-multimedia", "bigbuckbunny-1080p bigbuckbunny-480p bigbuckbunny-720p", "", d)} \ ${MACHINE_EXTRA_RRECOMMENDS} \ " diff --git a/bsp/meta-raspberrypi/recipes-core/psplash/psplash_%.bbappend b/bsp/meta-raspberrypi/recipes-core/psplash/psplash_%.bbappend index 41622aa50690a18c3aab7d7015c7aec740bcc3c1..bf99b2bff75ee11136e0101be4b5a150e3e1fe0d 100644 --- a/bsp/meta-raspberrypi/recipes-core/psplash/psplash_%.bbappend +++ b/bsp/meta-raspberrypi/recipes-core/psplash/psplash_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SPLASH_IMAGES_rpi = "file://psplash-raspberrypi-img.h;outsuffix=raspberrypi" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +SPLASH_IMAGES:rpi = "file://psplash-raspberrypi-img.h;outsuffix=raspberrypi" diff --git a/bsp/meta-raspberrypi/recipes-core/udev/udev-rules-rpi.bb b/bsp/meta-raspberrypi/recipes-core/udev/udev-rules-rpi.bb index 42cfcdd4d5a07565608bbd53fa79aa0fc5eec66d..3ae43856fed756ed02a1f96917f6eab59594f663 100644 --- a/bsp/meta-raspberrypi/recipes-core/udev/udev-rules-rpi.bb +++ b/bsp/meta-raspberrypi/recipes-core/udev/udev-rules-rpi.bb @@ -3,16 +3,17 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" SRC_URI = " \ - file://99-com.rules \ + git://github.com/RPi-Distro/raspberrypi-sys-mods;protocol=https;branch=master \ file://can.rules \ " +SRCREV = "5ce3ef2b7f377c23fea440ca9df0e30f3f8447cf" -S = "${WORKDIR}" +S = "${WORKDIR}/git" INHIBIT_DEFAULT_DEPS = "1" do_install () { install -d ${D}${sysconfdir}/udev/rules.d - install -m 0644 ${WORKDIR}/99-com.rules ${D}${sysconfdir}/udev/rules.d/ + install -m 0644 ${S}/etc.armhf/udev/rules.d/99-com.rules ${D}${sysconfdir}/udev/rules.d/ install -m 0644 ${WORKDIR}/can.rules ${D}${sysconfdir}/udev/rules.d/ } diff --git a/bsp/meta-raspberrypi/recipes-core/udev/udev-rules-rpi/99-com.rules b/bsp/meta-raspberrypi/recipes-core/udev/udev-rules-rpi/99-com.rules deleted file mode 100644 index ddd1e1743e57b2d8e3cd1ee31490d404aa643206..0000000000000000000000000000000000000000 --- a/bsp/meta-raspberrypi/recipes-core/udev/udev-rules-rpi/99-com.rules +++ /dev/null @@ -1,21 +0,0 @@ -KERNEL=="ttyAMA[01]", PROGRAM="/bin/sh -c '\ - ALIASES=/proc/device-tree/aliases; \ - if cmp -s $$ALIASES/uart0 $$ALIASES/serial0; then \ - echo 0;\ - elif cmp -s $$ALIASES/uart0 $$ALIASES/serial1; then \ - echo 1; \ - else \ - exit 1; \ - fi\ -'", SYMLINK+="serial%c" - -KERNEL=="ttyS0", PROGRAM="/bin/sh -c '\ - ALIASES=/proc/device-tree/aliases; \ - if cmp -s $$ALIASES/uart1 $$ALIASES/serial0; then \ - echo 0; \ - elif cmp -s $$ALIASES/uart1 $$ALIASES/serial1; then \ - echo 1; \ - else \ - exit 1; \ - fi \ -'", SYMLINK+="serial%c" diff --git a/bsp/meta-raspberrypi/recipes-core/udev/udev-rules-udisks-rpi_1.0.bb b/bsp/meta-raspberrypi/recipes-core/udev/udev-rules-udisks-rpi_1.0.bb index ae35521d4399c12c30b7cf3016ca5973f8cbf8e4..d5d4589d6416f6bbfdb9e3aaea4b0b7bf213ee3b 100644 --- a/bsp/meta-raspberrypi/recipes-core/udev/udev-rules-udisks-rpi_1.0.bb +++ b/bsp/meta-raspberrypi/recipes-core/udev/udev-rules-udisks-rpi_1.0.bb @@ -10,4 +10,4 @@ do_install () { install -m 644 ${WORKDIR}/80-udisks-rpi.rules ${D}${base_libdir}/udev/rules.d } -FILES_${PN} = "${base_libdir}/udev/rules.d" +FILES:${PN} = "${base_libdir}/udev/rules.d" diff --git a/bsp/meta-raspberrypi/recipes-devtools/bcm2835/bcm2835_1.52.bb b/bsp/meta-raspberrypi/recipes-devtools/bcm2835/bcm2835_1.71.bb similarity index 34% rename from bsp/meta-raspberrypi/recipes-devtools/bcm2835/bcm2835_1.52.bb rename to bsp/meta-raspberrypi/recipes-devtools/bcm2835/bcm2835_1.71.bb index eef6afd1c31777e279d2cda12101dd391fe1af59..51712054279aacb8f600950971dffbba1d283a13 100644 --- a/bsp/meta-raspberrypi/recipes-devtools/bcm2835/bcm2835_1.52.bb +++ b/bsp/meta-raspberrypi/recipes-devtools/bcm2835/bcm2835_1.71.bb @@ -5,38 +5,46 @@ SECTION = "base" HOMEPAGE = "http://www.open.com.au/mikem/bcm2835" AUTHOR = "Mike McCauley (mikem@open.com.au)" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=e49f4652534af377a713df3d9dec60cb" COMPATIBLE_MACHINE = "^rpi$" SRC_URI = "http://www.airspayce.com/mikem/bcm2835/bcm2835-${PV}.tar.gz" -SRC_URI[md5sum] = "b5dc426b4ff258bb1397442f98e40236" -SRC_URI[sha256sum] = "b9fd10f7a80aadaed28a77168709b7c519568a63b6e98d0a50e9c5fe31bea6bb" +SRC_URI[md5sum] = "9bd2d39bf4b3a9e81dce799ca51c826a" +SRC_URI[sha256sum] = "564920d205977d7e2846e434947708455d468d3a952feca9faef643abd03a227" inherit autotools -do_compile_append() { +do_compile:append() { # Now compiling the examples provided by the package - mkdir -p ${B}/examples + mkdir -p ${B}/examples/spiram for file in `ls ${S}/examples`; do - ${CC} ${LDFLAGS} ${S}/examples/${file}/${file}.c -o ${B}/examples/${file} -Bstatic -L${B}/src -lbcm2835 -I${S}/src + example="$file" + if [ "$file" = "spiram" ]; then + # This includes a tiny library + EXAMPLE_LDFLAGS="-L${B}/examples/spiram -lspiram" + example="spiram_test" + ${CC} ${CFLAGS} -c ${S}/examples/spiram/spiram.c -o ${B}/examples/spiram/libspiram.o -I${S}/src -I${S}/examples/spiram + rm -f ${B}/examples/spiram/libspiram.a && ${BUILD_AR} crD ${B}/examples/spiram/libspiram.a ${B}/examples/spiram/libspiram.o + fi + ${CC} ${LDFLAGS} ${S}/examples/${file}/${example}.c -o ${B}/examples/${example} -Bstatic -L${B}/src -lbcm2835 ${EXAMPLE_LDFLAGS} -I${S}/src done } -do_install_append() { +do_install:append() { install -d ${D}/${libdir}/${BPN} - for file in ${B}/examples/* + for example in $(find ${B}/examples -type f -maxdepth 1) do - install -m 0755 ${file} ${D}/${libdir}/${BPN} + install -m 0755 ${example} ${D}/${libdir}/${BPN} done } PACKAGES += "${PN}-tests" -RDEPENDS_${PN}-dev = "" +RDEPENDS:${PN}-dev = "" -FILES_${PN} = "" -FILES_${PN}-tests = "${libdir}/${BPN}" -FILES_${PN}-dbg += "${libdir}/${BPN}/.debug" +FILES:${PN} = "" +FILES:${PN}-tests = "${libdir}/${BPN}" +FILES:${PN}-dbg += "${libdir}/${BPN}/.debug" diff --git a/bsp/meta-raspberrypi/recipes-devtools/pi-blaster/pi-blaster_git.bb b/bsp/meta-raspberrypi/recipes-devtools/pi-blaster/pi-blaster_git.bb index 4b2d1ba20023c095bd3bd8e6632d68f0eb2521d5..d02fa92670fa97942161911892fb72e9c28d3fd1 100644 --- a/bsp/meta-raspberrypi/recipes-devtools/pi-blaster/pi-blaster_git.bb +++ b/bsp/meta-raspberrypi/recipes-devtools/pi-blaster/pi-blaster_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "This project enables PWM on the GPIO pins you request of a Raspbe HOMEPAGE = "https://github.com/sarfata/pi-blaster/" SECTION = "devel/libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://README.md;beginline=268;endline=292;md5=86d10e4bcf4b4014d306dde7c1d2a80d" +LIC_FILES_CHKSUM = "file://README.md;beginline=295;endline=319;md5=86d10e4bcf4b4014d306dde7c1d2a80d" SRC_URI = "git://github.com/sarfata/pi-blaster;branch=master;protocol=https \ file://remove-initscript-lsb-dependency.patch \ @@ -10,13 +10,13 @@ SRC_URI = "git://github.com/sarfata/pi-blaster;branch=master;protocol=https \ S = "${WORKDIR}/git" -SRCREV = "befd8ef36e5066e4d444ef47fe4020787e541248" +SRCREV = "fbba9a7dcef0f352a11f8a2a5f6cbc15b62c0829" inherit update-rc.d autotools INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${PN} = "${PN}.boot.sh" -INITSCRIPT_PARAMS_${PN} = "defaults 15 85" +INITSCRIPT_NAME:${PN} = "${PN}.boot.sh" +INITSCRIPT_PARAMS:${PN} = "defaults 15 85" COMPATIBLE_MACHINE = "^rpi$" diff --git a/bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-register_1.9.4.bb b/bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-register_1.9.8.bb similarity index 84% rename from bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-register_1.9.4.bb rename to bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-register_1.9.8.bb index c1a70aa38c209fc0750b78830a9b026febe76c92..1a609f5ea7f2e12e8417dab0bf60743847ed4611 100644 --- a/bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-register_1.9.4.bb +++ b/bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-register_1.9.8.bb @@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=6ec69d6e9e6c85adfb7799d7f8cf044e" SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_Register.git;branch=main;protocol=https" S = "${WORKDIR}/git" -SRCREV = "5fee6e0c3878110844bc51e16063eeae7d94c457" +SRCREV = "49ab415d6b601c99979262f9e91c21dcb3a927a7" DEPENDS += "python3-setuptools-scm-native" inherit setuptools3 -RDEPENDS_${PN} += "python3-core" +RDEPENDS:${PN} += "python3-core" diff --git a/bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-platformdetect_3.1.1.bb b/bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-platformdetect_3.22.1.bb similarity index 83% rename from bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-platformdetect_3.1.1.bb rename to bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-platformdetect_3.22.1.bb index 5ab08bb402000f16e43153d0160d91ad7a26d8bf..e19b58e2dcd008f0b1e8307ba076833be781c2ba 100644 --- a/bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-platformdetect_3.1.1.bb +++ b/bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-platformdetect_3.22.1.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=fccd531dce4b989c05173925f0bbb76c" SRC_URI = "git://github.com/adafruit/Adafruit_Python_PlatformDetect.git;branch=main;protocol=https" -SRCREV = "e0fe1b012898fa824944d6805ca74be0fa027968" +SRCREV = "7af3af87037cf1e6697471a3a83c56a0f852b959" S = "${WORKDIR}/git" @@ -12,4 +12,4 @@ inherit setuptools3 DEPENDS += "python3-setuptools-scm-native" -RDEPENDS_${PN} += "python3-core" +RDEPENDS:${PN} += "python3-core" diff --git a/bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-pureio_1.1.8.bb b/bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-pureio_1.1.9.bb similarity index 88% rename from bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-pureio_1.1.8.bb rename to bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-pureio_1.1.9.bb index 3201dd26758fea87b47df99dcb9f7f9568303cb5..cdbe4b4b257a07401babf54ea18c77a3cb9adc41 100644 --- a/bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-pureio_1.1.8.bb +++ b/bsp/meta-raspberrypi/recipes-devtools/python/python3-adafruit-pureio_1.1.9.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=2a21fcca821a506d4c36f7bbecc0d009" SRC_URI = "git://github.com/adafruit/Adafruit_Python_PureIO.git;branch=main;protocol=https" -SRCREV = "f4d0973da05b8b21905ff6bab69cdb652128f342" +SRCREV = "383b615ce9ff5bbefdf77652799f380016fda353" S = "${WORKDIR}/git" @@ -12,7 +12,7 @@ inherit setuptools3 DEPENDS += "python3-setuptools-scm-native" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ python3-core \ python3-ctypes \ python3-fcntl \ diff --git a/bsp/meta-raspberrypi/recipes-devtools/python/python3-rtimu/0001-setup.py-Port-to-use-setuptools.patch b/bsp/meta-raspberrypi/recipes-devtools/python/python3-rtimu/0001-setup.py-Port-to-use-setuptools.patch new file mode 100644 index 0000000000000000000000000000000000000000..77eca99876d573305116a1501ef38cc5a79abb6e --- /dev/null +++ b/bsp/meta-raspberrypi/recipes-devtools/python/python3-rtimu/0001-setup.py-Port-to-use-setuptools.patch @@ -0,0 +1,29 @@ +From f5ab30abd37ee884fb3ccaad0a8d21108ca2c812 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 28 Feb 2022 21:37:19 -0800 +Subject: [PATCH] setup.py: Port to use setuptools + +Needed to get it going with wheel, distutils is deprecated for long + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + Linux/python/setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Linux/python/setup.py b/Linux/python/setup.py +index e429e6f..da96843 100644 +--- a/Linux/python/setup.py ++++ b/Linux/python/setup.py +@@ -22,7 +22,7 @@ + #// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + #// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +-from distutils.core import setup, Extension ++from setuptools import setup, Extension + import os.path + + RTIMU_sources = [ +-- +2.35.1 + diff --git a/bsp/meta-raspberrypi/recipes-devtools/python/python3-rtimu_git.bb b/bsp/meta-raspberrypi/recipes-devtools/python/python3-rtimu_7.2.1.bb similarity index 74% rename from bsp/meta-raspberrypi/recipes-devtools/python/python3-rtimu_git.bb rename to bsp/meta-raspberrypi/recipes-devtools/python/python3-rtimu_7.2.1.bb index fb8d0ae7ba077ba19cd9c20354b8955e7484e356..1afbb5f16937e02434ee2351e43fd4d46636f483 100644 --- a/bsp/meta-raspberrypi/recipes-devtools/python/python3-rtimu_git.bb +++ b/bsp/meta-raspberrypi/recipes-devtools/python/python3-rtimu_7.2.1.bb @@ -5,11 +5,11 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://../../LICENSE;md5=96cdecb41125f498958e09b72faf318e" -SRC_URI = "git://github.com/RPi-Distro/RTIMULib.git;branch=master;protocol=https \ +SRC_URI = "git://github.com/RPi-Distro/RTIMULib.git;protocol=http;branch=master;protocol=https \ file://0001-include-asm-ioctl.h-for-ioctl-define.patch;patchdir=../.. \ + file://0001-setup.py-Port-to-use-setuptools.patch;patchdir=../.. \ " SRCREV = "b949681af69b45f0f7f4bb53b6770037b5b02178" S = "${WORKDIR}/git/Linux/python" - inherit setuptools3 diff --git a/bsp/meta-raspberrypi/recipes-devtools/python/rpi-gpio/0001-setup.py-Use-setuptools-instead-of-distutils.patch b/bsp/meta-raspberrypi/recipes-devtools/python/rpi-gpio/0001-setup.py-Use-setuptools-instead-of-distutils.patch new file mode 100644 index 0000000000000000000000000000000000000000..33480b12ce53b66aab9faa99eed48eec95897406 --- /dev/null +++ b/bsp/meta-raspberrypi/recipes-devtools/python/rpi-gpio/0001-setup.py-Use-setuptools-instead-of-distutils.patch @@ -0,0 +1,28 @@ +From df5657d772accb275a12c1b1690befa8d87305c8 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 5 Mar 2022 09:53:41 -0800 +Subject: [PATCH] setup.py: Use setuptools instead of distutils + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 2b600ca..0fa0807 100644 +--- a/setup.py ++++ b/setup.py +@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + """ + +-from distutils.core import setup, Extension ++from setuptools import setup, Extension + + classifiers = ['Development Status :: 5 - Production/Stable', + 'Operating System :: POSIX :: Linux', +-- +2.35.1 + diff --git a/bsp/meta-raspberrypi/recipes-devtools/python/rpi-gpio_0.7.0.bb b/bsp/meta-raspberrypi/recipes-devtools/python/rpi-gpio_0.7.0.bb index 8b13d53a60885c5a64f9584288905d15218b86fe..039d1769e842fa5ac8697c743d9d10f84897d85b 100644 --- a/bsp/meta-raspberrypi/recipes-devtools/python/rpi-gpio_0.7.0.bb +++ b/bsp/meta-raspberrypi/recipes-devtools/python/rpi-gpio_0.7.0.bb @@ -5,10 +5,12 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=9b95630a648966b142f1a0dcea001cb7" PYPI_PACKAGE = "RPi.GPIO" -inherit pypi distutils3 -SRC_URI += "file://0001-Remove-nested-functions.patch" -SRC_URI[md5sum] = "777617f9dea9a1680f9af43db0cf150e" +inherit pypi setuptools3 + +SRC_URI += "file://0001-Remove-nested-functions.patch \ + file://0001-setup.py-Use-setuptools-instead-of-distutils.patch \ + " SRC_URI[sha256sum] = "7424bc6c205466764f30f666c18187a0824077daf20b295c42f08aea2cb87d3f" COMPATIBLE_MACHINE = "^rpi$" diff --git a/bsp/meta-raspberrypi/recipes-devtools/python/rpio/0001-include-sys-types.h-explicitly-for-getting-caddr_t-d.patch b/bsp/meta-raspberrypi/recipes-devtools/python/rpio/0001-include-sys-types.h-explicitly-for-getting-caddr_t-d.patch deleted file mode 100644 index bed97493d333d0ac8225fad080019e7c623a110c..0000000000000000000000000000000000000000 --- a/bsp/meta-raspberrypi/recipes-devtools/python/rpio/0001-include-sys-types.h-explicitly-for-getting-caddr_t-d.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c86bfacc98d58244f532626954ed00d84ecfa82d Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 30 Jan 2016 17:12:37 -0800 -Subject: [PATCH] include sys/types.h explicitly for getting caddr_t definition - -Helps fixing build on musl where sys/types.h is not included indirectly -as happening on glibc - -Signed-off-by: Khem Raj ---- -Upstream-Status: Submitted - - source/c_gpio/c_gpio.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/source/c_gpio/c_gpio.c b/source/c_gpio/c_gpio.c -index 25a04ca..70df632 100644 ---- a/source/c_gpio/c_gpio.c -+++ b/source/c_gpio/c_gpio.c -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #include - #include "c_gpio.h" - --- -2.7.0 - diff --git a/bsp/meta-raspberrypi/recipes-devtools/python/rpio_0.10.0.bb b/bsp/meta-raspberrypi/recipes-devtools/python/rpio_0.10.1.bb similarity index 61% rename from bsp/meta-raspberrypi/recipes-devtools/python/rpio_0.10.0.bb rename to bsp/meta-raspberrypi/recipes-devtools/python/rpio_0.10.1.bb index d5653cb0dbd44745496b61b0d886d5e0fe278323..176646d2bfc8b118b2a0e02b00060f3481f304f3 100644 --- a/bsp/meta-raspberrypi/recipes-devtools/python/rpio_0.10.0.bb +++ b/bsp/meta-raspberrypi/recipes-devtools/python/rpio_0.10.1.bb @@ -2,19 +2,20 @@ DESCRIPTION = "Advanced GPIO for the Raspberry Pi. Extends RPi.GPIO with PWM, \ GPIO interrups, TCP socket interrupts, command line tools and more" HOMEPAGE = "https://github.com/metachris/RPIO" SECTION = "devel/python" -LICENSE = "LGPLv3+" -LIC_FILES_CHKSUM = "file://README.rst;beginline=41;endline=53;md5=d5d95d7486a4d98c999675c23196b25a" +LICENSE = "LGPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=bb3ca60759f3202f1ae42e3519cd06bc" -PYPI_PACKAGE = "RPIO" -inherit pypi - -SRC_URI += "file://0001-include-sys-types.h-explicitly-for-getting-caddr_t-d.patch" +SRC_URI = "\ + git://github.com/metachris/RPIO.git;protocol=https;branch=master \ + " +SRCREV = "be1942a69b2592ddacd9dc833d2668a19aafd8d2" +S = "${WORKDIR}/git" inherit setuptools3 COMPATIBLE_MACHINE = "^rpi$" -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ python3-logging \ python3-threading \ " diff --git a/bsp/meta-raspberrypi/recipes-devtools/raspi-gpio/raspi-gpio_git.bb b/bsp/meta-raspberrypi/recipes-devtools/raspi-gpio/raspi-gpio_git.bb index 02a3f5585b098c0a11da03385b4780ff371aa58d..8ea4be17d7261039fd5f959d1f2547cddf1435d0 100644 --- a/bsp/meta-raspberrypi/recipes-devtools/raspi-gpio/raspi-gpio_git.bb +++ b/bsp/meta-raspberrypi/recipes-devtools/raspi-gpio/raspi-gpio_git.bb @@ -8,7 +8,7 @@ COMPATIBLE_MACHINE = "^rpi$" inherit autotools -SRCREV = "4edfde183ff3ac9ed66cdc015ae25e45f3a5502d" +SRCREV = "22b44e4765b4b78dc5b22394fff484e353d5914d" SRC_URI = "git://github.com/RPi-Distro/raspi-gpio.git;protocol=https;branch=master \ " diff --git a/bsp/meta-raspberrypi/recipes-graphics/cairo/cairo_%.bbappend b/bsp/meta-raspberrypi/recipes-graphics/cairo/cairo_%.bbappend index 7ba13e2099ee594cf1bc1e87a46746e3f7551cc5..5efd8fc5f7a51ba4e102ed653052c3790dd8c89b 100644 --- a/bsp/meta-raspberrypi/recipes-graphics/cairo/cairo_%.bbappend +++ b/bsp/meta-raspberrypi/recipes-graphics/cairo/cairo_%.bbappend @@ -1,3 +1,3 @@ PACKAGECONFIG_GLESV2 = " ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'glesv2', d)}" -PACKAGECONFIG_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' egl ${PACKAGECONFIG_GLESV2}', d)}" +PACKAGECONFIG:append:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' egl ${PACKAGECONFIG_GLESV2}', d)}" diff --git a/bsp/meta-raspberrypi/recipes-graphics/kmscube/kmscube_%.bbappend b/bsp/meta-raspberrypi/recipes-graphics/kmscube/kmscube_%.bbappend index 9343fb00ffc722c0ad70a23e950ba56a8eefebfa..f9c23c94f7f34f928fe28e5b340884c80a16c6f9 100644 --- a/bsp/meta-raspberrypi/recipes-graphics/kmscube/kmscube_%.bbappend +++ b/bsp/meta-raspberrypi/recipes-graphics/kmscube/kmscube_%.bbappend @@ -1,2 +1,2 @@ # userland driver EGL implementation does not have all needed bits for it so remove it from build -COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '(.*)', 'null', d)}" +COMPATIBLE_HOST:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '(.*)', 'null', d)}" diff --git a/bsp/meta-raspberrypi/recipes-graphics/libsdl2/libsdl2_%.bbappend b/bsp/meta-raspberrypi/recipes-graphics/libsdl2/libsdl2_%.bbappend index cb9c24e4d41205285768c30d4e4614ef0b55d9b5..28a66bcb3336dd66be57f9ab0b149165e61c833a 100644 --- a/bsp/meta-raspberrypi/recipes-graphics/libsdl2/libsdl2_%.bbappend +++ b/bsp/meta-raspberrypi/recipes-graphics/libsdl2/libsdl2_%.bbappend @@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" # when using userland graphic KHR/khrplatform.h is provided by userland but virtual/libgl is provided by mesa-gl where # we explicitly delete KHR/khrplatform.h since its already coming from userland package -DEPENDS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'userland', d)}" +DEPENDS:append:rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'userland', d)}" diff --git a/bsp/meta-raspberrypi/recipes-graphics/libva/libva_%.bbappend b/bsp/meta-raspberrypi/recipes-graphics/libva/libva_%.bbappend index 56ff4213aa1829cf607b1d3807cc8ccc45789815..ebfc519f11781f45a8f54411829c98f766efd736 100644 --- a/bsp/meta-raspberrypi/recipes-graphics/libva/libva_%.bbappend +++ b/bsp/meta-raspberrypi/recipes-graphics/libva/libva_%.bbappend @@ -1,3 +1,3 @@ # when using userland graphic KHR/khrplatform.h is provided by userland but virtual/libgl is provided by mesa-gl where # we explicitly delete KHR/khrplatform.h since its already coming from userland package -DEPENDS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'userland', d)}" +DEPENDS:append:rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'userland', d)}" diff --git a/bsp/meta-raspberrypi/recipes-graphics/mesa/libglu_%.bbappend b/bsp/meta-raspberrypi/recipes-graphics/mesa/libglu_%.bbappend index 56ff4213aa1829cf607b1d3807cc8ccc45789815..ebfc519f11781f45a8f54411829c98f766efd736 100644 --- a/bsp/meta-raspberrypi/recipes-graphics/mesa/libglu_%.bbappend +++ b/bsp/meta-raspberrypi/recipes-graphics/mesa/libglu_%.bbappend @@ -1,3 +1,3 @@ # when using userland graphic KHR/khrplatform.h is provided by userland but virtual/libgl is provided by mesa-gl where # we explicitly delete KHR/khrplatform.h since its already coming from userland package -DEPENDS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'userland', d)}" +DEPENDS:append:rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'userland', d)}" diff --git a/bsp/meta-raspberrypi/recipes-graphics/mesa/mesa-demos_%.bbappend b/bsp/meta-raspberrypi/recipes-graphics/mesa/mesa-demos_%.bbappend index c187ab9c103ffd8b8f4b7027c7da90aa156bbb55..abb11ec8fffd75d3515be5ceddaf8353759dfff2 100644 --- a/bsp/meta-raspberrypi/recipes-graphics/mesa/mesa-demos_%.bbappend +++ b/bsp/meta-raspberrypi/recipes-graphics/mesa/mesa-demos_%.bbappend @@ -1,2 +1,2 @@ # mesa-demos need libgles1 and userland driver does not have it -COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '(.*)', 'null', d)}" +COMPATIBLE_HOST:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '(.*)', 'null', d)}" diff --git a/bsp/meta-raspberrypi/recipes-graphics/mesa/mesa-gl_%.bbappend b/bsp/meta-raspberrypi/recipes-graphics/mesa/mesa-gl_%.bbappend index e561a1b02f827e941783ade5a37c9246d1f65b59..edb75f59bc97737c3caeeff96c1f4c4e75b6fa93 100644 --- a/bsp/meta-raspberrypi/recipes-graphics/mesa/mesa-gl_%.bbappend +++ b/bsp/meta-raspberrypi/recipes-graphics/mesa/mesa-gl_%.bbappend @@ -1,8 +1,8 @@ -PACKAGECONFIG_append_rpi = " gbm" -PROVIDES_append_rpi = " virtual/libgbm" +PACKAGECONFIG:append:rpi = " gbm" +PROVIDES:append:rpi = " virtual/libgbm" -GALLIUMDRIVERS_append_rpi = ",swrast" +GALLIUMDRIVERS:append:rpi = ",swrast" -do_install_append_rpi() { +do_install:append:rpi() { rm -rf ${D}${includedir}/KHR/khrplatform.h } diff --git a/bsp/meta-raspberrypi/recipes-graphics/mesa/mesa_%.bbappend b/bsp/meta-raspberrypi/recipes-graphics/mesa/mesa_%.bbappend index eaa46f27b68d083a8d89761951b3a30d43199889..7000ead0f386dd70ebbb86566bdf0e7c4cef19d5 100644 --- a/bsp/meta-raspberrypi/recipes-graphics/mesa/mesa_%.bbappend +++ b/bsp/meta-raspberrypi/recipes-graphics/mesa/mesa_%.bbappend @@ -2,5 +2,5 @@ # With oe-core commit 8509e2e1a87578882b71948ccef3b50ccf1228b3 dri3 is set # as default. To state out clearly that Raspi needs dri3 and to avoid surprises # in case oe-core changes this default, we set dri3 explicitly. -PACKAGECONFIG_append_rpi = " gallium vc4 v3d kmsro ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)}" -DRIDRIVERS_class-target_rpi = "" +PACKAGECONFIG:append:rpi = " gallium vc4 v3d kmsro ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)} ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'vulkan broadcom', '', d)}" +DRIDRIVERS:class-target:rpi = "" diff --git a/bsp/meta-raspberrypi/recipes-graphics/piglit/piglit_%.bbappend b/bsp/meta-raspberrypi/recipes-graphics/piglit/piglit_%.bbappend index 0503fd0c34666a3960e3b3ab10efb30042be98f6..8dfce2727ccaab8789ef9b5937381a4c35fd1a78 100644 --- a/bsp/meta-raspberrypi/recipes-graphics/piglit/piglit_%.bbappend +++ b/bsp/meta-raspberrypi/recipes-graphics/piglit/piglit_%.bbappend @@ -1,5 +1,5 @@ # mesa-demos need libgles1 and userland driver does not have it so remove it from piglit rdeps -RDEPENDS_${PN}_remove_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'mesa-demos', d)}" +RDEPENDS:${PN}:remove:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'mesa-demos', d)}" # it needs EGL >= 11 but userland says it provided version 10, remove it from build # | -- Requested 'egl >= 11.0' but version of EGL is 10 -COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '(.*)', 'null', d)}" +COMPATIBLE_HOST:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '(.*)', 'null', d)}" diff --git a/bsp/meta-raspberrypi/recipes-graphics/raspidmx/raspidmx_git.bb b/bsp/meta-raspberrypi/recipes-graphics/raspidmx/raspidmx_git.bb index 1a1ecfa595a1bc9e6bd9e2b1337fe04adb3e31ed..4729e8c259a5a387ee7f761c565c13318f852d15 100644 --- a/bsp/meta-raspberrypi/recipes-graphics/raspidmx/raspidmx_git.bb +++ b/bsp/meta-raspberrypi/recipes-graphics/raspidmx/raspidmx_git.bb @@ -5,7 +5,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=52962875ab02c36df6cde47b1f463024" COMPATIBLE_HOST = "null" -COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'null', '(.*)', d)}" +COMPATIBLE_HOST:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'null', '(.*)', d)}" SRC_URI = "git://github.com/AndrewFromMelbourne/raspidmx;protocol=https;branch=master \ file://0001-gitignore-add-archives-from-lib-directory.patch \ diff --git a/bsp/meta-raspberrypi/recipes-graphics/userland/files/0001-mmal-Do-not-use-Werror.patch b/bsp/meta-raspberrypi/recipes-graphics/userland/files/0001-mmal-Do-not-use-Werror.patch new file mode 100644 index 0000000000000000000000000000000000000000..ff00d8b749ad7d5ae0312c701d0c22e72dd50fe7 --- /dev/null +++ b/bsp/meta-raspberrypi/recipes-graphics/userland/files/0001-mmal-Do-not-use-Werror.patch @@ -0,0 +1,33 @@ +From 15fbe266af3dcc5b7660397204b06d04364a953a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 2 Apr 2022 21:37:42 -0700 +Subject: [PATCH] mmal: Do not use -Werror + +Clang warns about unused-but-set variables +interface/mmal/vc/mmal_vc_api.c:395:18: error: variable 'status' set but not used [-We +rror,-Wunused-but-set-variable] +| MMAL_STATUS_T status; +| ^ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + interface/mmal/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/interface/mmal/CMakeLists.txt b/interface/mmal/CMakeLists.txt +index 46f149d..c5c1642 100644 +--- a/interface/mmal/CMakeLists.txt ++++ b/interface/mmal/CMakeLists.txt +@@ -3,7 +3,7 @@ if (NOT DEFINED LIBRARY_TYPE) + set(LIBRARY_TYPE SHARED) + endif (NOT DEFINED LIBRARY_TYPE) + +-add_definitions(-Wall -Werror) ++add_definitions(-Wall) + + add_library(mmal SHARED util/mmal_util.c) + +-- +2.35.1 + diff --git a/bsp/meta-raspberrypi/recipes-graphics/userland/userland_git.bb b/bsp/meta-raspberrypi/recipes-graphics/userland/userland_git.bb index 6fdedd32fd0e927daf6020ee289e37a028afc130..d8265d48faa7d391d1cba9e03d1c4b4e78b40b37 100644 --- a/bsp/meta-raspberrypi/recipes-graphics/userland/userland_git.bb +++ b/bsp/meta-raspberrypi/recipes-graphics/userland/userland_git.bb @@ -8,19 +8,20 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=0448d6488ef8cc380632b1569ee6d196" PROVIDES += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "", "virtual/libgles2 virtual/egl", d)}" PROVIDES += "virtual/libomxil" -RPROVIDES_${PN} += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "", "libgles2 egl libegl libegl1 libglesv2-2", d)}" +RPROVIDES:${PN} += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "", "libgles2 egl libegl libegl1 libglesv2-2", d)}" COMPATIBLE_MACHINE = "^rpi$" SRCBRANCH = "master" SRCFORK = "raspberrypi" -SRCREV = "3fd8527eefd8790b4e8393458efc5f94eb21a615" +SRCREV = "c4fd1b8986c6d6d4ae5cd51e65a8bbeb495dfa4e" # Use the date of the above commit as the package version. Update this when # SRCREV is changed. -PV = "20210319" +PV = "20220323" SRC_URI = "\ git://github.com/${SRCFORK}/userland.git;protocol=https;branch=${SRCBRANCH} \ + file://0001-mmal-Do-not-use-Werror.patch \ file://0001-Allow-applications-to-set-next-resource-handle.patch \ file://0002-wayland-Add-support-for-the-Wayland-winsys.patch \ file://0003-wayland-Add-Wayland-example.patch \ @@ -47,7 +48,7 @@ SRC_URI = "\ file://0024-userland-Sync-needed-defines-for-weston-build.patch \ " -SRC_URI_remove_toolchain-clang = "file://0021-cmake-Disable-format-overflow-warning-as-error.patch" +SRC_URI:remove:toolchain-clang = "file://0021-cmake-Disable-format-overflow-warning-as-error.patch" S = "${WORKDIR}/git" @@ -59,7 +60,7 @@ EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DCMAKE_EXE_LINKER_FLAGS='-Wl,--no-a -DVMCS_INSTALL_PREFIX=${exec_prefix} \ " -EXTRA_OECMAKE_append_aarch64 = " -DARM64=ON " +EXTRA_OECMAKE:append:aarch64 = " -DARM64=ON " PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" @@ -67,9 +68,9 @@ PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', PACKAGECONFIG[wayland] = "-DBUILD_WAYLAND=TRUE -DWAYLAND_SCANNER_EXECUTABLE:FILEPATH=${STAGING_BINDIR_NATIVE}/wayland-scanner,,wayland-native wayland" PACKAGECONFIG[allapps] = "-DALL_APPS=true,,," -CFLAGS_append = " -fPIC" +CFLAGS:append = " -fPIC -Wno-unused-but-set-variable" -do_install_append () { +do_install:append () { for f in `find ${D}${includedir}/interface/vcos/ -name "*.h"`; do sed -i 's/include "vcos_platform.h"/include "pthreads\/vcos_platform.h"/g' ${f} sed -i 's/include "vcos_futex_mutex.h"/include "pthreads\/vcos_futex_mutex.h"/g' ${f} @@ -88,21 +89,25 @@ do_install_append () { ln -sf brcmegl.pc ${D}${libdir}/pkgconfig/egl.pc ln -sf brcmvg.pc ${D}${libdir}/pkgconfig/vg.pc fi + # Currently man files are installed in /usr/man instead of /usr/share/man, see comments in: + # https://github.com/raspberrypi/userland/commit/45a0022ac64b4d0788def3c5230c972430f6fc23 + mkdir -pv ${D}${datadir} + mv -v ${D}${prefix}/man ${D}${mandir} } # Shared libs from userland package build aren't versioned, so we need # to force the .so files into the runtime package (and keep them # out of -dev package). FILES_SOLIBSDEV = "" -INSANE_SKIP_${PN} += "dev-so" +INSANE_SKIP:${PN} += "dev-so" -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/*.so \ ${libdir}/plugins" -FILES_${PN}-dev += "${includedir} \ +FILES:${PN}-dev += "${includedir} \ ${prefix}/src" -FILES_${PN}-doc += "${datadir}/install" -FILES_${PN}-dbg += "${libdir}/plugins/.debug" +FILES:${PN}-doc += "${datadir}/install" +FILES:${PN}-dbg += "${libdir}/plugins/.debug" -RDEPENDS_${PN} += "bash" -RDEPENDS_${PN} += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "libegl-mesa", "", d)}" +RDEPENDS:${PN} += "bash" +RDEPENDS:${PN} += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "libegl-mesa", "", d)}" diff --git a/bsp/meta-raspberrypi/recipes-graphics/vc-graphics/vc-graphics.inc b/bsp/meta-raspberrypi/recipes-graphics/vc-graphics/vc-graphics.inc index 540e289548719ddf85e3bc554c8ca8658379ca03..e5e8f5358cb87138457939e4237df444ffbdc554 100644 --- a/bsp/meta-raspberrypi/recipes-graphics/vc-graphics/vc-graphics.inc +++ b/bsp/meta-raspberrypi/recipes-graphics/vc-graphics/vc-graphics.inc @@ -40,15 +40,15 @@ do_install () { } # These are proprietary binaries generated elsewhere so don't check ldflags -INSANE_SKIP_${PN} = "ldflags" +INSANE_SKIP:${PN} = "ldflags" INITSCRIPT_NAME = "vchiq.sh" INITSCRIPT_PARAMS = "start 03 S ." -FILES_${PN} = "${bindir}/* \ +FILES:${PN} = "${bindir}/* \ ${libdir}/lib*.so \ ${sysconfdir}/init.d \ ${libdir}/plugins" -FILES_${PN}-dev = "${libdir}/pkgconfig \ +FILES:${PN}-dev = "${libdir}/pkgconfig \ ${includedir}" -FILES_${PN}-dbg += "${libdir}/plugins/.debug" +FILES:${PN}-dbg += "${libdir}/plugins/.debug" diff --git a/bsp/meta-raspberrypi/recipes-graphics/wayland/wayland_%.bbappend b/bsp/meta-raspberrypi/recipes-graphics/wayland/wayland_%.bbappend index e5bbf4aaabba4eacbc73137af3132bb1f2fd0e4e..ca2b2961e456ab5a42cf6f6eae22eb8a820f5684 100644 --- a/bsp/meta-raspberrypi/recipes-graphics/wayland/wayland_%.bbappend +++ b/bsp/meta-raspberrypi/recipes-graphics/wayland/wayland_%.bbappend @@ -1,5 +1,5 @@ # until fully tested, prefer `libwayland-egl` provided by `userland` instead of `wayland` when not using vc4graphics -do_install_append_rpi () { +do_install:append:rpi () { if [ "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "1", "0", d)}" = "0" ]; then rm -f ${D}${libdir}/libwayland-egl* rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc diff --git a/bsp/meta-raspberrypi/recipes-graphics/wayland/weston-init.bbappend b/bsp/meta-raspberrypi/recipes-graphics/wayland/weston-init.bbappend new file mode 100644 index 0000000000000000000000000000000000000000..b6d6f2e8a7376d555b3f7f2b28b6308f82d57248 --- /dev/null +++ b/bsp/meta-raspberrypi/recipes-graphics/wayland/weston-init.bbappend @@ -0,0 +1,10 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +do_install:append:rpi() { + if [ -e ${D}/${sysconfdir}/init.d/weston ]; then + sed -i 's#weston-start --#weston-start -- --continue-without-input#' ${D}/${sysconfdir}/init.d/weston + fi + if [ -e ${D}${systemd_system_unitdir}/weston.service ]; then + sed -i 's#ExecStart=/usr/bin/weston#ExecStart=/usr/bin/weston --continue-without-input#' ${D}${systemd_system_unitdir}/weston.service + fi +} diff --git a/bsp/meta-raspberrypi/recipes-graphics/wayland/weston_%.bbappend b/bsp/meta-raspberrypi/recipes-graphics/wayland/weston_%.bbappend index 55cf7007b006699e8e75c6837e49329b68a1e896..89917f04985a641917a8ab3ab516d0e349aac68c 100644 --- a/bsp/meta-raspberrypi/recipes-graphics/wayland/weston_%.bbappend +++ b/bsp/meta-raspberrypi/recipes-graphics/wayland/weston_%.bbappend @@ -1,6 +1,6 @@ -PACKAGECONFIG_remove_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'fbdev', '', d)}" +PACKAGECONFIG:remove:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'fbdev', '', d)}" -EXTRA_OECONF_append_rpi = " \ +EXTRA_OECONF:append:rpi = " \ --disable-xwayland-test \ --disable-simple-egl-clients \ ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' \ diff --git a/bsp/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend b/bsp/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend index 71e0adcd4f3b6a464aacaaa7240106f7d09275ad..dfcd07247a16f2475192162843591cf59995b83c 100644 --- a/bsp/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend +++ b/bsp/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend @@ -1,10 +1,10 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI_append_rpi = " \ +SRC_URI:append:rpi = " \ file://xorg.conf.d/98-pitft.conf \ file://xorg.conf.d/99-calibration.conf \ " -do_install_append_rpi () { +do_install:append:rpi () { PITFT="${@bb.utils.contains("MACHINE_FEATURES", "pitft", "1", "0", d)}" if [ "${PITFT}" = "1" ]; then install -d ${D}/${sysconfdir}/X11/xorg.conf.d/ @@ -13,4 +13,4 @@ do_install_append_rpi () { fi } -FILES_${PN}_rpi += "${sysconfdir}/X11/xorg.conf ${sysconfdir}/X11/xorg.conf.d/*" +FILES:${PN}:append:rpi = " ${sysconfdir}/X11/xorg.conf.d/*" diff --git a/bsp/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/bsp/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend index 9574fa5b8a99386cfc306947b867a9ab86540fa8..ee4812fce7a08b2d50aa436eac8fac4e64d95023 100644 --- a/bsp/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend +++ b/bsp/meta-raspberrypi/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend @@ -1,5 +1,5 @@ -OPENGL_PKGCONFIGS_rpi = "dri glx ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'dri3 xshmfence glamor', '', d)}" +OPENGL_PKGCONFIGS:rpi = "dri glx ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'dri3 glamor', '', d)}" # when using userland graphic KHR/khrplatform.h is provided by userland but virtual/libgl is provided by mesa-gl where # we explicitly delete KHR/khrplatform.h since its already coming from userland package -DEPENDS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'userland', d)}" +DEPENDS:append:rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'userland', d)}" diff --git a/bsp/meta-raspberrypi/recipes-kernel/bluez-firmware-rpidistro/bluez-firmware-rpidistro_git.bb b/bsp/meta-raspberrypi/recipes-kernel/bluez-firmware-rpidistro/bluez-firmware-rpidistro_git.bb index 450206c361dfe9b25d2c3e7924060cf075d5c7bd..b26e80e3e69c9a343debaef172f9514c1399cb0b 100644 --- a/bsp/meta-raspberrypi/recipes-kernel/bluez-firmware-rpidistro/bluez-firmware-rpidistro_git.bb +++ b/bsp/meta-raspberrypi/recipes-kernel/bluez-firmware-rpidistro/bluez-firmware-rpidistro_git.bb @@ -39,7 +39,7 @@ do_extract_lic() { } # Must be before both do_install and do_populate_lic. Putting it before # their common ancestor works; other approaches do not. -addtask extract_lic after do_unpack before do_patch +addtask extract_lic after do_unpack before do_patch do_create_spdx do_compile() { : @@ -60,40 +60,40 @@ PACKAGES = "\ ${PN}-bcm4345c5-hcd \ " -LICENSE_${PN}-bcm43430a1-hcd = "Firmware-cypress-rpidistro" -LICENSE_${PN}-bcm43430b0-hcd = "Firmware-cypress-rpidistro" -LICENSE_${PN}-bcm4345c0-hcd = "Firmware-cypress-rpidistro" -LICENSE_${PN}-bcm4345c5-hcd = "Firmware-cypress-rpidistro" -LICENSE_${PN}-cypress-license = "Firmware-cypress-rpidistro" +LICENSE:${PN}-bcm43430a1-hcd = "Firmware-cypress-rpidistro" +LICENSE:${PN}-bcm43430b0-hcd = "Firmware-cypress-rpidistro" +LICENSE:${PN}-bcm4345c0-hcd = "Firmware-cypress-rpidistro" +LICENSE:${PN}-bcm4345c5-hcd = "Firmware-cypress-rpidistro" +LICENSE:${PN}-cypress-license = "Firmware-cypress-rpidistro" -FILES_${PN}-cypress-license = "\ +FILES:${PN}-cypress-license = "\ ${nonarch_base_libdir}/firmware/LICENCE.cypress-rpidistro \ " -FILES_${PN}-bcm43430a1-hcd = "\ +FILES:${PN}-bcm43430a1-hcd = "\ ${nonarch_base_libdir}/firmware/brcm/BCM43430A1.hcd \ " -FILES_${PN}-bcm43430b0-hcd = "\ +FILES:${PN}-bcm43430b0-hcd = "\ ${nonarch_base_libdir}/firmware/brcm/BCM43430B0.hcd \ " -FILES_${PN}-bcm4345c0-hcd = "\ +FILES:${PN}-bcm4345c0-hcd = "\ ${nonarch_base_libdir}/firmware/brcm/BCM4345C0.hcd \ " -FILES_${PN}-bcm4345c5-hcd = "\ +FILES:${PN}-bcm4345c5-hcd = "\ ${nonarch_base_libdir}/firmware/brcm/BCM4345C5.hcd \ " -RDEPENDS_${PN}-bcm43430a1-hcd += "${PN}-cypress-license" -RDEPENDS_${PN}-bcm43430b0-hcd += "${PN}-cypress-license" -RDEPENDS_${PN}-bcm4345c0-hcd += "${PN}-cypress-license" -RDEPENDS_${PN}-bcm4345c5-hcd += "${PN}-cypress-license" -RCONFLICTS_${PN}-bcm43430a1-hcd = "linux-firmware-bcm43430a1-hcd" -RREPLACES_${PN}-bcm43430a1-hcd = "linux-firmware-bcm43430a1-hcd" -RCONFLICTS_${PN}-bcm43430b0-hcd = "linux-firmware-bcm43430b0-hcd" -RREPLACES_${PN}-bcm43430b0-hcd = "linux-firmware-bcm43430b0-hcd" -RCONFLICTS_${PN}-bcm43435c0-hcd = "linux-firmware-bcm4345c0-hcd" -RREPLACES_${PN}-bcm43435c0-hcd = "linux-firmware-bcm4345c0-hcd" -RCONFLICTS_${PN}-bcm43435c5-hcd = "linux-firmware-bcm4345c5-hcd" -RREPLACES_${PN}-bcm43435c5-hcd = "linux-firmware-bcm4345c5-hcd" +RDEPENDS:${PN}-bcm43430a1-hcd += "${PN}-cypress-license" +RDEPENDS:${PN}-bcm43430b0-hcd += "${PN}-cypress-license" +RDEPENDS:${PN}-bcm4345c0-hcd += "${PN}-cypress-license" +RDEPENDS:${PN}-bcm4345c5-hcd += "${PN}-cypress-license" +RCONFLICTS:${PN}-bcm43430a1-hcd = "linux-firmware-bcm43430a1-hcd" +RREPLACES:${PN}-bcm43430a1-hcd = "linux-firmware-bcm43430a1-hcd" +RCONFLICTS:${PN}-bcm43430b0-hcd = "linux-firmware-bcm43430b0-hcd" +RREPLACES:${PN}-bcm43430b0-hcd = "linux-firmware-bcm43430b0-hcd" +RCONFLICTS:${PN}-bcm43435c0-hcd = "linux-firmware-bcm4345c0-hcd" +RREPLACES:${PN}-bcm43435c0-hcd = "linux-firmware-bcm4345c0-hcd" +RCONFLICTS:${PN}-bcm43435c5-hcd = "linux-firmware-bcm4345c5-hcd" +RREPLACES:${PN}-bcm43435c5-hcd = "linux-firmware-bcm4345c5-hcd" # Firmware files are generally not run on the CPU, so they can be # allarch despite being architecture specific diff --git a/bsp/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb b/bsp/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb index f1b566daf692f89aa7ad7a0a712d3f754500bfd6..ec5997065730184091f98b2cb40a601e2e6a81d8 100644 --- a/bsp/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb +++ b/bsp/meta-raspberrypi/recipes-kernel/linux-firmware-rpidistro/linux-firmware-rpidistro_git.bb @@ -6,12 +6,12 @@ HOMEPAGE = "https://github.com/RPi-Distro/firmware-nonfree" SECTION = "kernel" # In maintained upstream linux-firmware: -# * brcmfmac43430-sdio falls under LICENCE.cypress -# * brcmfmac43455-sdio falls under LICENCE.broadcom_bcm43xx -# * brcmfmac43456-sdio falls under LICENCE.broadcom_bcm43xx +# * brcmfmac43430-sdio falls under LICENSE.cypress +# * brcmfmac43455-sdio falls under LICENSE.broadcom_bcm43xx +# * brcmfmac43456-sdio falls under LICENSE.broadcom_bcm43xx # -# It is likely[^1] that both of these should be under LICENCE.cypress. -# Further, at this time the text of LICENCE.broadcom_bcm43xx is the same +# It is likely[^1] that both of these should be under LICENSE.cypress. +# Further, at this time the text of LICENSE.broadcom_bcm43xx is the same # in linux-firmware and RPi-Distro/firmware-nonfree, but this may # change. # @@ -22,22 +22,19 @@ SECTION = "kernel" # [^1]: https://github.com/RPi-Distro/bluez-firmware/issues/1 LICENSE = "\ Firmware-broadcom_bcm43xx-rpidistro \ - & WHENCE \ " LIC_FILES_CHKSUM = "\ - file://LICENCE.broadcom_bcm43xx;md5=3160c14df7228891b868060e1951dfbc \ - file://WHENCE;md5=7b12b2224438186e4c97c4c7f3a5cc28 \ + file://debian/config/brcm80211/LICENSE;md5=8cba1397cda6386db37210439a0da3eb \ " # These are not common licenses, set NO_GENERIC_LICENSE for them # so that the license files will be copied from fetched source -NO_GENERIC_LICENSE[Firmware-broadcom_bcm43xx-rpidistro] = "LICENCE.broadcom_bcm43xx" -NO_GENERIC_LICENSE[WHENCE] = "WHENCE" +NO_GENERIC_LICENSE[Firmware-broadcom_bcm43xx-rpidistro] = "debian/config/brcm80211/LICENSE" -SRC_URI = "git://github.com/RPi-Distro/firmware-nonfree;branch=buster;protocol=https" +SRC_URI = "git://github.com/RPi-Distro/firmware-nonfree;branch=bullseye;protocol=https" -SRCREV = "83938f78ca2d5a0ffe0c223bb96d72ccc7b71ca5" -PV = "20190114-1+rpt11" +SRCREV = "99d5c588e95ec9c9b86d7e88d3cf85b4f729d2bc" +PV = "20210315-3+rpt4" S = "${WORKDIR}/git" @@ -50,22 +47,21 @@ do_compile() { } do_install() { - install -d ${D}${nonarch_base_libdir}/firmware/brcm + install -d ${D}${nonarch_base_libdir}/firmware/brcm ${D}${nonarch_base_libdir}/firmware/cypress - cp ./LICENCE.broadcom_bcm43xx ${D}${nonarch_base_libdir}/firmware/LICENCE.broadcom_bcm43xx-rpidistro + cp debian/config/brcm80211/LICENSE ${D}${nonarch_base_libdir}/firmware/LICENSE.broadcom_bcm43xx-rpidistro # Replace outdated linux-firmware files with updated ones from # raspbian firmware-nonfree. Raspbian adds blobs and nvram # definitions that are also necessary so copy those too. - for fw in brcmfmac43430-sdio brcmfmac43455-sdio brcmfmac43456-sdio ; do - install -m 0644 brcm/${fw}.* ${D}${nonarch_base_libdir}/firmware/brcm/ + for fw in brcmfmac43430-sdio brcmfmac43436-sdio brcmfmac43436s-sdio brcmfmac43455-sdio brcmfmac43456-sdio ; do + cp -R --no-dereference --preserve=mode,links -v debian/config/brcm80211/brcm/${fw}.* ${D}${nonarch_base_libdir}/firmware/brcm/ done + cp -R --no-dereference --preserve=mode,links -v debian/config/brcm80211/cypress/* ${D}${nonarch_base_libdir}/firmware/cypress/ + rm ${D}${nonarch_base_libdir}/firmware/cypress/README.txt # add compat links. Fixes errors like - # brcmfmac mmc1:0001:1: Direct firmware load for brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt failed with error -2 - ln -s brcmfmac43455-sdio.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt - ln -s brcmfmac43455-sdio.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt - ln -s brcmfmac43430-sdio.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt - ln -s brcmfmac43430-sdio.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt + # brcmfmac mmc1:0001:1: Direct firmware load for brcm/brcmfmac43455-sdio.raspberrypi,4-model-compute-module.txt failed with error -2 + ln -s brcmfmac43455-sdio.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.txt } PACKAGES = "\ @@ -73,40 +69,70 @@ PACKAGES = "\ ${PN}-bcm43430 \ ${PN}-bcm43455 \ ${PN}-bcm43456 \ + ${PN}-bcm43436 \ + ${PN}-bcm43436s \ " -LICENSE_${PN}-bcm43430 = "Firmware-broadcom_bcm43xx-rpidistro" -LICENSE_${PN}-bcm43455 = "Firmware-broadcom_bcm43xx-rpidistro" -LICENSE_${PN}-bcm43456 = "Firmware-broadcom_bcm43xx-rpidistro" -LICENSE_${PN}-broadcom-license = "Firmware-broadcom_bcm43xx-rpidistro" -FILES_${PN}-broadcom-license = "${nonarch_base_libdir}/firmware/LICENCE.broadcom_bcm43xx-rpidistro" -FILES_${PN}-bcm43430 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430*" -FILES_${PN}-bcm43455 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43455*" -FILES_${PN}-bcm43456 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43456*" -RDEPENDS_${PN}-bcm43430 += "${PN}-broadcom-license" -RDEPENDS_${PN}-bcm43455 += "${PN}-broadcom-license" -RDEPENDS_${PN}-bcm43456 += "${PN}-broadcom-license" -RCONFLICTS_${PN}-bcm43430 = "\ +LICENSE:${PN}-bcm43430 = "Firmware-broadcom_bcm43xx-rpidistro" +LICENSE:${PN}-bcm43436 = "Firmware-broadcom_bcm43xx-rpidistro" +LICENSE:${PN}-bcm43436s = "Firmware-broadcom_bcm43xx-rpidistro" +LICENSE:${PN}-bcm43455 = "Firmware-broadcom_bcm43xx-rpidistro" +LICENSE:${PN}-bcm43456 = "Firmware-broadcom_bcm43xx-rpidistro" +LICENSE:${PN}-broadcom-license = "Firmware-broadcom_bcm43xx-rpidistro" +FILES:${PN}-broadcom-license = "${nonarch_base_libdir}/firmware/LICENSE.broadcom_bcm43xx-rpidistro" +FILES:${PN}-bcm43430 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430* ${nonarch_base_libdir}/firmware/cypress/cyfmac43430-sdio.bin ${nonarch_base_libdir}/firmware/cypress/cyfmac43430-sdio.clm_blob" +FILES:${PN}-bcm43436 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43436-*" +FILES:${PN}-bcm43436s = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43436s*" +FILES:${PN}-bcm43455 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43455* ${nonarch_base_libdir}/firmware/cypress/cyfmac43455-sdio*" +FILES:${PN}-bcm43456 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43456*" +RDEPENDS:${PN}-bcm43430 += "${PN}-broadcom-license" +RDEPENDS:${PN}-bcm43436 += "${PN}-broadcom-license" +RDEPENDS:${PN}-bcm43436s += "${PN}-broadcom-license" +RDEPENDS:${PN}-bcm43455 += "${PN}-broadcom-license" +RDEPENDS:${PN}-bcm43456 += "${PN}-broadcom-license" +RCONFLICTS:${PN}-bcm43430 = "\ linux-firmware-bcm43430 \ linux-firmware-raspbian-bcm43430 \ " -RREPLACES_${PN}-bcm43430 = "\ + +RREPLACES:${PN}-bcm43430 = "\ linux-firmware-bcm43430 \ linux-firmware-raspbian-bcm43430 \ " -RCONFLICTS_${PN}-bcm43455 = "\ + +RCONFLICTS:${PN}-bcm43436 = "\ + linux-firmware-bcm43436 \ + linux-firmware-raspbian-bcm43436 \ +" + +RREPLACES:${PN}-bcm43436 = "\ + linux-firmware-bcm43436 \ + linux-firmware-raspbian-bcm43436 \ +" + +RCONFLICTS:${PN}-bcm43436s = "\ + linux-firmware-bcm43436s \ + linux-firmware-raspbian-bcm43436s \ +" + +RREPLACES:${PN}-bcm43436s = "\ + linux-firmware-bcm43436s \ + linux-firmware-raspbian-bcm43436s \ +" + +RCONFLICTS:${PN}-bcm43455 = "\ linux-firmware-bcm43455 \ linux-firmware-raspbian-bcm43455 \ " -RREPLACES_${PN}-bcm43455 = "\ +RREPLACES:${PN}-bcm43455 = "\ linux-firmware-bcm43455 \ linux-firmware-raspbian-bcm43455 \ " -RCONFLICTS_${PN}-bcm43456 = "\ +RCONFLICTS:${PN}-bcm43456 = "\ linux-firmware-bcm43456 \ linux-firmware-raspbian-bcm43456 \ " -RREPLACES_${PN}-bcm43456 = "\ +RREPLACES:${PN}-bcm43456 = "\ linux-firmware-bcm43456 \ linux-firmware-raspbian-bcm43456 \ " diff --git a/bsp/meta-raspberrypi/recipes-kernel/linux/files/wm8960.cfg b/bsp/meta-raspberrypi/recipes-kernel/linux/files/wm8960.cfg new file mode 100644 index 0000000000000000000000000000000000000000..936080083e1c4c91eb9986da852c82a18d48a768 --- /dev/null +++ b/bsp/meta-raspberrypi/recipes-kernel/linux/files/wm8960.cfg @@ -0,0 +1,2 @@ +CONFIG_I2C_BCM2835=y +CONFIG_SND_SOC_WM8960=y diff --git a/bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc b/bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc index 5ad9b781b23d9d89121a902eefc9c4b5f34dc95d..6362a73d7f2c963c17074ca0242054c45a1e2d83 100644 --- a/bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc +++ b/bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi.inc @@ -1,6 +1,6 @@ DESCRIPTION = "Linux Kernel for Raspberry Pi" SECTION = "kernel" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" COMPATIBLE_MACHINE = "^rpi$" @@ -14,17 +14,18 @@ require recipes-kernel/linux/linux-yocto.inc SRC_URI += " \ ${@bb.utils.contains("INITRAMFS_IMAGE_BUNDLE", "1", "file://initramfs-image-bundle.cfg", "", d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "file://vc4graphics.cfg", "", d)} \ + ${@bb.utils.contains("MACHINE_FEATURES", "wm8960", "file://wm8960.cfg", "", d)} \ " KCONFIG_MODE = "--alldefconfig" -KBUILD_DEFCONFIG_raspberrypi0-wifi ?= "bcmrpi_defconfig" -KBUILD_DEFCONFIG_raspberrypi ?= "bcmrpi_defconfig" -KBUILD_DEFCONFIG_raspberrypi-cm3 ?= "bcm2709_defconfig" -KBUILD_DEFCONFIG_raspberrypi2 ?= "bcm2709_defconfig" -KBUILD_DEFCONFIG_raspberrypi3 ?= "bcm2709_defconfig" -KBUILD_DEFCONFIG_raspberrypi3-64 ?= "bcmrpi3_defconfig" -KBUILD_DEFCONFIG_raspberrypi4 ?= "bcm2711_defconfig" -KBUILD_DEFCONFIG_raspberrypi4-64 ?= "bcm2711_defconfig" +KBUILD_DEFCONFIG:raspberrypi0-wifi ?= "bcmrpi_defconfig" +KBUILD_DEFCONFIG:raspberrypi ?= "bcmrpi_defconfig" +KBUILD_DEFCONFIG:raspberrypi-cm3 ?= "bcm2709_defconfig" +KBUILD_DEFCONFIG:raspberrypi2 ?= "bcm2709_defconfig" +KBUILD_DEFCONFIG:raspberrypi3 ?= "bcm2709_defconfig" +KBUILD_DEFCONFIG:raspberrypi3-64 ?= "bcmrpi3_defconfig" +KBUILD_DEFCONFIG:raspberrypi4 ?= "bcm2711_defconfig" +KBUILD_DEFCONFIG:raspberrypi4-64 ?= "bcm2711_defconfig" LINUX_VERSION_EXTENSION ?= "" @@ -33,4 +34,7 @@ KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains("MACHINE_FEATURES", "pitft28r", # A LOADADDR is needed when building a uImage format kernel. This value is not # set by default in rpi-4.8.y and later branches so we need to provide it # manually. This value unused if KERNEL_IMAGETYPE is not uImage. -KERNEL_EXTRA_ARGS += "LOADADDR=0x00008000" +KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" + +UBOOT_ENTRYPOINT = "0x00008000" +UBOOT_LOADADDRESS = "0x00008000" diff --git a/bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.10.bb b/bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.10.bb index b13ec7e05d65d5e7a1d636f8ee5b95275f8bcc8d..8dade0b99fc1f5d52c23ac7da0b023924a7ed1dd 100644 --- a/bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.10.bb +++ b/bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.10.bb @@ -1,9 +1,9 @@ -LINUX_VERSION ?= "5.10.31" +LINUX_VERSION ?= "5.10.110" LINUX_RPI_BRANCH ?= "rpi-5.10.y" LINUX_RPI_KMETA_BRANCH ?= "yocto-5.10" -SRCREV_machine = "89399e6e7e33d6260a954603ca03857df594ffd3" -SRCREV_meta = "a19886b00ea7d874fdd60d8e3435894bb16e6434" +SRCREV_machine = "89c0af71c9cf157a865afb526e9ebc21aadd531b" +SRCREV_meta = "e1979ceb171bc91ef2cb71cfcde548a101dab687" KMETA = "kernel-meta" diff --git a/bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4.bb b/bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.15.bb similarity index 47% rename from bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4.bb rename to bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.15.bb index 16914f14e605ea22a88e1f99efbebe1f3fc60b72..77d4a980a3b9db0dc192caf4f78101427c0b46d6 100644 --- a/bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.4.bb +++ b/bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.15.bb @@ -1,23 +1,19 @@ -LINUX_VERSION ?= "5.4.83" -LINUX_RPI_BRANCH ?= "rpi-5.4.y" -LINUX_RPI_KMETA_BRANCH ?= "yocto-5.4" +LINUX_VERSION ?= "5.15.34" +LINUX_RPI_BRANCH ?= "rpi-5.15.y" +LINUX_RPI_KMETA_BRANCH ?= "yocto-5.15" -SRCREV_machine = "08ae2dd9e7dc89c20bff823a3ef045de09bfd090" -SRCREV_meta = "d676bf5ff7b7071e14f44498d2482c0a596f14cd" +SRCREV_machine = "0086da6acd41600d47b87b05874f99704216426f" +SRCREV_meta = "e1b976ee4fb5af517cf01a9f2dd4a32f560ca894" KMETA = "kernel-meta" SRC_URI = " \ git://github.com/raspberrypi/linux.git;name=machine;branch=${LINUX_RPI_BRANCH};protocol=https \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${LINUX_RPI_KMETA_BRANCH};destsuffix=${KMETA} \ - file://0001-Revert-selftests-bpf-Skip-perf-hw-events-test-if-the.patch \ - file://0002-Revert-selftests-bpf-Fix-perf_buffer-test-on-systems.patch \ file://powersave.cfg \ file://android-drivers.cfg \ " require linux-raspberrypi.inc -LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" - KERNEL_DTC_FLAGS += "-@ -H epapr" diff --git a/bsp/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend b/bsp/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend index a971236f2163baff81be7080fac482c8461c3d97..5e0b4578727b05acc7ad6b1130554109426f2ff8 100644 --- a/bsp/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend +++ b/bsp/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx_%.bbappend @@ -1,12 +1,12 @@ -FILESEXTRAPATHS_prepend_rpi := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:rpi := "${THISDIR}/${PN}:" -SRC_URI_append_rpi = " \ +SRC_URI:append:rpi = " \ file://0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch \ file://0003-no-timeout-on-get-state.patch \ file://0004-Properly-handle-drain-requests-while-flushing.patch \ file://0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch \ " -GSTREAMER_1_0_OMX_TARGET_rpi = "rpi" -GSTREAMER_1_0_OMX_CORE_NAME_rpi = "${libdir}/libopenmaxil.so" -EXTRA_OEMESON_append_rpi = " -Dheader_path=${STAGING_DIR_TARGET}/usr/include/IL" +GSTREAMER_1_0_OMX_TARGET:rpi = "rpi" +GSTREAMER_1_0_OMX_CORE_NAME:rpi = "${libdir}/libopenmaxil.so" +EXTRA_OEMESON:append:rpi = " -Dheader_path=${STAGING_DIR_TARGET}/usr/include/IL" diff --git a/bsp/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/bsp/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend index 8ab1510d8c4e76b45db821a55ab4c5f9953071f8..2bf628134cfb484ab4f87b87c3cd14bd9d798c52 100644 --- a/bsp/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend +++ b/bsp/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend @@ -1,2 +1,2 @@ -PACKAGECONFIG_append_rpi = " hls libmms \ - ${@bb.utils.contains('LICENSE_FLAGS_WHITELIST', 'commercial', 'faad', '', d)}" +PACKAGECONFIG:append:rpi = " hls \ + ${@bb.utils.contains('LICENSE_FLAGS_ACCEPTED', 'commercial', 'gpl faad', '', d)}" diff --git a/bsp/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend b/bsp/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend index 6bed42a873249f241aaddaa0d2422bebd941cdd6..834ccfbbc42dcba45d5ee8ead128d40533d97a19 100644 --- a/bsp/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend +++ b/bsp/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend @@ -1,6 +1,6 @@ # if using bcm driver enable dispmanx not when using VC4 driver -PACKAGECONFIG_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' dispmanx', d)}" -DEPENDS_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" +PACKAGECONFIG:append:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' dispmanx', d)}" +DEPENDS:append:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" PACKAGECONFIG_GL_VC4GRAPHICS = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2 egl', '', d)}" -PACKAGECONFIG_GL_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '${PACKAGECONFIG_GL_VC4GRAPHICS}', 'egl gles2', d)}" +PACKAGECONFIG_GL:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '${PACKAGECONFIG_GL_VC4GRAPHICS}', 'egl gles2', d)}" diff --git a/bsp/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.%.bbappend b/bsp/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.%.bbappend similarity index 36% rename from bsp/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.%.bbappend rename to bsp/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.%.bbappend index 80a324f0ca1436f5b0a3f30208a2672df5335e8a..f3fb1441d120a049c47083eb245c6b73c4b69efb 100644 --- a/bsp/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.%.bbappend +++ b/bsp/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.20.%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' rpi', d)}" +PACKAGECONFIG:append:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' rpi', d)}" diff --git a/bsp/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch b/bsp/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch index dd1d4f3d70cde9050f53969e44d8b4ff4dfd6372..e4946506a7bbb62738a84b014523386f7520abb0 100644 --- a/bsp/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch +++ b/bsp/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0002-Libraries-and-headers-from-ffmpeg-are-installed-in-u.patch @@ -15,10 +15,8 @@ Signed-off-by: Jonathan Liu Makefile.ffmpeg | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) -Index: git/Makefile -=================================================================== ---- git.orig/Makefile -+++ git/Makefile +--- a/Makefile ++++ b/Makefile @@ -2,9 +2,9 @@ CFLAGS=-pipe -mfloat-abi=hard -mcpu=arm1 CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST @@ -27,11 +25,11 @@ Index: git/Makefile +LDFLAGS+=-L./ -Lffmpeg_compiled/usr/lib/ -lc -lbrcmGLESv2 -lbrcmEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound -INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include -I/usr/include/freetype2 -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -+INCLUDES+=-I./ -Ilinux ++INCLUDES+=-I./ -Ilinux -I./ffmpeg DIST ?= omxplayer-dist STRIP ?= strip -@@ -90,7 +90,7 @@ dist: omxplayer.bin omxplayer.1 +@@ -91,7 +91,7 @@ dist: omxplayer.bin omxplayer.1 cp COPYING $(DIST)/usr/share/doc/omxplayer cp README.md $(DIST)/usr/share/doc/omxplayer/README cp omxplayer.1 $(DIST)/usr/share/man/man1 @@ -40,10 +38,8 @@ Index: git/Makefile cd $(DIST); tar -czf ../$(DIST).tgz * install: -Index: git/Makefile.ffmpeg -=================================================================== ---- git.orig/Makefile.ffmpeg -+++ git/Makefile.ffmpeg +--- a/Makefile.ffmpeg ++++ b/Makefile.ffmpeg @@ -238,7 +238,8 @@ configure: --disable-decoder=xbin \ --disable-decoder=idf \ diff --git a/bsp/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb b/bsp/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb index 82706a47a481ed18f9bb62b5388c6b0ffd47d648..c15b40b4afa497960dd780983d9956aa745c965f 100644 --- a/bsp/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb +++ b/bsp/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer_git.bb @@ -4,10 +4,10 @@ Raspberry PI implementation and is quite handy to use standalone" HOMEPAGE = "https://github.com/popcornmix/omxplayer" SECTION = "console/utils" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=00a27da7ac0f9bcd17320ec29ef4bbf6" -DEPENDS = "libpcre libav virtual/egl boost freetype dbus openssl libssh virtual/libomxil coreutils-native curl-native userland" +DEPENDS = "alsa-lib libpcre virtual/egl boost freetype dbus openssl libssh virtual/libomxil coreutils-native curl-native userland" PR = "r5" @@ -36,12 +36,12 @@ SRC_URI = "git://github.com/popcornmix/omxplayer.git;protocol=https;branch=maste file://0007-Remove-Makefile-hardcoded-arch-tune.patch \ " -SRC_URI_append = "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", " file://0001-Fix-build-with-vc4-driver.patch ", "", d)}" +SRC_URI:append = "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", " file://0001-Fix-build-with-vc4-driver.patch ", "", d)}" S = "${WORKDIR}/git" COMPATIBLE_MACHINE = "^rpi$" -COMPATIBLE_HOST_aarch64 = "null" +COMPATIBLE_HOST:aarch64 = "null" def cpu(d): for arg in (d.getVar('TUNE_CCARGS') or '').split(): @@ -99,10 +99,10 @@ do_install() { install ${S}/fonts/* ${D}${datadir}/fonts/truetype/freefont/ } -FILES_${PN} = "${bindir}/omxplayer* \ +FILES:${PN} = "${bindir}/omxplayer* \ ${libdir}/omxplayer/lib*${SOLIBS} \ ${datadir}/fonts" -FILES_${PN}-dev += "${libdir}/omxplayer/*.so" +FILES:${PN}-dev += "${libdir}/omxplayer/*.so" -RDEPENDS_${PN} += "bash procps userland" +RDEPENDS:${PN} += "bash procps userland" diff --git a/bsp/meta-raspberrypi/recipes-multimedia/picamera-libs/picamera-libs.bb b/bsp/meta-raspberrypi/recipes-multimedia/picamera-libs/picamera-libs.bb new file mode 100644 index 0000000000000000000000000000000000000000..2ebe41394266dbfa60b14cb666ec744c143d3437 --- /dev/null +++ b/bsp/meta-raspberrypi/recipes-multimedia/picamera-libs/picamera-libs.bb @@ -0,0 +1,26 @@ +SUMMARY = "Raspberrypi firmware libraries which are required by picamera library" +DESCRIPTION = "Raspberrypi firmware libraries required by picamera library" +LICENSE = "Broadcom-RPi" + +LIC_FILES_CHKSUM = "file://opt/vc/LICENCE;md5=86e53f5f5909ee66900418028de11780" + +include recipes-bsp/common/raspberrypi-firmware.inc + +S = "${WORKDIR}/raspberrypi-firmware-1.${PV}" + +do_install(){ + install -m 0755 -d ${D}${libdir} + install -m 0755 ${S}/opt/vc/lib/*.so ${D}${libdir} +} + +FILES:${PN} = "${libdir}" + +#skipping the QA error since we are directly copying precompiled binaries +INSANE_SKIP:${PN} = "ldflags" +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_SYSROOT_STRIP = "1" +SOLIBS = ".so" +FILES_SOLIBSDEV = "" + +COMPATIBLE_HOST = "null" +COMPATIBLE_HOST:rpi:libc-glibc = "(arm.*)-linux" diff --git a/bsp/meta-raspberrypi/recipes-multimedia/python3-picamera/python3-picamera_git.bb b/bsp/meta-raspberrypi/recipes-multimedia/python3-picamera/python3-picamera_git.bb new file mode 100644 index 0000000000000000000000000000000000000000..f14941b823f04b2de054a0bb3042c9cf0d32913c --- /dev/null +++ b/bsp/meta-raspberrypi/recipes-multimedia/python3-picamera/python3-picamera_git.bb @@ -0,0 +1,22 @@ +SUMMARY = "Python interface to the Raspberry Pi camera module" +DESCRIPTION = "This package provides a pure Python interface to the Raspberry Pi camera module for Python 2.7 (or above) or Python 3.2 (or above)." +HOMEPAGE = "https://github.com/waveform80/picamera" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4de8aab427192e4a8322a71375d20e21" + +RDEPENDS:${PN} = "python3-numbers \ + python3-ctypes \ + python3-colorzero \ + picamera-libs \ +" + +SRC_URI = "git://git@github.com/waveform80/picamera.git;protocol=ssh;branch=master" +SRCREV = "7e4f1d379d698c44501fb84b886fadf3fc164b70" + +S = "${WORKDIR}/git" + +inherit setuptools3 + +COMPATIBLE_HOST = "null" +COMPATIBLE_HOST:rpi:libc-glibc = "(arm.*)-linux" diff --git a/bsp/meta-raspberrypi/recipes-multimedia/x264/x264_%.bbappend b/bsp/meta-raspberrypi/recipes-multimedia/x264/x264_%.bbappend index 505719efb8adb7c7f7178c4f498b89ee8e0980b1..e0cfaf8d92442d3a76ac5aa972712a964d23354b 100644 --- a/bsp/meta-raspberrypi/recipes-multimedia/x264/x264_%.bbappend +++ b/bsp/meta-raspberrypi/recipes-multimedia/x264/x264_%.bbappend @@ -1,2 +1,2 @@ -EXTRA_OECONF_append_raspberrypi = " --disable-asm" -EXTRA_OECONF_append_raspberrypi0-wifi = " --disable-asm" +EXTRA_OECONF:append:raspberrypi = " --disable-asm" +EXTRA_OECONF:append:raspberrypi0-wifi = " --disable-asm" diff --git a/bsp/meta-raspberrypi/recipes-sato/libwpe_%.bbappend b/bsp/meta-raspberrypi/recipes-sato/libwpe_%.bbappend new file mode 100644 index 0000000000000000000000000000000000000000..fe1e59bcd00ad7e40528d5141b45a8371820c269 --- /dev/null +++ b/bsp/meta-raspberrypi/recipes-sato/libwpe_%.bbappend @@ -0,0 +1,2 @@ +# Workaround build issue with RPi userland EGL libraries. +CFLAGS:append:rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}" diff --git a/bsp/meta-rockchip/conf/layer.conf b/bsp/meta-rockchip/conf/layer.conf index 00d67645bb88c3bff418e8463fd535119a4cc852..885805c70eed8f3b44f2fe62a35f79b0f35d3974 100644 --- a/bsp/meta-rockchip/conf/layer.conf +++ b/bsp/meta-rockchip/conf/layer.conf @@ -9,8 +9,8 @@ BBFILE_COLLECTIONS += "rockchip" BBFILE_PATTERN_rockchip = "^${LAYERDIR}/" BBFILE_PRIORITY_rockchip = "6" -LAYERDEPENDS_rockchip = "core" -LAYERSERIES_COMPAT_rockchip = "hardknott" +LAYERDEPENDS:rockchip = "core" +LAYERSERIES_COMPAT_rockchip = "kirkstone" # enable .bb under qt5-layer/ when exist meta-qt5 BBFILES_DYNAMIC += " \ diff --git a/bsp/meta-rockchip/conf/machine/include/rk3568.inc b/bsp/meta-rockchip/conf/machine/include/rk3568.inc index 9fda880846861c3205a862c58d84fb70e7598f04..e527b4f306424d47b9b675f748eaf9eaff988c27 100644 --- a/bsp/meta-rockchip/conf/machine/include/rk3568.inc +++ b/bsp/meta-rockchip/conf/machine/include/rk3568.inc @@ -22,7 +22,7 @@ SERIAL_CONSOLES = "115200;ttyFIQ0" # arm and arm64 both support -mlittle-endian so no # need to consider compat32. TUNE_CCARGS .= " -mlittle-endian" -IMAGE_INSTALL_append = " kernel-modules" +IMAGE_INSTALL:append = " kernel-modules" # auto load module during startup KERNEL_MODULE_AUTOLOAD = "mlan moal " diff --git a/bsp/meta-rockchip/conf/machine/ok3568.conf b/bsp/meta-rockchip/conf/machine/ok3568.conf index 04634b31fa7fd72292c05580c2297976d5913f4e..5118f8ff3e8694b4e87185f3db82c5affe6e7a60 100644 --- a/bsp/meta-rockchip/conf/machine/ok3568.conf +++ b/bsp/meta-rockchip/conf/machine/ok3568.conf @@ -1,2 +1,2 @@ require conf/machine/include/rk3568.inc -KERNEL_MODULE_AUTOLOAD_append = " ${@bb.utils.contains('MCS_FEATURES', 'openamp', 'mcs_km', '', d)} " +KERNEL_MODULE_AUTOLOAD:append = " ${@bb.utils.contains('MCS_FEATURES', 'openamp', 'mcs_km', '', d)} " diff --git a/bsp/meta-rockchip/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/bsp/meta-rockchip/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend index b2aebdd5534043929ff9bf35fba496abecbaff30..df452b9f5b10a3d2b59600a43e5a5be4e64a51c5 100644 --- a/bsp/meta-rockchip/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend +++ b/bsp/meta-rockchip/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend @@ -1,19 +1,19 @@ PACKAGECONFIG_GL = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'gl', \ bb.utils.contains('DISTRO_FEATURES', 'opengl', 'eglfs gles2', \ '', d), d)}" -PACKAGECONFIG_GL_append = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', ' kms', '', d)}" -PACKAGECONFIG_GL_append = " gbm" +PACKAGECONFIG_GL:append = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', ' kms', '', d)}" +PACKAGECONFIG_GL:append = " gbm" PACKAGECONFIG_FONTS = "fontconfig" -PACKAGECONFIG_append = " libinput examples tslib xkbcommon" -PACKAGECONFIG_remove = "tests" +PACKAGECONFIG:append = " libinput examples tslib xkbcommon" +PACKAGECONFIG:remove = "tests" OE_QTBASE_EGLFS_DEVICE_INTEGRATION = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', 'eglfs_brcm', d)}" -do_configure_prepend() { +do_configure:prepend() { # Add the appropriate EGLFS_DEVICE_INTEGRATION if [ "${@d.getVar('OE_QTBASE_EGLFS_DEVICE_INTEGRATION')}" != "" ]; then echo "EGLFS_DEVICE_INTEGRATION = ${OE_QTBASE_EGLFS_DEVICE_INTEGRATION}" >> ${S}/mkspecs/oe-device-extra.pri fi } -RDEPENDS_${PN}_append = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" -DEPENDS_append = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" +RDEPENDS:${PN}:append = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" +DEPENDS:append = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}" diff --git a/bsp/meta-rockchip/recipes-connectivity/init-ifupdown/init-ifupdown_1.0.bbappend b/bsp/meta-rockchip/recipes-connectivity/init-ifupdown/init-ifupdown_1.0.bbappend index aeb3b8487db59275804250f7930b82a928e7989b..695d008d84d3cf03961d0cfc0c9674c48fe836fa 100644 --- a/bsp/meta-rockchip/recipes-connectivity/init-ifupdown/init-ifupdown_1.0.bbappend +++ b/bsp/meta-rockchip/recipes-connectivity/init-ifupdown/init-ifupdown_1.0.bbappend @@ -1,8 +1,8 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" -SRC_URI_append_rk3568 = " file://interfaces_rk3568 \ +SRC_URI:append:rk3568 = " file://interfaces_rk3568 \ " -do_install_append_rk3568 () { +do_install:append:rk3568 () { install -m 0644 ${WORKDIR}/interfaces_rk3568 ${D}${sysconfdir}/network/interfaces } diff --git a/bsp/meta-rockchip/recipes-connectivity/wifi_firmware/wififirmware_v1.0.bb b/bsp/meta-rockchip/recipes-connectivity/wifi_firmware/wififirmware_v1.0.bb index 350db5d4835ea903ae2c19b3ee2873809153798e..d8e5b08bdebd0e652fd95962e6ff352e4013e1d8 100644 --- a/bsp/meta-rockchip/recipes-connectivity/wifi_firmware/wififirmware_v1.0.bb +++ b/bsp/meta-rockchip/recipes-connectivity/wifi_firmware/wififirmware_v1.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda PR = "r0" SRC_URI = "file://firmware/nxp" -FILES_${PN} += "/lib/firmware/nxp" +FILES:${PN} += "/lib/firmware/nxp" inherit allarch do_install() { diff --git a/bsp/meta-rockchip/recipes-core/images/rk3568.inc b/bsp/meta-rockchip/recipes-core/images/rk3568.inc index aa5ba40077f0b631cad7c36a18c191f36ebde0cd..e46394d86fda5af4ac0411984e2532538d6a4a8c 100644 --- a/bsp/meta-rockchip/recipes-core/images/rk3568.inc +++ b/bsp/meta-rockchip/recipes-core/images/rk3568.inc @@ -1,5 +1,5 @@ IMAGE_FSTYPES = "ext4" -IMAGE_FSTYPES_remove = "iso" +IMAGE_FSTYPES:remove = "iso" IMAGE_FSTYPES_DEBUGFS = "ext4" INITRAMFS_MAXSIZE = "476591" diff --git a/bsp/meta-rockchip/recipes-core/packagegroups/packagegroup-base.bbappend b/bsp/meta-rockchip/recipes-core/packagegroups/packagegroup-base.bbappend index eabfc9cb196afb4ad87a7a31a664a522f45409ee..55cc63ee5ebd443275e6d65bbd042e59fb0aaf9b 100644 --- a/bsp/meta-rockchip/recipes-core/packagegroups/packagegroup-base.bbappend +++ b/bsp/meta-rockchip/recipes-core/packagegroups/packagegroup-base.bbappend @@ -1,4 +1,4 @@ -RDEPENDS_packagegroup-base_append += " \ +RDEPENDS:packagegroup-base:append = " \ e2fsprogs-resize2fs \ wpa-supplicant \ wififirmware \ diff --git a/bsp/meta-rockchip/recipes-core/packagegroups/packagegroup-core-boot.bbappend b/bsp/meta-rockchip/recipes-core/packagegroups/packagegroup-core-boot.bbappend index ca2717c60a72eccdec9fbb8f9144551a0cc85f0c..5f611934cf2dc72bcb46c34bf02803d3c024ec9a 100644 --- a/bsp/meta-rockchip/recipes-core/packagegroups/packagegroup-core-boot.bbappend +++ b/bsp/meta-rockchip/recipes-core/packagegroups/packagegroup-core-boot.bbappend @@ -1,4 +1,4 @@ # we add bootfile -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ bootfile \ " diff --git a/bsp/meta-rockchip/recipes-graphics/mesa/mesa_%.bbappend b/bsp/meta-rockchip/recipes-graphics/mesa/mesa_%.bbappend index 1880f9dfb66729b0f15dbf4c77b768cc45d6b8f2..0706d3252521356a0ab8346a0f5d9c5fc0f5b1af 100644 --- a/bsp/meta-rockchip/recipes-graphics/mesa/mesa_%.bbappend +++ b/bsp/meta-rockchip/recipes-graphics/mesa/mesa_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_append_rk3568 = " gallium vc4 v3d kmsro ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)}" +PACKAGECONFIG:append:rk3568 = " gallium vc4 v3d kmsro ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)}" diff --git a/bsp/meta-rockchip/recipes-kernel/linux/files/config/ok3568/defconfig-kernel b/bsp/meta-rockchip/recipes-kernel/linux/files/config/ok3568/defconfig-kernel index 8b029d3fe1ebffde2b2db9bb85981fdd4241a7fa..4adc4e50fbfbf2076e0a2ee3b0ee5d527f61f412 100644 --- a/bsp/meta-rockchip/recipes-kernel/linux/files/config/ok3568/defconfig-kernel +++ b/bsp/meta-rockchip/recipes-kernel/linux/files/config/ok3568/defconfig-kernel @@ -1421,7 +1421,7 @@ CONFIG_ALLOW_DEV_COREDUMP=y CONFIG_DEV_COREDUMP=y # CONFIG_DEBUG_DRIVER is not set CONFIG_DEBUG_DEVRES=y -# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set +# CONFIG_DEBUG_TEST_DRIVER:remove is not set # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set CONFIG_GENERIC_CPU_AUTOPROBE=y CONFIG_GENERIC_CPU_VULNERABILITIES=y diff --git a/bsp/meta-rockchip/recipes-kernel/linux/files/config/ryd-3568/defconfig-kernel b/bsp/meta-rockchip/recipes-kernel/linux/files/config/ryd-3568/defconfig-kernel index ae347700c40fd19e8f016f0c1c1fe03f762e9921..3a7eda4c29a7f9d2d8b34acff84a7ff8571a1831 100644 --- a/bsp/meta-rockchip/recipes-kernel/linux/files/config/ryd-3568/defconfig-kernel +++ b/bsp/meta-rockchip/recipes-kernel/linux/files/config/ryd-3568/defconfig-kernel @@ -1411,7 +1411,7 @@ CONFIG_ALLOW_DEV_COREDUMP=y CONFIG_DEV_COREDUMP=y # CONFIG_DEBUG_DRIVER is not set CONFIG_DEBUG_DEVRES=y -# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set +# CONFIG_DEBUG_TEST_DRIVER:remove is not set # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set CONFIG_GENERIC_CPU_AUTOPROBE=y CONFIG_GENERIC_CPU_VULNERABILITIES=y diff --git a/bsp/meta-rockchip/recipes-kernel/linux/linux-openeuler-rt.bbappend b/bsp/meta-rockchip/recipes-kernel/linux/linux-openeuler-rt.bbappend index 2214ef2c11d49b0157b38ceb1a6818c35b78db66..0dc1dcba3b7c4bc62c627b95ff60341d53e082c9 100644 --- a/bsp/meta-rockchip/recipes-kernel/linux/linux-openeuler-rt.bbappend +++ b/bsp/meta-rockchip/recipes-kernel/linux/linux-openeuler-rt.bbappend @@ -1,10 +1,10 @@ require recipes-kernel/linux/linux-rockchip.inc -SRC_URI_append_rk3568 = " \ +SRC_URI:append:rk3568 = " \ file://patches/0002-fix-fiq_debugger.patch \ " #define and use defconfig -do_configure_prepend() { +do_configure:prepend() { sed -i 's/CONFIG_PREEMPT=y/CONFIG_PREEMPT_RT=y/g' ${OPENEULER_KERNEL_CONFIG} cp -f "${OPENEULER_KERNEL_CONFIG}" .config } diff --git a/bsp/meta-rockchip/recipes-kernel/linux/linux-rockchip.inc b/bsp/meta-rockchip/recipes-kernel/linux/linux-rockchip.inc index dc3bfd1cba18f1d354a539ba318742ea348a07cd..253ca2a1da630c177a1e249676dbbc5f66b230f8 100644 --- a/bsp/meta-rockchip/recipes-kernel/linux/linux-rockchip.inc +++ b/bsp/meta-rockchip/recipes-kernel/linux/linux-rockchip.inc @@ -1,7 +1,7 @@ # add recipes-kernel path to find patch and defconfig -FILESEXTRAPATHS_append := "${THISDIR}/files/:" +FILESEXTRAPATHS:append := "${THISDIR}/files/:" # add patch prebuild tools and logo -SRC_URI_append = " \ +SRC_URI:append = " \ file://config/ \ file://patches/0000-rk3568-kernel.patch.gz;name=rk3568-kernel-patch \ file://tools \ @@ -9,12 +9,12 @@ SRC_URI_append = " \ " # patches for ryd-3568 -SRC_URI_append_ryd-3568 = " \ +SRC_URI:append:ryd-3568 = " \ file://patches/0001-rk3568-8897-dts.patch \ file://patches/0002-ryd-gpio-control.patch \ " # mcs patch for ok3568 devicetree -SRC_URI_append = " \ +SRC_URI:append = " \ ${@bb.utils.contains('MCS_FEATURES', 'openamp', 'file://patches/0003-ok3568-support-mcs.patch', '', d)} \ " @@ -27,7 +27,7 @@ PATCHTOOL = "git" OPENEULER_KERNEL_CONFIG = "../config/${MACHINE}/defconfig-kernel" # add method to do_compile task to produce bootable Image -do_compile_append_rk3568(){ +do_compile:append:rk3568(){ cp ../logo/* ./ scripts/mkkrnlimg ${KERNEL_OUTPUT_DIR}/Image kernel.img ../tools/mkimg --dtb ${RK3568_KERNEL_DTB_NAME} @@ -38,7 +38,7 @@ do_compile_append_rk3568(){ } # add boot.img to $D -do_install_append(){ +do_install:append(){ cp ${B}/boot.img ${D}/boot } PACKAGES += "bootfile" diff --git a/bsp/meta-rockchip/recipes-mcs/mcs-linux/mcs-linux.bbappend b/bsp/meta-rockchip/recipes-mcs/mcs-linux/mcs-linux.bbappend index 8c9e093a956b06c0e6a91b37a976b2c9de55eabf..0e8522ee3c9bb954ca3e69f5ee5ce323a1585d1d 100644 --- a/bsp/meta-rockchip/recipes-mcs/mcs-linux/mcs-linux.bbappend +++ b/bsp/meta-rockchip/recipes-mcs/mcs-linux/mcs-linux.bbappend @@ -2,10 +2,10 @@ EXTRA_OECMAKE = " \ -DDEMO_TARGET=openamp_demo \ " -do_install_append(){ +do_install:append(){ install -d ${D}/firmware install -D ${S}/openamp_demo/rtthread-ok3568.bin ${D}/firmware/ } -FILES_${PN} += "/firmware" +FILES:${PN} += "/firmware" diff --git a/bsp/meta-visionfive2/conf/layer.conf b/bsp/meta-visionfive2/conf/layer.conf index 6d0dd415589fb5592bb36b26b3c957a90447f5b0..fc20286ebcc2e604ba7b7fb87bc2aba8427dfb0b 100755 --- a/bsp/meta-visionfive2/conf/layer.conf +++ b/bsp/meta-visionfive2/conf/layer.conf @@ -10,5 +10,5 @@ BBFILE_PATTERN_meta-visionfive2 = "^${LAYERDIR}/" BBFILE_PRIORITY_meta-visionfive2 = "7" LAYERVERSION_meta-visionfive2 = "1" -LAYERDEPENDS_meta-visionfive2 = "core" -LAYERSERIES_COMPAT_meta-visionfive2 = "hardknott" +LAYERDEPENDS:meta-visionfive2 = "core" +LAYERSERIES_COMPAT_meta-visionfive2 = "kirkstone" diff --git a/bsp/meta-visionfive2/conf/machine/starfive-dubhe.conf b/bsp/meta-visionfive2/conf/machine/starfive-dubhe.conf index 0523ba2b3c2b894e02d6b3a0dc5c83651792d5a2..9ba523e6b04583bbd7750848581e66dda648f146 100755 --- a/bsp/meta-visionfive2/conf/machine/starfive-dubhe.conf +++ b/bsp/meta-visionfive2/conf/machine/starfive-dubhe.conf @@ -9,7 +9,7 @@ export ROOTFS_PACKAGE_ARCH = "riscv64" KERNEL_IMAGETYPE = "Image.gz" KERNEL_IMAGETYPE_FOR_MAKE = "Image.gz" -BASE_LIB_tune-riscv64 = "lib64/lp64d" +BASE_LIB:tune-riscv64 = "lib64/lp64d" require conf/multilib.conf MULTILIBS = "" diff --git a/bsp/meta-visionfive2/recipes-core/images/starfive-dubhe.inc b/bsp/meta-visionfive2/recipes-core/images/starfive-dubhe.inc index d3d49fe8b78bf40aba1342a66c93445b208aaad8..e45fe7acaa69efd971bd3c5aac36938c96ed20ec 100755 --- a/bsp/meta-visionfive2/recipes-core/images/starfive-dubhe.inc +++ b/bsp/meta-visionfive2/recipes-core/images/starfive-dubhe.inc @@ -1,4 +1,4 @@ INITRAMFS_MAXSIZE ="15728640" IMAGE_ROOTFS_SIZE = "8192" IMAGE_ROOTFS_EXTRA_SPACE = "0" -IMAGE_FSTYPES_remove = "iso" +IMAGE_FSTYPES:remove = "iso" diff --git a/bsp/meta-visionfive2/recipes-kernel/linux/files/config/visionfive2-jh7110_defconfig b/bsp/meta-visionfive2/recipes-kernel/linux/files/config/visionfive2-jh7110_defconfig index 2f3f2bd9914e12917825cc555a0b71293f29fba5..0772dcaf12bc1b6cd3cc979643e911f7f7227335 100755 --- a/bsp/meta-visionfive2/recipes-kernel/linux/files/config/visionfive2-jh7110_defconfig +++ b/bsp/meta-visionfive2/recipes-kernel/linux/files/config/visionfive2-jh7110_defconfig @@ -1084,7 +1084,7 @@ CONFIG_ALLOW_DEV_COREDUMP=y CONFIG_DEV_COREDUMP=y # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set -# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set +# CONFIG_DEBUG_TEST_DRIVER:remove is not set # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set CONFIG_REGMAP=y CONFIG_REGMAP_I2C=y diff --git a/bsp/meta-visionfive2/recipes-kernel/linux/files/patch/0001-support-jh7110-starfive.patch b/bsp/meta-visionfive2/recipes-kernel/linux/files/patch/0001-support-jh7110-starfive.patch index 101f892ce66fa28dda0707d327191c6753092593..6cd45e76931d3e9dccb5c99550d5957151dcad1a 100644 --- a/bsp/meta-visionfive2/recipes-kernel/linux/files/patch/0001-support-jh7110-starfive.patch +++ b/bsp/meta-visionfive2/recipes-kernel/linux/files/patch/0001-support-jh7110-starfive.patch @@ -12066,7 +12066,7 @@ index 000000000000..b328a0c83a28 + return ret; +} + -+static int jh7110_cryp_remove(struct platform_device *pdev) ++static int jh7110_cryp:remove(struct platform_device *pdev) +{ + struct jh7110_sec_dev *sdev = platform_get_drvdata(pdev); + int ret; @@ -12151,7 +12151,7 @@ index 000000000000..b328a0c83a28 + +static struct platform_driver jh7110_cryp_driver = { + .probe = jh7110_cryp_probe, -+ .remove = jh7110_cryp_remove, ++ .remove = jh7110_cryp:remove, + .driver = { + .name = DRIVER_NAME, + .pm = &jh7110_cryp_pm_ops, @@ -12438,7 +12438,7 @@ index 000000000000..fc8269ce8845 + return 0; +} + -+static void jh7110_hash_append_sg(struct jh7110_sec_request_ctx *rctx) ++static void jh7110_hash:append:sg(struct jh7110_sec_request_ctx *rctx) +{ + struct jh7110_sec_ctx *ctx = rctx->ctx; + size_t count; @@ -12542,12 +12542,12 @@ index 000000000000..fc8269ce8845 + + while ((rctx->total >= rctx->buflen) || + (rctx->bufcnt + rctx->total >= rctx->buflen)) { -+ jh7110_hash_append_sg(rctx); ++ jh7110_hash:append:sg(rctx); + err = jh7110_hash_xmit(ctx, 0); + rctx->bufcnt = 0; + } + -+ jh7110_hash_append_sg(rctx); ++ jh7110_hash:append:sg(rctx); + + if (final) { + err = jh7110_hash_xmit(ctx, @@ -12729,7 +12729,7 @@ index 000000000000..fc8269ce8845 + rctx->offset = 0; + + if ((rctx->bufcnt + rctx->total < rctx->buflen)) { -+ jh7110_hash_append_sg(rctx); ++ jh7110_hash:append:sg(rctx); + return 0; + } + @@ -16963,53 +16963,53 @@ index 000000000000..995efc8e55ed --- /dev/null +++ b/drivers/gpu/drm/i2c/tda998x_pin.c @@ -0,0 +1,47 @@ -+#include -+#include -+#include -+#include -+#include -+ -+#define DRIVER_NAME "starfive" -+#define DRIVER_DESC "StarFive Soc DRM" -+#define DRIVER_DATE "20220624" -+#define DRIVER_MAJOR 1 -+#define DRIVER_MINOR 0 -+#define DRIVER_VERSION "v1.0.0" -+ -+static struct drm_driver starfive_drm_driver = { -+ .name = DRIVER_NAME, -+ .desc = DRIVER_DESC, -+ .date = DRIVER_DATE, -+ .major = DRIVER_MAJOR, -+ .minor = DRIVER_MINOR, -+}; -+ -+static int starfive_drm_platform_probe(struct platform_device *pdev) -+{ -+ dev_info(&pdev->dev, "%s, ok\n", __func__); -+ -+ return 0; -+} -+ -+static const struct of_device_id tda998x_rgb_dt_ids[] = { -+ { .compatible = "starfive,tda998x_rgb_pin", }, -+ { /* sentinel */ }, -+}; -+MODULE_DEVICE_TABLE(of, starfive_drm_dt_ids); -+ -+static struct platform_driver starfive_drm_platform_driver = { -+ .probe = starfive_drm_platform_probe, -+ .driver = { -+ .name = "tda998x_rgb_dt_ids", -+ .of_match_table = tda998x_rgb_dt_ids, -+ }, -+}; -+ -+module_platform_driver(starfive_drm_platform_driver); -+ -+MODULE_AUTHOR("David Li "); -+MODULE_DESCRIPTION("starfive DRM Driver"); -+MODULE_LICENSE("GPL v2"); ++#include ++#include ++#include ++#include ++#include ++ ++#define DRIVER_NAME "starfive" ++#define DRIVER_DESC "StarFive Soc DRM" ++#define DRIVER_DATE "20220624" ++#define DRIVER_MAJOR 1 ++#define DRIVER_MINOR 0 ++#define DRIVER_VERSION "v1.0.0" ++ ++static struct drm_driver starfive_drm_driver = { ++ .name = DRIVER_NAME, ++ .desc = DRIVER_DESC, ++ .date = DRIVER_DATE, ++ .major = DRIVER_MAJOR, ++ .minor = DRIVER_MINOR, ++}; ++ ++static int starfive_drm_platform_probe(struct platform_device *pdev) ++{ ++ dev_info(&pdev->dev, "%s, ok\n", __func__); ++ ++ return 0; ++} ++ ++static const struct of_device_id tda998x_rgb_dt_ids[] = { ++ { .compatible = "starfive,tda998x_rgb_pin", }, ++ { /* sentinel */ }, ++}; ++MODULE_DEVICE_TABLE(of, starfive_drm_dt_ids); ++ ++static struct platform_driver starfive_drm_platform_driver = { ++ .probe = starfive_drm_platform_probe, ++ .driver = { ++ .name = "tda998x_rgb_dt_ids", ++ .of_match_table = tda998x_rgb_dt_ids, ++ }, ++}; ++ ++module_platform_driver(starfive_drm_platform_driver); ++ ++MODULE_AUTHOR("David Li "); ++MODULE_DESCRIPTION("starfive DRM Driver"); ++MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/panel/panel-jadard-jd9365da-h3.c b/drivers/gpu/drm/panel/panel-jadard-jd9365da-h3.c new file mode 100755 index 000000000000..0b7341cecc45 @@ -17611,7 +17611,7 @@ index 000000000000..0b7341cecc45 + return -ENODEV; +no_panel: + mipi_dsi_device_unregister(jd_panel->dsi); -+ //drm_panel_remove(&jd_panel->panel); ++ //drm_panel:remove(&jd_panel->panel); + //mipi_dsi_detach(jd_panel->dsi); + + return -ENODEV; @@ -17619,12 +17619,12 @@ index 000000000000..0b7341cecc45 + +} + -+static int panel_remove(struct i2c_client *client) ++static int panel:remove(struct i2c_client *client) +{ + struct jadard *jd_panel = i2c_get_clientdata(client); + + mipi_dsi_detach(jd_panel->dsi); -+ drm_panel_remove(&jd_panel->panel); ++ drm_panel:remove(&jd_panel->panel); + mipi_dsi_device_unregister(jd_panel->dsi); + return 0; +} @@ -17646,7 +17646,7 @@ index 000000000000..0b7341cecc45 + .of_match_table = panel_dt_ids, + }, + .probe = panel_probe, -+ .remove = panel_remove, ++ .remove = panel:remove, + .id_table = panel_id, +}; + @@ -17671,12 +17671,12 @@ index 000000000000..0b7341cecc45 + return 0; +} + -+static int jadard_dsi_remove(struct mipi_dsi_device *dsi) ++static int jadard_dsi:remove(struct mipi_dsi_device *dsi) +{ + struct jadard *jadard = mipi_dsi_get_drvdata(dsi); + + mipi_dsi_detach(dsi); -+ drm_panel_remove(&jadard->panel); ++ drm_panel:remove(&jadard->panel); + + return 0; +} @@ -17689,7 +17689,7 @@ index 000000000000..0b7341cecc45 + +static struct mipi_dsi_driver jadard_mipi_driver = { + .probe = jadard_dsi_probe, -+ .remove = jadard_dsi_remove, ++ .remove = jadard_dsi:remove, + .driver.name = DSI_DRIVER_NAME, +}; +//module_mipi_dsi_driver(jadard_driver); @@ -18579,11 +18579,11 @@ index 000000000000..860f18db0be5 + return 0; +} + -+static int mbox_test_remove(struct platform_device *pdev) ++static int mbox_test:remove(struct platform_device *pdev) +{ + struct mbox_test_device *tdev = platform_get_drvdata(pdev); + -+ debugfs_remove_recursive(tdev->root_debugfs_dir); ++ debugfs:remove:recursive(tdev->root_debugfs_dir); + + if (tdev->tx_channel) + mbox_free_channel(tdev->tx_channel); @@ -18605,7 +18605,7 @@ index 000000000000..860f18db0be5 + .of_match_table = mbox_test_match, + }, + .probe = mbox_test_probe, -+ .remove = mbox_test_remove, ++ .remove = mbox_test:remove, +}; +module_platform_driver(mbox_test_driver); + @@ -18914,7 +18914,7 @@ index 000000000000..c73ed9c453ed + return 0; +} + -+static int starfive_mbox_remove(struct platform_device *pdev) ++static int starfive_mbox:remove(struct platform_device *pdev) +{ + struct starfive_mbox *mbox = platform_get_drvdata(pdev); + @@ -18953,7 +18953,7 @@ index 000000000000..c73ed9c453ed +}; +static struct platform_driver starfive_mbox_driver = { + .probe = starfive_mbox_probe, -+ .remove = starfive_mbox_remove, ++ .remove = starfive_mbox:remove, + .driver = { + .name = "mailbox", + .of_match_table = starfive_mbox_of_match, @@ -20670,7 +20670,7 @@ index 000000000000..5ed8a3d19795 + return ret; +} + -+static int imx219_remove(struct i2c_client *client) ++static int imx219:remove(struct i2c_client *client) +{ + struct v4l2_subdev *sd = i2c_get_clientdata(client); + struct imx219 *imx219 = to_imx219(sd); @@ -20704,7 +20704,7 @@ index 000000000000..5ed8a3d19795 + .pm = &imx219_pm_ops, + }, + .probe_new = imx219_probe, -+ .remove = imx219_remove, ++ .remove = imx219:remove, +}; + +module_i2c_driver(imx219_i2c_driver); @@ -22609,7 +22609,7 @@ index 000000000000..78f49d0fa43f + return ret; +} + -+static int ov13850_remove(struct i2c_client *client) ++static int ov13850:remove(struct i2c_client *client) +{ + struct v4l2_subdev *sd = i2c_get_clientdata(client); + struct ov13850_dev *sensor = to_ov13850_dev(sd); @@ -22641,7 +22641,7 @@ index 000000000000..78f49d0fa43f + }, + .id_table = ov13850_id, + .probe_new = ov13850_probe, -+ .remove = ov13850_remove, ++ .remove = ov13850:remove, +}; + +module_i2c_driver(ov13850_i2c_driver); @@ -25579,7 +25579,7 @@ index 000000000000..1aa390446eb3 + return ret; +} + -+static int ov4689_remove(struct i2c_client *client) ++static int ov4689:remove(struct i2c_client *client) +{ + struct v4l2_subdev *sd = i2c_get_clientdata(client); + struct ov4689_dev *sensor = to_ov4689_dev(sd); @@ -25621,7 +25621,7 @@ index 000000000000..1aa390446eb3 + }, + .id_table = ov4689_id, + .probe_new = ov4689_probe, -+ .remove = ov4689_remove, ++ .remove = ov4689:remove, +}; + +module_i2c_driver(ov4689_i2c_driver); @@ -28822,7 +28822,7 @@ index 000000000000..16a3881a3855 + return ret; +} + -+static int ov5640_remove(struct i2c_client *client) ++static int ov5640:remove(struct i2c_client *client) +{ + struct v4l2_subdev *sd = i2c_get_clientdata(client); + struct ov5640_dev *sensor = to_ov5640_dev(sd); @@ -28854,7 +28854,7 @@ index 000000000000..16a3881a3855 + }, + .id_table = ov5640_id, + .probe_new = ov5640_probe, -+ .remove = ov5640_remove, ++ .remove = ov5640:remove, +}; + +module_i2c_driver(ov5640_i2c_driver); @@ -30736,7 +30736,7 @@ index 000000000000..c44c1849cb2a + return ret; +} + -+static int sc2235_remove(struct i2c_client *client) ++static int sc2235:remove(struct i2c_client *client) +{ + struct v4l2_subdev *sd = i2c_get_clientdata(client); + struct sc2235_dev *sensor = to_sc2235_dev(sd); @@ -30778,7 +30778,7 @@ index 000000000000..c44c1849cb2a + }, + .id_table = sc2235_id, + .probe_new = sc2235_probe, -+ .remove = sc2235_remove, ++ .remove = sc2235:remove, +}; + +module_i2c_driver(sc2235_i2c_driver); @@ -41839,8 +41839,8 @@ index 000000000000..bb58bca91991 + return 0; + +#ifdef CONFIG_DEBUG_FS -+ debugfs_remove(stfcamss->vin_debugfs); -+ debugfs_remove_recursive(stfcamss->debugfs_entry); ++ debugfs:remove(stfcamss->vin_debugfs); ++ debugfs:remove:recursive(stfcamss->debugfs_entry); + stfcamss->debugfs_entry = NULL; +#endif + @@ -41858,15 +41858,15 @@ index 000000000000..bb58bca91991 + return ret; +} + -+static int stfcamss_remove(struct platform_device *pdev) ++static int stfcamss:remove(struct platform_device *pdev) +{ + struct stfcamss *stfcamss = platform_get_drvdata(pdev); + + dev_info(&pdev->dev, "remove done\n"); + +#ifdef CONFIG_DEBUG_FS -+ debugfs_remove(stfcamss->vin_debugfs); -+ debugfs_remove_recursive(stfcamss->debugfs_entry); ++ debugfs:remove(stfcamss->vin_debugfs); ++ debugfs:remove:recursive(stfcamss->debugfs_entry); + stfcamss->debugfs_entry = NULL; +#endif + @@ -42040,7 +42040,7 @@ index 000000000000..bb58bca91991 + +static struct platform_driver stfcamss_driver = { + .probe = stfcamss_probe, -+ .remove = stfcamss_remove, ++ .remove = stfcamss:remove, + .driver = { + .name = DRV_NAME, + .pm = &stfcamss_pm_ops, @@ -42426,13 +42426,13 @@ index 000000000000..614cac5adeb6 + return 0; +} + -+static int dw_mci_starfive_remove(struct platform_device *pdev) ++static int dw_mci_starfive:remove(struct platform_device *pdev) +{ + pm_runtime_disable(&pdev->dev); + pm_runtime_set_suspended(&pdev->dev); + pm_runtime_put_noidle(&pdev->dev); + -+ return dw_mci_pltfm_remove(pdev); ++ return dw_mci_pltfm:remove(pdev); +} + +static const struct dev_pm_ops dw_mci_starfive_pm_ops = { @@ -42444,7 +42444,7 @@ index 000000000000..614cac5adeb6 + +static struct platform_driver dw_mci_starfive_driver = { + .probe = dw_mci_starfive_probe, -+ .remove = dw_mci_starfive_remove, ++ .remove = dw_mci_starfive:remove, + .driver = { + .name = "dwmmc_starfive", + .pm = &dw_mci_starfive_pm_ops, @@ -42648,12 +42648,12 @@ index 000000000000..b9eb63dc8711 +disable_tx: + clk_disable_unprepare(dwmac->clk_tx); +err: -+ stmmac_remove_config_dt(pdev, plat_dat); ++ stmmac:remove:config_dt(pdev, plat_dat); + + return err; +} + -+static int starfive_eth_plat_remove(struct platform_device *pdev) ++static int starfive_eth_plat:remove(struct platform_device *pdev) +{ + struct starfive_dwmac *dwmac = get_stmmac_bsp_priv(&pdev->dev); + @@ -42667,7 +42667,7 @@ index 000000000000..b9eb63dc8711 + +static struct platform_driver starfive_eth_plat_driver = { + .probe = starfive_eth_plat_probe, -+ .remove = starfive_eth_plat_remove, ++ .remove = starfive_eth_plat:remove, + .driver = { + .name = "starfive-eth-plat", + .pm = &stmmac_pltfr_pm_ops, @@ -43153,10 +43153,10 @@ index 000000000000..fc5c7ecee628 + } + + if (msi->msi_domain) -+ irq_domain_remove(msi->msi_domain); ++ irq_domain:remove(msi->msi_domain); + + if (msi->inner_domain) -+ irq_domain_remove(msi->inner_domain); ++ irq_domain:remove(msi->inner_domain); +#endif +} + @@ -43174,7 +43174,7 @@ index 000000000000..fc5c7ecee628 + if (irq > 0) + irq_dispose_mapping(irq); + } -+ irq_domain_remove(pcie->legacy_irq_domain); ++ irq_domain:remove(pcie->legacy_irq_domain); + } + + if (pci_msi_enabled()) @@ -43198,7 +43198,7 @@ index 000000000000..fc5c7ecee628 + msi->inner_domain); + if (!msi->msi_domain) { + dev_err(&pcie->pdev->dev, "Failed to create msi IRQ domain\n"); -+ irq_domain_remove(msi->inner_domain); ++ irq_domain:remove(msi->inner_domain); + return -ENOMEM; + } +#endif @@ -43679,7 +43679,7 @@ index 000000000000..fc5c7ecee628 + return ret; +} + -+static int plda_pcie_remove(struct platform_device *pdev) ++static int plda_pcie:remove(struct platform_device *pdev) +{ + struct plda_pcie *pcie = platform_get_drvdata(pdev); + @@ -43740,7 +43740,7 @@ index 000000000000..fc5c7ecee628 +#endif + }, + .probe = plda_pcie_probe, -+ .remove = plda_pcie_remove, ++ .remove = plda_pcie:remove, +}; +module_platform_driver(plda_pcie_driver); + @@ -44332,7 +44332,7 @@ index 000000000000..6abbfedd0aa6 + + ret = perf_pmu_register(&pmu->pmu, "cpu", PERF_TYPE_RAW); + if (ret) { -+ cpuhp_state_remove_instance(CPUHP_AP_PERF_RISCV_STARTING, &pmu->node); ++ cpuhp_state:remove:instance(CPUHP_AP_PERF_RISCV_STARTING, &pmu->node); + return ret; + } + @@ -48112,12 +48112,12 @@ index 000000000000..0874bbb49aa6 + return 0; +} + -+static int starfive_pwm_ptc_remove(struct platform_device *dev) ++static int starfive_pwm_ptc:remove(struct platform_device *dev) +{ + struct starfive_pwm_ptc_device *pwm = platform_get_drvdata(dev); + struct pwm_chip *chip = &pwm->chip; + -+ pwmchip_remove(chip); ++ pwmchip:remove(chip); + + pm_runtime_force_suspend(&dev->dev); + @@ -48166,7 +48166,7 @@ index 000000000000..0874bbb49aa6 + +static struct platform_driver starfive_pwm_ptc_driver = { + .probe = starfive_pwm_ptc_probe, -+ .remove = starfive_pwm_ptc_remove, ++ .remove = starfive_pwm_ptc:remove, + .driver = { + .name = "pwm-starfive-ptc", + .of_match_table = of_match_ptr(starfive_pwm_ptc_of_match), @@ -49388,7 +49388,7 @@ index 000000000000..a3a3dfbc3ccb + return ret; +} + -+static int sft_rtc_remove(struct platform_device *pdev) ++static int sft_rtc:remove(struct platform_device *pdev) +{ + struct sft_rtc *srtc = platform_get_drvdata(pdev); + @@ -49438,7 +49438,7 @@ index 000000000000..a3a3dfbc3ccb + .pm = &sft_rtc_pm_ops, + }, + .probe = sft_rtc_probe, -+ .remove = sft_rtc_remove, ++ .remove = sft_rtc:remove, +}; +module_platform_driver(starfive_rtc_driver); + @@ -51242,7 +51242,7 @@ index 000000000000..dd68ee34098c + pl022->dma_running = false; +} + -+static void pl022_dma_remove(struct pl022 *pl022) ++static void pl022_dma:remove(struct pl022 *pl022) +{ + if (pl022->dma_running) + terminate_dma(pl022); @@ -51269,7 +51269,7 @@ index 000000000000..dd68ee34098c + return 0; +} + -+static inline void pl022_dma_remove(struct pl022 *pl022) ++static inline void pl022_dma:remove(struct pl022 *pl022) +{ +} +#endif @@ -52366,7 +52366,7 @@ index 000000000000..dd68ee34098c + +err_spi_register: + if (platform_info->enable_dma) -+ pl022_dma_remove(pl022); ++ pl022_dma:remove(pl022); +err_no_irq: + reset_control_assert(pl022->rst); +err_no_rst_clr: @@ -52587,7 +52587,7 @@ index 000000000000..dd68ee34098c + + err_spi_register: + if (platform_info->enable_dma) -+ pl022_dma_remove(pl022); ++ pl022_dma:remove(pl022); + err_no_irq: + reset_control_assert(pl022->rst); + err_no_rst_clr: @@ -52606,7 +52606,7 @@ index 000000000000..dd68ee34098c +} + +static int -+pl022_remove(struct amba_device *adev) ++pl022:remove(struct amba_device *adev) +{ + struct pl022 *pl022 = amba_get_drvdata(adev); + @@ -52621,7 +52621,7 @@ index 000000000000..dd68ee34098c + + load_ssp_default_config(pl022); + if (pl022->master_info->enable_dma) -+ pl022_dma_remove(pl022); ++ pl022_dma:remove(pl022); + + clk_disable_unprepare(pl022->clk); + amba_release_regions(adev); @@ -52792,7 +52792,7 @@ index 000000000000..dd68ee34098c + }, + .id_table = pl022_ids, + .probe = pl022_probe, -+ .remove = pl022_remove, ++ .remove = pl022:remove, +}; + +static int __init pl022_init(void) @@ -52851,7 +52851,7 @@ index 000000000000..dd68ee34098c + return ret; +} + -+static int starfive_of_pl022_remove(struct platform_device *pdev) ++static int starfive_of_pl022:remove(struct platform_device *pdev) +{ + struct pl022 *pl022 = dev_get_drvdata(&pdev->dev); + @@ -52863,7 +52863,7 @@ index 000000000000..dd68ee34098c + + load_ssp_default_config(pl022); + if (pl022->master_info->enable_dma) -+ pl022_dma_remove(pl022); ++ pl022_dma:remove(pl022); + + clk_disable_unprepare(pl022->clk); + tasklet_disable(&pl022->pump_transfers); @@ -52891,7 +52891,7 @@ index 000000000000..dd68ee34098c + .pm = &pl022_dev_pm_ops, + }, + .probe = starfive_of_pl022_probe, -+ .remove = starfive_of_pl022_remove, ++ .remove = starfive_of_pl022:remove, +}; +#if !IS_MODULE(CONFIG_SPI_PL022_STARFIVE) + module_platform_driver(starfive_of_pl022_driver); @@ -53268,7 +53268,7 @@ index 000000000000..60700a969a93 + return ret; +} + -+static int cdns_starfive_remove_core(struct device *dev, void *c) ++static int cdns_starfive:remove:core(struct device *dev, void *c) +{ + struct platform_device *pdev = to_platform_device(dev); + @@ -53277,13 +53277,13 @@ index 000000000000..60700a969a93 + return 0; +} + -+static int cdns_starfive_remove(struct platform_device *pdev) ++static int cdns_starfive:remove(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct cdns_starfive *data = dev_get_drvdata(dev); + + pm_runtime_get_sync(dev); -+ device_for_each_child(dev, NULL, cdns_starfive_remove_core); ++ device_for_each_child(dev, NULL, cdns_starfive:remove:core); + + reset_control_assert(data->resets); + clk_bulk_disable_unprepare(data->num_clks, data->clks); @@ -53341,7 +53341,7 @@ index 000000000000..60700a969a93 + +static struct platform_driver cdns_starfive_driver = { + .probe = cdns_starfive_probe, -+ .remove = cdns_starfive_remove, ++ .remove = cdns_starfive:remove, + .driver = { + .name = "cdns3-starfive", + .of_match_table = cdns_starfive_of_match, @@ -53382,7 +53382,7 @@ index 102977790d60..805244ac58b8 100644 + struct usb_hcd *shared_hcd; + struct notifier_block pm_notifier; + int (*pm_setup)(struct usb_hcd *hcd); -+ int (*pm_remove)(struct cdns3 *cdns); ++ int (*pm:remove)(struct cdns3 *cdns); +}; +static struct cdns_hiber_data cdns3_hiber_data; + @@ -53457,7 +53457,7 @@ index 102977790d60..805244ac58b8 100644 +#ifdef CONFIG_PM_SLEEP + if (cdns->pdata && (cdns->pdata->quirks & CDNS3_REGISTER_PM_NOTIFIER)) { + cdns3_hiber_data.pm_setup = cdns_register_pm_notifier; -+ cdns3_hiber_data.pm_remove = cdns_unregister_pm_notifier; ++ cdns3_hiber_data.pm:remove = cdns_unregister_pm_notifier; + } +#endif ret = platform_device_add_data(xhci, cdns->xhci_plat_data, @@ -53468,9 +53468,9 @@ index 102977790d60..805244ac58b8 100644 static void cdns3_host_exit(struct cdns3 *cdns) { +#ifdef CONFIG_PM_SLEEP -+ if (cdns3_hiber_data.pm_remove) { -+ cdns3_hiber_data.pm_remove(cdns); -+ cdns3_hiber_data.pm_remove = NULL; ++ if (cdns3_hiber_data.pm:remove) { ++ cdns3_hiber_data.pm:remove(cdns); ++ cdns3_hiber_data.pm:remove = NULL; + cdns3_hiber_data.pm_setup = NULL; + } +#endif @@ -54281,7 +54281,7 @@ index 000000000000..d316767fcaf5 + return ret; +} + -+static int starfive_wdt_remove(struct platform_device *dev) ++static int starfive_wdt:remove(struct platform_device *dev) +{ + int ret; + struct starfive_wdt *wdt = platform_get_drvdata(dev); @@ -54388,7 +54388,7 @@ index 000000000000..d316767fcaf5 + +static struct platform_driver starfive_starfive_wdt_driver = { + .probe = starfive_wdt_probe, -+ .remove = starfive_wdt_remove, ++ .remove = starfive_wdt:remove, + .shutdown = starfive_wdt_shutdown, + .id_table = starfive_wdt_ids, + .driver = { @@ -59171,7 +59171,7 @@ index 000000000000..8a92602be6f8 + return ret; +} + -+static int dw_i2s_remove(struct platform_device *pdev) ++static int dw_i2s:remove(struct platform_device *pdev) +{ +#ifndef CONFIG_PM + struct dw_i2s_dev *dev = dev_get_drvdata(&pdev->dev); @@ -59202,7 +59202,7 @@ index 000000000000..8a92602be6f8 + +static struct platform_driver dw_i2s_driver = { + .probe = dw_i2s_probe, -+ .remove = dw_i2s_remove, ++ .remove = dw_i2s:remove, + .driver = { + .name = "starfive-i2s", + .of_match_table = of_match_ptr(dw_i2s_of_match), @@ -59804,7 +59804,7 @@ index 000000000000..ba0a9143f57b + return 0; +} + -+static int sf_pdm_dev_remove(struct platform_device *pdev) ++static int sf_pdm_dev:remove(struct platform_device *pdev) +{ + pm_runtime_disable(&pdev->dev); + return 0; @@ -59828,7 +59828,7 @@ index 000000000000..ba0a9143f57b + .pm = &sf_pdm_pm_ops, + }, + .probe = sf_pdm_probe, -+ .remove = sf_pdm_dev_remove, ++ .remove = sf_pdm_dev:remove, +}; +module_platform_driver(sf_pdm_driver); + @@ -60824,7 +60824,7 @@ index 000000000000..63b7d8b0d51c +} + + -+static int sf_pwmdac_remove(struct platform_device *pdev) ++static int sf_pwmdac:remove(struct platform_device *pdev) +{ + return 0; +} @@ -60841,7 +60841,7 @@ index 000000000000..63b7d8b0d51c + +static struct platform_driver sf_pwmdac_driver = { + .probe = sf_pwmdac_probe, -+ .remove = sf_pwmdac_remove, ++ .remove = sf_pwmdac:remove, + .driver = { + .name = "starfive-pwmdac", + .of_match_table = of_match_ptr(sf_pwmdac_of_match), @@ -63073,7 +63073,7 @@ index 000000000000..3ee1b13bd079 + return 0; +} + -+static int sf_tdm_dev_remove(struct platform_device *pdev) ++static int sf_tdm_dev:remove(struct platform_device *pdev) +{ + pm_runtime_disable(&pdev->dev); + return 0; @@ -63097,7 +63097,7 @@ index 000000000000..3ee1b13bd079 + .pm = &sf_tdm_pm_ops, + }, + .probe = sf_tdm_probe, -+ .remove = sf_tdm_dev_remove, ++ .remove = sf_tdm_dev:remove, +}; +module_platform_driver(sf_tdm_driver); + diff --git a/bsp/meta-visionfive2/recipes-kernel/linux/linux-visionfive2.inc b/bsp/meta-visionfive2/recipes-kernel/linux/linux-visionfive2.inc index 34269afb86dec888f667d28488e67907a6c0b534..27920d923367a696342e67998151ac4b8632f488 100755 --- a/bsp/meta-visionfive2/recipes-kernel/linux/linux-visionfive2.inc +++ b/bsp/meta-visionfive2/recipes-kernel/linux/linux-visionfive2.inc @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_append := "${THISDIR}/files/:" +FILESEXTRAPATHS:append := "${THISDIR}/files/:" -SRC_URI_append = " \ +SRC_URI:append = " \ file://config \ file://patch/0001-support-jh7110-starfive.patch \ " diff --git a/docs/source/bsp/add_new_bsp_layer.rst b/docs/source/bsp/add_new_bsp_layer.rst index 5b77d403a05e5d3c95f598194785db6d0f8aea1b..b008d00ede0cc32715e6e9be0777bb2c30d55102 100644 --- a/docs/source/bsp/add_new_bsp_layer.rst +++ b/docs/source/bsp/add_new_bsp_layer.rst @@ -132,7 +132,7 @@ bsp_root_name.conf 文件示例（from Poky） GLIBC_ADDONS = "nptl" - EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" + EXTRA_OECONF:append:pn-matchbox-panel-2 = " --with-battery=acpi" IMAGE_FSTYPES += "wic wic.bmap" WKS_FILE ?= "genericx86.wks.in" diff --git a/docs/source/develop_help/qemu/qemu_monitor.rst b/docs/source/develop_help/qemu/qemu_monitor.rst index 56adb56ea04319d2ffeded1c7de5ba4071e0e858..0311f89c6810f6bd1f7c15b78963682d9d0cd4ee 100644 --- a/docs/source/develop_help/qemu/qemu_monitor.rst +++ b/docs/source/develop_help/qemu/qemu_monitor.rst @@ -15,7 +15,7 @@ QEMU控制台，即QEMU monitor，是在QEMU模拟器运行时为其提供各种 acl_add aclname match allow|deny [index] -- add a match rule to the access control list acl_policy aclname allow|deny -- set default access control list policy - acl_remove aclname match -- remove a match rule from the access control list + acl:remove aclname match -- remove a match rule from the access control list acl_reset aclname -- reset the access control list acl_show aclname -- list rules in the access control list announce_self [interfaces] [id] -- Trigger GARP/RARP announcements diff --git a/docs/source/features/armnn.rst b/docs/source/features/armnn.rst index cfbda00101a441595eb0372be24cbcd333d79bfa..d7c5056d3fd3c8e533691a119a8a426963251b32 100644 --- a/docs/source/features/armnn.rst +++ b/docs/source/features/armnn.rst @@ -35,11 +35,11 @@ ArmNN软件兼容 yocto-meta-openeuler 上做了很多准备工作，如 tensorf **步骤1** - 修改meta-openeuler/recipes-core/packagegroups/packagegroup-base.bb 文件，在 RDEPENDS_packagegroup-base 中加入 armnn 包： + 修改meta-openeuler/recipes-core/packagegroups/packagegroup-base.bb 文件，在 RDEPENDS:packagegroup-base 中加入 armnn 包： .. code-block:: console - RDEPENDS_packagegroup-base = " \ + RDEPENDS:packagegroup-base = " \ acl \ armnn \ attr \ diff --git a/docs/source/features/lopper_devicetree.rst b/docs/source/features/lopper_devicetree.rst index 41d71908e859c68a5a521ad01468d82f068d1f45..8835c7bc20dcfc777666e2358eef2e5143ba1e8a 100644 --- a/docs/source/features/lopper_devicetree.rst +++ b/docs/source/features/lopper_devicetree.rst @@ -33,7 +33,7 @@ ____ $ cat lopper-ops.bbappend # Use the operation files from current layer - FILESEXTRAPATHS_prepend := "${THISDIR}/:" + FILESEXTRAPATHS:prepend := "${THISDIR}/:" ``lops`` 用于放置用户自定义的配置文件，这些配置文件统一用device-tree格式描述，但是有单独的语法， 用于描述关于输入设备树的操作，包括：修改（删除）某个设备节点；添加自定义节点；提取部分节点并生成新的设备树等。 @@ -79,7 +79,7 @@ ____ DEPENDS += "foo-A" # get the serial-for-zephyr.dts - do_configure_append() { + do_configure:append() { cp ${WORKDIR}/recipe-sysroot/lop_dts/serial-for-zephyr.dts ${B}/ } diff --git a/docs/source/infrastructure/openeuler_fetch/index.rst b/docs/source/infrastructure/openeuler_fetch/index.rst index 04f68dbbe43b874d9c5b92e941c080ada754b1ce..e2bb6e05d71a02f943ad037c32c2cfa98384c6ed 100644 --- a/docs/source/infrastructure/openeuler_fetch/index.rst +++ b/docs/source/infrastructure/openeuler_fetch/index.rst @@ -12,7 +12,7 @@ openeuler_fetch运行机制 *************************** -openeuler_fetch在classes/openeuler.bbclass中实现，函数名为do_openeuler_fetch，该函数在base_do_fetch_prepend中通过bb.build.exec_func()函数调用，即openeuler_fetch运行完还会继续执行do_fetch，这样做的原因是不管openeuler_fetch运行成功与否都可以让fetch继续补充，例如有一款软件包在gitee中不存在，或在配置中配置错误，或者源码目录有相关的改动导致openeuler_fetch运行失败，不用担心，do_fetch可以继续完成文件的查找。 +openeuler_fetch在classes/openeuler.bbclass中实现，函数名为do_openeuler_fetch，该函数在base_do_fetch:prepend中通过bb.build.exec_func()函数调用，即openeuler_fetch运行完还会继续执行do_fetch，这样做的原因是不管openeuler_fetch运行成功与否都可以让fetch继续补充，例如有一款软件包在gitee中不存在，或在配置中配置错误，或者源码目录有相关的改动导致openeuler_fetch运行失败，不用担心，do_fetch可以继续完成文件的查找。 openeuler_fetch运行逻辑 *************************** @@ -54,12 +54,12 @@ repo_init 运行原理图如下： - 如果需要其他代码仓的busybox参与构建，则修改OPENEULER_GIT_URL为其他平台仓域名即可，例如https://github.com/xxx -- 另外，当构建busybox时需要的依赖并不会是某一款特定包，即不能直接通过depends添加依赖，而仅仅是需要某个路径下的文件，此时需要在bbappend中添加do_fetch_prepend，在该函数中添加需要依赖的包，例如： +- 另外，当构建busybox时需要的依赖并不会是某一款特定包，即不能直接通过depends添加依赖，而仅仅是需要某个路径下的文件，此时需要在bbappend中添加do_fetch:prepend，在该函数中添加需要依赖的包，例如： :: - python do_fetch_prepend() { + python do_fetch:prepend() { repoList = [{ "repo_name": "yocto-embedded-tools", "git_url": "https://gitee.com/openeuler", diff --git a/docs/source/yocto/addpackage_guide.rst b/docs/source/yocto/addpackage_guide.rst index 92f4d531695a4e73e73c4f37f022ae044ec34e0d..76b5d1aeb3fe94cd9183583f022cab70ff991fa6 100644 --- a/docs/source/yocto/addpackage_guide.rst +++ b/docs/source/yocto/addpackage_guide.rst @@ -40,8 +40,8 @@ OPENEULER_REPO_NAME = "仓库具体命名" PV = "版本号" - SRC_URI_remove = "原源码链接" - SRC_URI_prepend = "file://源码包 \ + SRC_URI:remove = "原源码链接" + SRC_URI:prepend = "file://源码包 \ " SRC_URI[sha256sum] = "校验码" //执行 sha256sum 源码包 S = "${WORKDIR}/${BP}" //BP变量表示软件名-版本号，如果不符合则需要修改 @@ -67,7 +67,7 @@ .. code-block:: console - RDEPENDS_${PN} += "audit" + RDEPENDS:${PN} += "audit" 6. **构建镜像** diff --git a/docs/source/yocto/exploration.rst b/docs/source/yocto/exploration.rst index d98b54e2e72ea438ad534e3791abdaf4fa37635c..2dd4f59dbadd47b65d985c77199b593b94e92557 100644 --- a/docs/source/yocto/exploration.rst +++ b/docs/source/yocto/exploration.rst @@ -446,7 +446,7 @@ do_packagedata任务基于分析创建包元数据，包元数据保存在 PKGDA **FILES_xx** : - 变量的默认值也在bitbake.conf中。也可以自定义，例如： FILES_${PN} += "${bindir}/mydir1 ${bindir}/mydir2/myfile"。FILES中指定文件或路径时，可以 + 变量的默认值也在bitbake.conf中。也可以自定义，例如： FILES:${PN} += "${bindir}/mydir1 ${bindir}/mydir2/myfile"。FILES中指定文件或路径时，可以 使用Python的glob语法进行模式匹配。将路径指定为FILES变量的一部分时，最好使用适当的路径变量（meta/conf/bitbake.conf中查找）。例如，使用${sysconfdir}而 不是/etc，或${bindir}而不是 /usr/bin。 @@ -518,12 +518,12 @@ do_install任务安装的文件子集由SYSROOT_DIRS变量定义的do_populate_s ${datadir} \ " -**SYSROOT_DIRS_BLACKLIST** ： +**SYSROOT_DIRS_IGNORE** ： 不通过 do_populate_sysroot 任务暂存到 sysroot 中的目录。可以使用此变量从暂存中排除 SYSROOT_DIRS 中列出的目录的某些子目录。默认情况下，以下目录不会暂存： :: - SYSROOT_DIRS_BLACKLIST = " \ + SYSROOT_DIRS_IGNORE = " \ ${mandir} \ ${docdir} \ ${infodir} \ @@ -675,10 +675,10 @@ image创建涉及的最后一个任务是do_image_complete任务。此任务通 * do_deploy -* do_pkg_postinst_${PN} +* do_pkg_postinst:${PN} pkg_postinst脚本在构建只读rootfs时执行。但是,必须确保在脚本中调用的命令在构建主机中可用,否则脚本的执行将失败,并且将推迟到设备上的首次启动。 -pkg_postinst脚本在目标上安装软件包后立即运行，或者在image中包含软件包时在image创建期间运行。要将pkg_postinst脚本添加到包中，请将pkg_postinst_${PN}() +pkg_postinst脚本在目标上安装软件包后立即运行，或者在image中包含软件包时在image创建期间运行。要将pkg_postinst脚本添加到包中，请将pkg_postinst:${PN}() 函数添加到配方文件(.bb) 并将 ${PN}替换为要附加到postinst脚本的包的名称。 在创建根文件系统时调用在pkg_postinst函数中定义的脚本。如果脚本成功，则包被标记为已安装。在目标上运行的任何RPM安装后脚本都应返回0退出代码。 @@ -732,21 +732,21 @@ Yocto的任务实际就是一个shell或者python函数。 :: - do_install_prepend() { + do_install:prepend() { } 修改do_install任务, 在do_install任务最后增加操作: :: - do_install_append() { + do_install:append() { } 修改do_install任务,在arm架构的do_install任务最后增加操作: :: - do_install_append_arm() { + do_install:append:arm() { } 删除编译任务，编译任务不存在，也不会执行: @@ -878,12 +878,12 @@ Yocto的任务实际就是一个shell或者python函数。 BAR += "bar 2" FOO以值“foo 2”结束，BAR 以值“bar 1 bar 2”结束。就像在第二个片段中一样，为匿名函数中的变量设置的值对任务可用，这些任务总是在解析后运行。 -在匿名函数运行之前应用覆盖和覆盖样式的运算符，例如“_append”。在以下示例中，FOO 以“来自匿名的 foo”的值结束： +在匿名函数运行之前应用覆盖和覆盖样式的运算符，例如“:append”。在以下示例中，FOO 以“来自匿名的 foo”的值结束： :: FOO = "foo" - FOO_append = " from outside" + FOO:append = " from outside" python () { d.setVar("FOO", "foo from anonymous") @@ -1023,7 +1023,7 @@ layer.conf中要配置成不一样的值。最简单的方法是将现有的层 "当”:”前的层openembedded-layer可用时，则meta-A层的dynamic-layers/openembedded-layer/下的 bb或者bbappend生效，否则默认不生效。这类bb的目录结构必须不在BBFILES指定的目录结构下，否则默认就会被引入，无法达到效果。 -LAYERDEPENDS_security += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "gnome-layer xfce-layer", "", d)}" +LAYERDEPENDS:security += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "gnome-layer xfce-layer", "", d)}" conf/distro/${DISTRO}.conf diff --git a/docs/source/yocto/oebuild.rst b/docs/source/yocto/oebuild.rst index d07edc4a52763b5c54e637bb9ef1708e0efb4c7a..5429f0d776f0f62e0d22586811bc12032143b456 100644 --- a/docs/source/yocto/oebuild.rst +++ b/docs/source/yocto/oebuild.rst @@ -514,7 +514,7 @@ compile.yaml platform: aarch64-std machine: qemu-aarch64 - toolchain_type: EXTERNAL_TOOLCHAIN_aarch64 + toolchain_type: EXTERNAL_TOOLCHAIN:aarch64 sdk_dir: toolchain_dir: repos: diff --git a/docs/source/yocto/sstate.rst b/docs/source/yocto/sstate.rst index 6248e001e93b378963f73fbcb24c240f45d73127..3d8507e8568b8995045a95772c3cc2a74a5b3042 100644 --- a/docs/source/yocto/sstate.rst +++ b/docs/source/yocto/sstate.rst @@ -19,12 +19,12 @@ yocto默认继承了sstate类，sstate机制将SSTATETASKS定义的任务指定 SSTATE_DIR：指向共享缓存所在目录，默认为"${TOPDIR}/sstate-cache"； SSTATE_MIRRORS：共享缓存镜像机制，可以从镜像指定位置实时获取缓存； BB_HASHEXCLUDE_COMMON：一些不被计算到hash值的公共变量，参与组成其他字节； - BB_HASHBASE_WHITELIST：列出从校验和和相关性数据中排除的变量；由BB_HASHEXCLUDE_COMMON和其他值组成； + BB_BASEHASH_IGNORE_VARS：列出从校验和和相关性数据中排除的变量；由BB_HASHEXCLUDE_COMMON和其他值组成； BB_HASHCONFIG_WHITELIST：列出从基本配置校验和中排除的变量；由BB_HASHEXCLUDE_COMMON和其他值组成； BB_SIGNATURE_EXCLUDE_FLAGS：一些不被计算到hash值的公共变量标志，如果是任务标志，则 prefuncs、postfuncs、exports 等会对hash值有影响；具体要分析底层python脚本。 vardepsexclude与vardeps标志：使字节或任务计算校验和时不依赖或依赖对应变量。 -BB_HASHEXCLUDE_COMMON是BB_HASHBASE_WHITELIST和BB_HASHCONFIG_WHITELIST的公共组成部分，因此可以修改BB_HASHEXCLUDE_COMMON对两者同时产生影响。 +BB_HASHEXCLUDE_COMMON是BB_BASEHASH_IGNORE_VARS和BB_HASHCONFIG_WHITELIST的公共组成部分，因此可以修改BB_HASHEXCLUDE_COMMON对两者同时产生影响。 @@ -157,8 +157,8 @@ sstate 使用效果 sstate应用过程中解决的疑难问题 ################################# -在初步复用sstate的过程中，总是频繁触发重新构建，最初定位是工具链缓存复用的问题，通过使用bitbake-diffsigs工具具体定位到是工具链gcc-runtime-external包构建时的do_install任务在postfuncs标志下的do_install_appended任务的校验和会随着构建目录改变而改变。 -根因是gcc-runtime-external的一个匿名函数使用replace函数修改了do_install_appended的内容导致校验和会随构建目录改变而改变，当前只能让do_install任务的校验和不受do_install_appended影响以复用缓存。 +在初步复用sstate的过程中，总是频繁触发重新构建，最初定位是工具链缓存复用的问题，通过使用bitbake-diffsigs工具具体定位到是工具链gcc-runtime-external包构建时的do_install任务在postfuncs标志下的do_install:appended任务的校验和会随着构建目录改变而改变。 +根因是gcc-runtime-external的一个匿名函数使用replace函数修改了do_install:appended的内容导致校验和会随构建目录改变而改变，当前只能让do_install任务的校验和不受do_install:appended影响以复用缓存。 diff --git a/meta-clang/conf/layer.conf b/meta-clang/conf/layer.conf index 25cd41e56ffa6391550556a1ae3b34fd4975894c..98b784cd04c39d9dd029ae172ae8596079e19bf8 100644 --- a/meta-clang/conf/layer.conf +++ b/meta-clang/conf/layer.conf @@ -7,8 +7,8 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend" BBFILE_COLLECTIONS += "clang-layer" BBFILE_PATTERN_clang-layer := "^${LAYERDIR}/" BBFILE_PRIORITY_clang-layer = "7" -LAYERSERIES_COMPAT_clang-layer = "hardknott kirkstone langdale" -LAYERDEPENDS_clang-layer = "core" +LAYERSERIES_COMPAT_clang-layer = "kirkstone" +LAYERDEPENDS:clang-layer = "core" BBFILES_DYNAMIC += " \ browser-layer:${LAYERDIR}/dynamic-layers/browser-layer/*/*.bb \ diff --git a/meta-clang/dynamic-layers/selinux/android-tools/android-tools_10.0.0.r36.bb b/meta-clang/dynamic-layers/selinux/android-tools/android-tools_10.0.0.r36.bb index 7fa7e308e9d843521ff3b595fa8cfc7136ff0534..855451749f84fa4c06ed3d2585c30d4fcbde7199 100644 --- a/meta-clang/dynamic-layers/selinux/android-tools/android-tools_10.0.0.r36.bb +++ b/meta-clang/dynamic-layers/selinux/android-tools/android-tools_10.0.0.r36.bb @@ -28,7 +28,7 @@ SRC_URI = " \ git://salsa.debian.org/android-tools-team/android-platform-external-libunwind.git;protocol=https;name=libunwind;nobranch=1;destsuffix=git/external/libunwind \ file://adb_mk_change_out_dir.patch \ file://libadb_mk_change_out_dir.patch \ - file://fastboot_compile_remove_gtest.patch \ + file://fastboot_compile:remove:gtest.patch \ file://fastboot_mk_change_out_dir.patch \ file://fastboot_dont_use_sparse_file_import_auto_in_load_buf_fd.patch \ file://libbase_mk_change_out_dir.patch \ diff --git a/meta-clang/recipes-devtools/clang/clang/0024-compiler-rt-Link-scudo-with-SANITIZER_CXX_ABI_LIBRAR.patch b/meta-clang/recipes-devtools/clang/clang/0024-compiler-rt-Link-scudo-with-SANITIZER_CXX_ABI_LIBRAR.patch index 02203b7644d712a139924ef3a5fe5f2763d19573..02a289c3e76524bf3cab68f25179c5dcd6459c64 100644 --- a/meta-clang/recipes-devtools/clang/clang/0024-compiler-rt-Link-scudo-with-SANITIZER_CXX_ABI_LIBRAR.patch +++ b/meta-clang/recipes-devtools/clang/clang/0024-compiler-rt-Link-scudo-with-SANITIZER_CXX_ABI_LIBRAR.patch @@ -18,11 +18,11 @@ diff --git a/compiler-rt/lib/scudo/CMakeLists.txt b/compiler-rt/lib/scudo/CMakeL index 31a6976960f7..8f3e291960b0 100644 --- a/compiler-rt/lib/scudo/CMakeLists.txt +++ b/compiler-rt/lib/scudo/CMakeLists.txt -@@ -15,6 +15,7 @@ append_list_if(COMPILER_RT_HAS_LIBDL dl SCUDO_MINIMAL_DYNAMIC_LIBS) - append_list_if(COMPILER_RT_HAS_LIBRT rt SCUDO_MINIMAL_DYNAMIC_LIBS) - append_list_if(COMPILER_RT_HAS_LIBPTHREAD pthread SCUDO_MINIMAL_DYNAMIC_LIBS) - append_list_if(COMPILER_RT_HAS_LIBLOG log SCUDO_MINIMAL_DYNAMIC_LIBS) -+append_list_if(SANITIZER_CXX_ABI_LIBRARIES ${SANITIZER_CXX_ABI_LIBRARIES} SCUDO_MINIMAL_DYNAMIC_LIBS) - append_list_if(COMPILER_RT_HAS_OMIT_FRAME_POINTER_FLAG -fno-omit-frame-pointer +@@ -15,6 +15,7 @@ append:list_if(COMPILER_RT_HAS_LIBDL dl SCUDO_MINIMAL_DYNAMIC_LIBS) + append:list_if(COMPILER_RT_HAS_LIBRT rt SCUDO_MINIMAL_DYNAMIC_LIBS) + append:list_if(COMPILER_RT_HAS_LIBPTHREAD pthread SCUDO_MINIMAL_DYNAMIC_LIBS) + append:list_if(COMPILER_RT_HAS_LIBLOG log SCUDO_MINIMAL_DYNAMIC_LIBS) ++append:list_if(SANITIZER_CXX_ABI_LIBRARIES ${SANITIZER_CXX_ABI_LIBRARIES} SCUDO_MINIMAL_DYNAMIC_LIBS) + append:list_if(COMPILER_RT_HAS_OMIT_FRAME_POINTER_FLAG -fno-omit-frame-pointer SCUDO_CFLAGS) diff --git a/meta-clang/recipes-devtools/clang/clang/0025-libunwind-Added-unw_backtrace-method.patch b/meta-clang/recipes-devtools/clang/clang/0025-libunwind-Added-unw_backtrace-method.patch index 597c0654635dd3cab0400d979214c6737fdd473d..79e963515a871e6e04e87c4d114820352a225261 100644 --- a/meta-clang/recipes-devtools/clang/clang/0025-libunwind-Added-unw_backtrace-method.patch +++ b/meta-clang/recipes-devtools/clang/clang/0025-libunwind-Added-unw_backtrace-method.patch @@ -27,7 +27,7 @@ diff --git a/libunwind/src/libunwind.cpp b/libunwind/src/libunwind.cpp index b8b41ff25e54..ca7d9a01e631 100644 --- a/libunwind/src/libunwind.cpp +++ b/libunwind/src/libunwind.cpp -@@ -338,7 +338,25 @@ void __unw_remove_dynamic_eh_frame_section(unw_word_t eh_frame_start) { +@@ -338,7 +338,25 @@ void __unw:remove:dynamic_eh_frame_section(unw_word_t eh_frame_start) { #endif // defined(_LIBUNWIND_SUPPORT_DWARF_UNWIND) #endif // !defined(__USING_SJLJ_EXCEPTIONS__) diff --git a/meta-musl/conf/layer.conf b/meta-musl/conf/layer.conf index d11a43e74db4dbec23e23cc458b8bf93723351a4..00f08fbfe960c245ee4d1fbc394638427738ecab 100644 --- a/meta-musl/conf/layer.conf +++ b/meta-musl/conf/layer.conf @@ -9,13 +9,13 @@ BBFILE_COLLECTIONS += "openeuler-musl" BBFILE_PATTERN_openeuler-musl = "^${LAYERDIR}/" BBFILE_PRIORITY_openeuler-musl = "25" -LAYERSERIES_COMPAT_openeuler-musl = "hardknott" +LAYERSERIES_COMPAT_openeuler-musl = "kirkstone" # This should only be incremented on significant changes that will # cause compatibility issues with other layers LAYERVERSION_openeuler-musl = "13" -LAYERDEPENDS_openeuler-musl = "core" +LAYERDEPENDS:openeuler-musl = "core" REQUIRED_POKY_BBLAYERS_CONF_VERSION = "2" diff --git a/meta-musl/recipes-connectivity/iproute2/iproute2_%.bbappend b/meta-musl/recipes-connectivity/iproute2/iproute2_%.bbappend index 2008f9dcad29ae2a1746bb969b228562dd6aa7a9..0f8c6135b6b5144a77ed4501f9bd1201c7c8d15a 100644 --- a/meta-musl/recipes-connectivity/iproute2/iproute2_%.bbappend +++ b/meta-musl/recipes-connectivity/iproute2/iproute2_%.bbappend @@ -1,5 +1,5 @@ # add patch to support musl -FILESEXTRAPATHS_prepend := "${THISDIR}/iproute2:" -SRC_URI_append =" \ +FILESEXTRAPATHS:prepend := "${THISDIR}/iproute2:" +SRC_URI:append =" \ file://missing-include.patch \ " diff --git a/meta-musl/recipes-core/dsoftbus/dsoftbus_%.bbappend b/meta-musl/recipes-core/dsoftbus/dsoftbus_%.bbappend index 920ae5c3d9aea3d65572e69145ab74f2966509fc..99eb34b789551e0d7a4539e3e11f792198840d0c 100644 --- a/meta-musl/recipes-core/dsoftbus/dsoftbus_%.bbappend +++ b/meta-musl/recipes-core/dsoftbus/dsoftbus_%.bbappend @@ -1,11 +1,11 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" # add patch to support musl -SRC_URI_append = " \ +SRC_URI:append = " \ file://change-musl-toolchain.patch;patchdir=${S}/build \ " -SRC_URI_append_toolchain-clang = " \ +SRC_URI:append:toolchain-clang = " \ file://musl-clang.patch;patchdir=${S}/build \ " -SRC_URI_remove_toolchain-clang = " \ +SRC_URI:remove:toolchain-clang = " \ file://0001-change-toolchain-for-clang-build.patch;patchdir=${S}/build \ " diff --git a/meta-musl/recipes-core/isulad/isulad_%.bbappend b/meta-musl/recipes-core/isulad/isulad_%.bbappend index d0d9b09d85f7e50f99335248321b650a64728c9c..bb42d17ae501b2a3ed4bec1f5e5ce6b38b96d63a 100644 --- a/meta-musl/recipes-core/isulad/isulad_%.bbappend +++ b/meta-musl/recipes-core/isulad/isulad_%.bbappend @@ -1,7 +1,7 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" # add gcompat DEPENDS to support musl -DEPENDS_append = " gcompat " +DEPENDS:append = " gcompat " -SRC_URI_append = " \ +SRC_URI:append = " \ file://isulad-musl.patch \ " diff --git a/meta-musl/recipes-core/lcr/lcr_%.bbappend b/meta-musl/recipes-core/lcr/lcr_%.bbappend index 02ca0fd6a374b8ed8f24442c9367748e73281f9d..02027be267fa453a92d62432d8ea7ae3800d0e68 100644 --- a/meta-musl/recipes-core/lcr/lcr_%.bbappend +++ b/meta-musl/recipes-core/lcr/lcr_%.bbappend @@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" # add patch to support musl -SRC_URI_append = " \ +SRC_URI:append = " \ file://lcr-for-musl.patch \ " diff --git a/meta-musl/recipes-core/libhugetlbfs/libhugetlbfs_%.bbappend b/meta-musl/recipes-core/libhugetlbfs/libhugetlbfs_%.bbappend index 4003266a36eedfd0b8acfb4eb4e337e67f7ae0e2..cf5bfe357efd258d348260c6c791fde0f26a89fc 100644 --- a/meta-musl/recipes-core/libhugetlbfs/libhugetlbfs_%.bbappend +++ b/meta-musl/recipes-core/libhugetlbfs/libhugetlbfs_%.bbappend @@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" # add patch to support musl -SRC_URI_append = " \ +SRC_URI:append = " \ file://libhugetlbfs-musl.patch \ " diff --git a/meta-musl/recipes-core/libpwquality/libpwquality_%.bbappend b/meta-musl/recipes-core/libpwquality/libpwquality_%.bbappend index 0373702dedfd6d45e9cdc556a315ddba13eba913..7d03018aab6a73d4ef48df9e7871cc2f9a09eb9d 100644 --- a/meta-musl/recipes-core/libpwquality/libpwquality_%.bbappend +++ b/meta-musl/recipes-core/libpwquality/libpwquality_%.bbappend @@ -1,10 +1,12 @@ -DEPENDS_append ="\ +# main bb file: yocto-meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.4.bb + +DEPENDS:append ="\ gcompat \ " -LDFLAGS_append = " -lgcompat" +LDFLAGS:append = " -lgcompat" #add patch to support musl -FILESEXTRAPATHS_prepend := "${THISDIR}/libpwquality/:" -SRC_URI_append = " \ +FILESEXTRAPATHS:prepend := "${THISDIR}/libpwquality/:" +SRC_URI:append = " \ file://libpwquality-musl.patch \ " diff --git a/meta-musl/recipes-core/lvm2/libdevmapper_%.bbappend b/meta-musl/recipes-core/lvm2/libdevmapper_%.bbappend index f846d56b7e7c2e5035329a0d01cdaae165e76585..d8ed896edf9e2a0cbe6e2c1dc02dba45180537ba 100644 --- a/meta-musl/recipes-core/lvm2/libdevmapper_%.bbappend +++ b/meta-musl/recipes-core/lvm2/libdevmapper_%.bbappend @@ -1,10 +1,10 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" -DEPENDS_append ="\ +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" +DEPENDS:append ="\ gcompat \ " -LDFLAGS_append = " -lgcompat" +LDFLAGS:append = " -lgcompat" # add patch to support musl -SRC_URI_append =" \ +SRC_URI:append =" \ file://add_header.patch \ file://use_lgcompat.patch \ " diff --git a/meta-musl/recipes-core/lvm2/lvm2_%.bbappend b/meta-musl/recipes-core/lvm2/lvm2_%.bbappend index f846d56b7e7c2e5035329a0d01cdaae165e76585..d8ed896edf9e2a0cbe6e2c1dc02dba45180537ba 100644 --- a/meta-musl/recipes-core/lvm2/lvm2_%.bbappend +++ b/meta-musl/recipes-core/lvm2/lvm2_%.bbappend @@ -1,10 +1,10 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" -DEPENDS_append ="\ +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" +DEPENDS:append ="\ gcompat \ " -LDFLAGS_append = " -lgcompat" +LDFLAGS:append = " -lgcompat" # add patch to support musl -SRC_URI_append =" \ +SRC_URI:append =" \ file://add_header.patch \ file://use_lgcompat.patch \ " diff --git a/meta-musl/recipes-core/lxc/lxc/lxc-for-musl.patch b/meta-musl/recipes-core/lxc/lxc/lxc-for-musl.patch index 855e473d892ad758adea50b2268bec6ddb3e58a6..8bf5917391f435377e4941886236fc2db9872b99 100644 --- a/meta-musl/recipes-core/lxc/lxc/lxc-for-musl.patch +++ b/meta-musl/recipes-core/lxc/lxc/lxc-for-musl.patch @@ -39,7 +39,7 @@ index 67c2df8..17fa272 100755 }; yajl_gen_status reformat_number(void *ctx, const char *str, size_t len); -@@ -191,4 +191,4 @@ int append_json_map_string_string(json_map_string_string *map, const char *key, +@@ -191,4 +191,4 @@ int append:json_map_string_string(json_map_string_string *map, const char *key, } #endif diff --git a/meta-musl/recipes-core/lxc/lxc_%.bbappend b/meta-musl/recipes-core/lxc/lxc_%.bbappend index 33ea664159f77015482ffed6cad007fcda74bd5d..a6a6f940b6ff2cfb14187ee999d84c5ac2e3fee9 100644 --- a/meta-musl/recipes-core/lxc/lxc_%.bbappend +++ b/meta-musl/recipes-core/lxc/lxc_%.bbappend @@ -1,16 +1,16 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" -DEPENDS_append ="\ +DEPENDS:append ="\ gcompat \ " -SRC_URI_append = " \ +SRC_URI:append = " \ file://lxc-for-musl.patch \ " -CFLAGS_append = " -Wno-error=address -Wno-error=array-bounds -Wno-array-bounds " -CFLAGS_append_toolchain-clang = " -Wno-error=cast-align " -LDFLAGS_append = " -lgcompat" -do_compile_prepend() { +CFLAGS:append = " -Wno-error=address -Wno-error=array-bounds -Wno-array-bounds " +CFLAGS:append:toolchain-clang = " -Wno-error=cast-align " +LDFLAGS:append = " -lgcompat" +do_compile:prepend() { sed -i "s/init_lxc_static_LDFLAGS = -all-static -pthread/init_lxc_static_LDFLAGS = -pthread/" ${S}/src/lxc/Makefile.am } diff --git a/meta-musl/recipes-core/packagegroups/packagegroup-pam-plugins.bbappend b/meta-musl/recipes-core/packagegroups/packagegroup-pam-plugins.bbappend index f6cd81222adc78dbec6dee074cd329989d77c00b..62a50ea505a58ecca145799cfcf936a423e7815a 100644 --- a/meta-musl/recipes-core/packagegroups/packagegroup-pam-plugins.bbappend +++ b/meta-musl/recipes-core/packagegroups/packagegroup-pam-plugins.bbappend @@ -1,5 +1,5 @@ # remove them because of the lack of ruserok_af and logwtmp functions -RDEPENDS_${PN}_remove = "\ +RDEPENDS:${PN}:remove = "\ pam-plugin-lastlog \ pam-plugin-rhosts \ " diff --git a/meta-musl/recipes-core/selinux/libselinux_%.bbappend b/meta-musl/recipes-core/selinux/libselinux_%.bbappend index e79b4d9d4451edb76ba86f641c5f966bdc8adef8..65b7cda97373de0da4d30e3fcd70a75e11e04cb2 100644 --- a/meta-musl/recipes-core/selinux/libselinux_%.bbappend +++ b/meta-musl/recipes-core/selinux/libselinux_%.bbappend @@ -1,7 +1,7 @@ -DEPENDS_append = " gcompat " +DEPENDS:append = " gcompat " DEPENDS += "${@bb.utils.contains('LIBC', 'musl', 'fts', '', d)}" -do_configure_prepend () { +do_configure:prepend () { if ! grep -q "-lfts" ${S}/src/Makefile ; then sed -i 's/FTS_LDLIBS ?=/FTS_LDLIBS ?= -lfts/' ${S}/src/Makefile; fi if ! grep -q "MU_LDLIBS" ${S}/src/Makefile; then diff --git a/meta-musl/recipes-devtools/binutils/binutils_%.bbappend b/meta-musl/recipes-devtools/binutils/binutils_%.bbappend index 97008cb695e062859469e1507418b8c1cda97345..d97409831adafa12af02fc127af625ed04d79659 100644 --- a/meta-musl/recipes-devtools/binutils/binutils_%.bbappend +++ b/meta-musl/recipes-devtools/binutils/binutils_%.bbappend @@ -1,5 +1,5 @@ # add patch to support musl -FILESEXTRAPATHS_prepend := "${THISDIR}/binutils/:" -SRC_URI_append = " \ +FILESEXTRAPATHS:prepend := "${THISDIR}/binutils/:" +SRC_URI:append = " \ file://use-static_cast.patch \ " diff --git a/meta-musl/recipes-devtools/elfutils/elfutils_%.bbappend b/meta-musl/recipes-devtools/elfutils/elfutils_%.bbappend index f4b19b663bf7f4eaa8bb2aa7f3b5ce7becba3227..ec734dea572d40e9283cb783e75a1ab73b0e6e34 100644 --- a/meta-musl/recipes-devtools/elfutils/elfutils_%.bbappend +++ b/meta-musl/recipes-devtools/elfutils/elfutils_%.bbappend @@ -1,4 +1,4 @@ # delete conflict patches from poky -SRC_URI_remove += " \ +SRC_URI:remove = " \ file://0002-musl-libs.patch \ " diff --git a/meta-musl/recipes-extended/procps/procps_%.bbappend b/meta-musl/recipes-extended/procps/procps_%.bbappend index 34a2dadaa65bb7a4213fa2c29da7c1e8ff012b48..0daf80e9198d12642cd25cbe6c933d62333caac2 100644 --- a/meta-musl/recipes-extended/procps/procps_%.bbappend +++ b/meta-musl/recipes-extended/procps/procps_%.bbappend @@ -5,13 +5,13 @@ PV = "4.0.2" S = "${WORKDIR}/procps-ng-${PV}" -FILESEXTRAPATHS_append := "${THISDIR}/procps/:" +FILESEXTRAPATHS:append := "${THISDIR}/procps/:" OPENEULER_REPO_NAME = "procps-ng" # files, patches can't be applied in openeuler or conflict with openeuler # files, patches that come from openeuler -SRC_URI_append = " \ +SRC_URI:append = " \ file://procps-musl.patch \ " diff --git a/meta-musl/recipes-external/musl/bsd-headers.bbappend b/meta-musl/recipes-external/musl/bsd-headers.bbappend index e6dc0bea29d3224fd64f3ec31aedf69a9c18de89..9982c7c2e8fe434d2ca538db13482927978f05bf 100644 --- a/meta-musl/recipes-external/musl/bsd-headers.bbappend +++ b/meta-musl/recipes-external/musl/bsd-headers.bbappend @@ -1,11 +1,11 @@ PACKAGES = "${PN}" # add patch to support musl -FILESEXTRAPATHS_prepend := "${THISDIR}/bsd-headers/:" -SRC_URI_append = " \ +FILESEXTRAPATHS:prepend := "${THISDIR}/bsd-headers/:" +SRC_URI:append = " \ file://sys-cdefs-musl.patch \ " -FILES_${PN} = " \ +FILES:${PN} = " \ /usr/* \ " diff --git a/meta-musl/recipes-external/musl/musl_1.2.3.bb b/meta-musl/recipes-external/musl/musl_1.2.3.bb index b4e4591ef28ad27fd89daf3c7d514fe4d1722a93..333140dedfcb773bf155ecf01621362fa11539d1 100644 --- a/meta-musl/recipes-external/musl/musl_1.2.3.bb +++ b/meta-musl/recipes-external/musl/musl_1.2.3.bb @@ -26,7 +26,7 @@ INHIBIT_DEFAULT_DEPS = "1" PR = "r1" INHIBIT_SYSROOT_STRIP = "1" -INSANE_SKIP_${PN} += "already-stripped" +INSANE_SKIP:${PN} += "already-stripped" PSEUDO_DISABLED = "1" @@ -66,7 +66,7 @@ do_package_qa[noexec] = "1" EXCLUDE_FROM_SHLIBS = "1" # In case of conflict -FILES_${PN} = " \ +FILES:${PN} = " \ ${base_libdir}/*.so \ ${base_libdir}/*.so.* \ ${base_sbindir}/ldconfig \ @@ -75,13 +75,13 @@ FILES_${PN} = " \ /usr/lib/* \ ${sysconfdir}/ld-musl-aarch64.path \ " -FILES_${PN}-staticdev = " \ - ${base_libdir}/*.a \ +FILES:${PN}-staticdev = " \ +${base_libdir}/*.a " # Add depend package -RDEPENDS_${PN} += " bsd-headers gcompat gcompat-dev" +RDEPENDS:${PN} += " bsd-headers gcompat gcompat-dev" -INSANE_SKIP_${PN} += "installed-vs-shipped" +INSANE_SKIP:${PN} += "installed-vs-shipped" INSANE_SKIP += "dev-elf dev-so" diff --git a/meta-musl/recipes-support/ethercat/ethercat_e1000e-%.bbappend b/meta-musl/recipes-support/ethercat/ethercat_e1000e-%.bbappend index 5f934b0085378b1fdc9695514659f838a25de6a9..dab1a3445966a818684f6dc0847304e705211f8b 100644 --- a/meta-musl/recipes-support/ethercat/ethercat_e1000e-%.bbappend +++ b/meta-musl/recipes-support/ethercat/ethercat_e1000e-%.bbappend @@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" # add patch to support musl -SRC_URI_append = " \ +SRC_URI:append = " \ file://ethercat_musl.patch \ " diff --git a/meta-musl/recipes-support/libgpg-error/libgpg-error_%.bbappend b/meta-musl/recipes-support/libgpg-error/libgpg-error_%.bbappend index e6ce3d00d962160bc7aec0610e5497f0514c3fa3..be2c7c95eaf11ca49a4c3e66c1f394e39822db96 100644 --- a/meta-musl/recipes-support/libgpg-error/libgpg-error_%.bbappend +++ b/meta-musl/recipes-support/libgpg-error/libgpg-error_%.bbappend @@ -1,7 +1,19 @@ +# the main bb file: yocto-poky/meta/recipes-support/libgpg-error/libgpg-error_1.44.bb + +PV = "1.46" + # patch directary -FILESEXTRAPATHS_append := "${THISDIR}/files/:" +FILESEXTRAPATHS:append := "${THISDIR}/files/:" + +SRC_URI:remove = " \ + ${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ +" # add patch to support musl -SRC_URI_append += " \ +SRC_URI:append = " \ + file://libgpg-error-${PV}.tar.gz \ + file://libgpg-error-1.29-multilib.patch \ file://libgpg-error-musl.patch \ " + +SRC_URI[sha256sum] = "5b724411231f40cb0454250379a9a659e1dda69c161ba8d69f89c7a39a847b7e" diff --git a/meta-openeuler/classes/autotools.bbclass b/meta-openeuler/classes/autotools.bbclass index ee6b5d226022af6e9e9af0ab61e806f8a6f6f5f3..233c05790d17d09a30819f59ca8df5dd8cc26cbf 100644 --- a/meta-openeuler/classes/autotools.bbclass +++ b/meta-openeuler/classes/autotools.bbclass @@ -1,7 +1,7 @@ # openeuler's autotools.bbclass is almost the same as poky's autotools.bbclass except STAGING_DATADIR_NATIVE # is replaced with NATIVESDK_DATADIR. In the future, if the problem of NATIVE and NATIVESDK is fixed, # openeuler's autotools.bbclass can be removed -def autotools_dep_prepend(d): +def get_autotools_dep(d): if d.getVar('INHIBIT_AUTOTOOLS_DEPS'): return '' @@ -22,7 +22,7 @@ def autotools_dep_prepend(d): return deps -DEPENDS_prepend = "${@autotools_dep_prepend(d)} " +DEPENDS:prepend = "${@get_autotools_dep(d)} " NATIVESDK_DATADIR = "${OPENEULER_NATIVESDK_SYSROOT}/usr/share" @@ -136,7 +136,7 @@ autotools_postconfigure(){ EXTRACONFFUNCS ??= "" -EXTRA_OECONF_append = " ${PACKAGECONFIG_CONFARGS}" +EXTRA_OECONF:append = " ${PACKAGECONFIG_CONFARGS}" do_configure[prefuncs] += "autotools_preconfigure autotools_aclocals ${EXTRACONFFUNCS}" do_compile[prefuncs] += "autotools_aclocals" @@ -145,13 +145,16 @@ do_configure[postfuncs] += "autotools_postconfigure" ACLOCALDIR = "${STAGING_DATADIR}/aclocal" ACLOCALEXTRAPATH = "-I ${NATIVESDK_DATADIR}/aclocal/" -ACLOCALEXTRAPATH_class-target = " -I ${NATIVESDK_DATADIR}/aclocal/" -ACLOCALEXTRAPATH_class-nativesdk = " -I ${NATIVESDK_DATADIR}/aclocal/" +ACLOCALEXTRAPATH:class-target = " -I ${NATIVESDK_DATADIR}/aclocal/" +ACLOCALEXTRAPATH:class-nativesdk = " -I ${NATIVESDK_DATADIR}/aclocal/" python autotools_aclocals () { - d.setVar("CONFIG_SITE", siteinfo_get_files(d, sysrootcache=True)) + sitefiles, searched = siteinfo_get_files(d, sysrootcache=True) + d.setVar("CONFIG_SITE", " ".join(sitefiles)) } +do_configure[file-checksums] += "${@' '.join(siteinfo_get_files(d, sysrootcache=False)[1])}" + CONFIGURE_FILES = "${S}/configure.in ${S}/configure.ac ${S}/config.h.in ${S}/acinclude.m4 Makefile.am" autotools_do_configure() { diff --git a/meta-openeuler/classes/blacklist_dynamic.bbclass b/meta-openeuler/classes/blacklist_dynamic.bbclass index 8ebcaf6ad4b488edf7b40abe74450fa07a86130e..c429ed51d85e77686eab1cd467ec5f87e28dbb8b 100644 --- a/meta-openeuler/classes/blacklist_dynamic.bbclass +++ b/meta-openeuler/classes/blacklist_dynamic.bbclass @@ -2,17 +2,15 @@ # multilibs. # # Ex. -# PNBLACKLIST_DYNAMIC += "${MLPREFIX}gcc-cross-${TARGET_ARCH}" -# PNBLACKLIST_DYNAMIC += "gcc-source-${@'${GCCVERSION}'.replace('%', '')}" +# SKIP_RECIPE_DYNAMIC += "${MLPREFIX}gcc-cross-${TARGET_ARCH}" +# SKIP_RECIPE_DYNAMIC += "gcc-source-${@'${GCCVERSION}'.replace('%', '')}" -PNBLACKLIST_DYNAMIC ?= "" - -inherit blacklist +SKIP_RECIPE_DYNAMIC ?= "" python pnblacklist_dynamic_setup () { d = e.data - blacklisted = d.getVar('PNBLACKLIST_DYNAMIC', False) + blacklisted = d.getVar('SKIP_RECIPE_DYNAMIC', False) if not blacklisted.strip(): return @@ -34,10 +32,10 @@ python pnblacklist_dynamic_setup () { localdata.setVar('OVERRIDES', localdata.getVar('OVERRIDES', False) + override) bb.data.update_data(localdata) - to_blacklist |= set(filter(None, localdata.getVar('PNBLACKLIST_DYNAMIC').split())) + to_blacklist |= set(filter(None, localdata.getVar('SKIP_RECIPE_DYNAMIC').split())) for blrecipe in to_blacklist: - d.setVarFlag('PNBLACKLIST', blrecipe, 'blacklisted by PNBLACKLIST_DYNAMIC') + d.setVarFlag('SKIP_RECIPE', blrecipe, 'blacklisted by SKIP_RECIPE_DYNAMIC') } pnblacklist_dynamic_setup[eventmask] = "bb.event.ConfigParsed" addhandler pnblacklist_dynamic_setup diff --git a/meta-openeuler/classes/cargo.bbclass b/meta-openeuler/classes/cargo.bbclass index e5138f3c15f7c57092487524d83afe69720b34ff..566bd84e7e173e1e49373125eb4e2ffff677affb 100644 --- a/meta-openeuler/classes/cargo.bbclass +++ b/meta-openeuler/classes/cargo.bbclass @@ -15,7 +15,7 @@ RUST_BASE_URI := "https://static.rust-lang.org" # Many crates rely on pkg-config to find native versions of their libraries for # linking - do the simple thing and make it generally available. -DEPENDS_append = "\ +DEPENDS:append = "\ cargo-bin-cross-${TARGET_ARCH} \ pkgconfig-native \ " @@ -53,8 +53,8 @@ WRAPPER_DIR = "${WORKDIR}/wrappers" # Set the Cargo manifest path to the typical location CARGO_MANIFEST_PATH ?= "${S}/Cargo.toml" -FILES_${PN}-dev += "${libdir}/*.rlib" -FILES_${PN}-dev += "${libdir}/*.rlib.*" +FILES:${PN}-dev += "${libdir}/*.rlib" +FILES:${PN}-dev += "${libdir}/*.rlib.*" CARGO_BUILD_FLAGS = "\ --verbose \ diff --git a/meta-openeuler/classes/external-toolchain-cross-canadian.bbclass b/meta-openeuler/classes/external-toolchain-cross-canadian.bbclass index 4080bb152777211d447ff8cec419872687350c0b..c956c2fbcf62245b7d422b6b235a2a9b576c34d0 100644 --- a/meta-openeuler/classes/external-toolchain-cross-canadian.bbclass +++ b/meta-openeuler/classes/external-toolchain-cross-canadian.bbclass @@ -3,10 +3,10 @@ inherit external-toolchain cross-canadian # Toolchain binaries are expected to run on both this host and SDKMACHINE, so # we should be able to use host tools. -STRIP_task-package = "strip" -STRIP_task-populate-sysroot = "strip" -OBJCOPY_task-package = "objcopy" -PACKAGE_DEPENDS_remove = "virtual/${TARGET_PREFIX}binutils" +STRIP:task-package = "strip" +STRIP:task-populate-sysroot = "strip" +OBJCOPY:task-package = "objcopy" +PACKAGE_DEPENDS:remove = "virtual/${TARGET_PREFIX}binutils" # Scan just toolchains root directory, but include some additional mirrors EXTERNAL_INSTALL_SOURCE_PATHS = "${EXTERNAL_TOOLCHAIN}" @@ -29,9 +29,9 @@ libdir = "${exec_prefix}/lib64" libexecdir = "${exec_prefix}/libexec" # We're relying on a compatible host libc, not one from a nativesdk build -INSANE_SKIP_${PN} += "build-deps file-rdeps" +INSANE_SKIP:${PN} += "build-deps file-rdeps" -do_install_append () { +do_install:append () { for i in ${D}${bindir}/${EXTERNAL_TARGET_SYS}-*; do if [ -e "$i" ]; then j="$(basename "$i")" @@ -47,12 +47,12 @@ python add_files_links () { full_prefix = os.path.join(d.getVar('bindir'), prefix) new_prefix = d.getVar('TARGET_PREFIX') for pkg in d.getVar('PACKAGES').split(): - files = (d.getVar('FILES_%s' % pkg) or '').split() + files = (d.getVar('FILES:%s' % pkg) or '').split() new_files = [] for f in files: if f.startswith(full_prefix): new_files.append(f.replace(prefix, new_prefix)) if new_files: - d.appendVar('FILES_%s' % pkg, ' ' + ' '.join(new_files)) + d.appendVar('FILES:%s' % pkg, ' ' + ' '.join(new_files)) } do_package[prefuncs] += "add_files_links" diff --git a/meta-openeuler/classes/external-toolchain.bbclass b/meta-openeuler/classes/external-toolchain.bbclass index 9216f4883de165a5ac0bd9fe0cc89cdfe6037dc5..0d71a34caf5e73b877106fc7819d5c636bf090a3 100644 --- a/meta-openeuler/classes/external-toolchain.bbclass +++ b/meta-openeuler/classes/external-toolchain.bbclass @@ -21,7 +21,7 @@ S = "${WORKDIR}" INHIBIT_DEFAULT_DEPS = "1" # Missing build deps don't matter when we don't build anything -INSANE_SKIP_${PN} += "build-deps" +INSANE_SKIP:${PN} += "build-deps" EXTERNAL_PN ?= "${@PN.replace('-external', '')}" PROVIDES += "${EXTERNAL_PN}" @@ -36,14 +36,14 @@ do_compile[noexec] = "1" EXTERNAL_PV_PREFIX ?= "" EXTERNAL_PV_SUFFIX ?= "" -PV_prepend = "${@'${EXTERNAL_PV_PREFIX}' if '${EXTERNAL_PV_PREFIX}' else ''}" -PV_append = "${@'${EXTERNAL_PV_SUFFIX}' if '${EXTERNAL_PV_SUFFIX}' else ''}" +PV:prepend = "${@'${EXTERNAL_PV_PREFIX}' if '${EXTERNAL_PV_PREFIX}' else ''}" +PV:append = "${@'${EXTERNAL_PV_SUFFIX}' if '${EXTERNAL_PV_SUFFIX}' else ''}" EXTERNAL_EXTRA_FILES ?= "" # Skip this recipe if we don't have files in the external toolchain EXTERNAL_AUTO_PROVIDE ?= "0" -EXTERNAL_AUTO_PROVIDE_class-target ?= "1" +EXTERNAL_AUTO_PROVIDE:class-target ?= "1" # We don't care if this path references other variables EXTERNAL_TOOLCHAIN[vardepvalue] = "${EXTERNAL_TOOLCHAIN}" @@ -81,7 +81,7 @@ python () { else: files = oe.external.gather_pkg_files(d) search_patterns.extend(filter(lambda f: '.debug' not in f, files)) - + expanded = oe.external.expand_paths(search_patterns, mirrors, premirrors) paths = oe.external.search_sysroots(expanded, sysroots) if not any(f for p, f in paths): @@ -125,13 +125,13 @@ python external_toolchain_do_install () { bb.build.exec_func('do_install_extra', d) external_toolchain_propagate_mode(d, installdest) } -external_toolchain_do_install[vardeps] += "${@' '.join('FILES_%s' % pkg for pkg in '${PACKAGES}'.split())}" +external_toolchain_do_install[vardeps] += "${@' '.join('FILES:%s' % pkg for pkg in '${PACKAGES}'.split())}" # Change do_install's CWD to EXTERNAL_TOOLCHAIN for convenience do_install[dirs] = "${D} ${EXTERNAL_TOOLCHAIN}" python () { - # Deal with any do_install_append + # Deal with any do_install:append install = d.getVar('do_install', False) try: base, appended = install.split('# Sentinel', 1) @@ -140,31 +140,31 @@ python () { else: d.setVar('do_install', base) if appended.strip(): - d.setVar('do_install_appended', appended) - d.setVarFlag('do_install_appended', 'func', '1') - d.appendVarFlag('do_install', 'postfuncs', ' do_install_appended') + d.setVar('do_install_added', appended) + d.setVarFlag('do_install_added', 'func', '1') + d.appendVarFlag('do_install', 'postfuncs', ' do_install_added') } # Toolchain shipped binaries weren't necessarily built ideally -WARN_QA_remove = "ldflags textrel" -ERROR_QA_remove = "ldflags textrel" +WARN_QA:remove = "ldflags textrel" +ERROR_QA:remove = "ldflags textrel" # Debug files may well have already been split out, or stripped out -INSANE_SKIP_${PN} += "already-stripped" - -RPROVIDES_${PN} += "${EXTERNAL_PN}" -RPROVIDES_${PN}-dev += "${EXTERNAL_PN}-dev" -RPROVIDES_${PN}-staticdev += "${EXTERNAL_PN}-staticdev" -RPROVIDES_${PN}-dbg += "${EXTERNAL_PN}-dbg" -RPROVIDES_${PN}-doc += "${EXTERNAL_PN}-doc" -RPROVIDES_${PN}-locale += "${EXTERNAL_PN}-locale" +INSANE_SKIP:${PN} += "already-stripped" + +RPROVIDES:${PN} += "${EXTERNAL_PN}" +RPROVIDES:${PN}-dev += "${EXTERNAL_PN}-dev" +RPROVIDES:${PN}-staticdev += "${EXTERNAL_PN}-staticdev" +RPROVIDES:${PN}-dbg += "${EXTERNAL_PN}-dbg" +RPROVIDES:${PN}-doc += "${EXTERNAL_PN}-doc" +RPROVIDES:${PN}-locale += "${EXTERNAL_PN}-locale" LOCALEBASEPN = "${EXTERNAL_PN}" -FILES_${PN} = "" -FILES_${PN}-dev = "" -FILES_${PN}-staticdev = "" -FILES_${PN}-doc = "" -FILES_${PN}-locale = "" +FILES:${PN} = "" +FILES:${PN}-dev = "" +FILES:${PN}-staticdev = "" +FILES:${PN}-doc = "" +FILES:${PN}-locale = "" def debug_paths(d): l = d.createCopy() @@ -177,7 +177,7 @@ def debug_paths(d): for p in l.getVar('PACKAGES', True).split(): if p.endswith('-dbg'): continue - for f in (l.getVar('FILES_%s' % p, True) or '').split(): + for f in (l.getVar('FILES:%s' % p, True) or '').split(): if any((f == x or f.startswith(x + '/')) for x in exclude): continue d = os.path.dirname(f) @@ -187,4 +187,4 @@ def debug_paths(d): paths.append('{0}/.debug/{1}.debug'.format(d, b)) return set(paths) -FILES_${PN}-dbg = "${@' '.join(debug_paths(d))}" +FILES:${PN}-dbg = "${@' '.join(debug_paths(d))}" diff --git a/meta-openeuler/classes/image-live.bbclass b/meta-openeuler/classes/image-live.bbclass index 38b3c7f1c181d63d5fd84d6bdfadb5f442cb4b68..e9e4a30832545cc44999d75851a0d52cec9a7737 100644 --- a/meta-openeuler/classes/image-live.bbclass +++ b/meta-openeuler/classes/image-live.bbclass @@ -28,9 +28,8 @@ do_bootimg[depends] += "dosfstools-native:do_populate_sysroot \ mtools-native:do_populate_sysroot \ cdrkit-native:do_populate_sysroot \ virtual/kernel:do_deploy \ - ${@bb.utils.contains("MACHINE_FEATURES", "isohybrid", "syslinux-native:do_populate_sysroot", "", d)} \ - ${@'%s:do_image_%s' % (d.getVar('PN'), d.getVar('LIVE_ROOTFS_TYPE').replace('-', '_')) if d.getVar('ROOTFS') else ''} \ - " + ${@bb.utils.contains("MACHINE_FEATURES", "isohybrid", "syslinux-native:do_populate_sysroot", "", d)} " +# ${@'%s:do_image_%s' % (d.getVar('PN'), d.getVar('LIVE_ROOTFS_TYPE').replace('-', '_')) if d.getVar('ROOTFS') else ''} LABELS_LIVE ?= "boot install" ROOT_LIVE ?= "root=/dev/ram0" @@ -40,9 +39,9 @@ INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.${INITRAMFS_ LIVE_ROOTFS_TYPE ?= "ext4" ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${LIVE_ROOTFS_TYPE}" -IMAGE_TYPEDEP_live = "${LIVE_ROOTFS_TYPE}" -IMAGE_TYPEDEP_iso = "${LIVE_ROOTFS_TYPE}" -IMAGE_TYPEDEP_hddimg = "${LIVE_ROOTFS_TYPE}" +IMAGE_TYPEDEP:live = "${LIVE_ROOTFS_TYPE}" +IMAGE_TYPEDEP:iso = "${LIVE_ROOTFS_TYPE}" +IMAGE_TYPEDEP:hddimg = "${LIVE_ROOTFS_TYPE}" IMAGE_TYPES_MASKED += "live hddimg iso" python() { diff --git a/meta-openeuler/classes/lopper-devicetree.bbclass b/meta-openeuler/classes/lopper-devicetree.bbclass index 93dc249c416325bf532faca3dc450a1565c4e779..cf7e3b0bf350de3e2cd3d0b2e2a76e6829a90bbf 100644 --- a/meta-openeuler/classes/lopper-devicetree.bbclass +++ b/meta-openeuler/classes/lopper-devicetree.bbclass @@ -46,7 +46,7 @@ do_mkdts() { addtask mkdts before do_install after do_compile SYSROOT_DIRS += "${INSTALL_PATH}" -FILES_${PN} = "${INSTALL_PATH}/*.dts" +FILES:${PN} = "${INSTALL_PATH}/*.dts" # install the processed device tree to SYSROOT_DIRS # other recipes can get it in "${WORKDIR}/recipe-sysroot/lop_dts" diff --git a/meta-openeuler/classes/meson.bbclass b/meta-openeuler/classes/meson.bbclass index 572793c61136dcc00a1d5bfa89771193d63ec55c..c723b732c1bd827be6d0e6ea8f29473cd5ba49d7 100644 --- a/meta-openeuler/classes/meson.bbclass +++ b/meta-openeuler/classes/meson.bbclass @@ -7,11 +7,11 @@ require ${COREBASE}/meta/classes/meson.bbclass # Since the python3 package already exists in the nativesdk tool, # there is no need to build python3-native when building in meson -DEPENDS_remove = "python3-native" +DEPENDS:remove = "python3-native" # this is a workaround fix meson.native usage error: # use nativesdk's pkg-config command instead of pkg-config-native # method: pkgconfig = 'pkg-config-native' -> pkgconfig = 'pkg-config' -do_write_config_append() { +do_write_config:append() { sed -i "s/pkgconfig = 'pkg-config-native'/pkgconfig = 'pkg-config'/g" ${WORKDIR}/meson.native } diff --git a/meta-openeuler/classes/openeuler.bbclass b/meta-openeuler/classes/openeuler.bbclass index 78b0e3adf1ef7f2673a99a9674d303cebd3bf2fc..5275164667e8c9cea61e88d84e4763e0a3ee21f8 100644 --- a/meta-openeuler/classes/openeuler.bbclass +++ b/meta-openeuler/classes/openeuler.bbclass @@ -14,7 +14,7 @@ set_rpmdeps[eventmask] = "bb.event.RecipePreFinalise" # set BUILD_LDFLAGS for native recipes buildings, nativesdk can be # a star point for the necessary build-required recipes, no need to do # everything from the scratch -BUILD_LDFLAGS_append = " -L${OPENEULER_NATIVESDK_SYSROOT}/usr/lib \ +BUILD_LDFLAGS:append = " -L${OPENEULER_NATIVESDK_SYSROOT}/usr/lib \ -L${OPENEULER_NATIVESDK_SYSROOT}/lib \ -Wl,-rpath-link,${OPENEULER_NATIVESDK_SYSROOT}/usr/lib \ -Wl,-rpath-link,${OPENEULER_NATIVESDK_SYSROOT}/lib \ @@ -42,7 +42,7 @@ addhandler src_uri_set src_uri_set[eventmask] = "bb.event.RecipePreFinalise" # qemu.bbclass; fix build error: the kernel is too old -OLDEST_KERNEL_forcevariable = "5.10" +OLDEST_KERNEL:forcevariable = "5.10" # fetch multi repos in one recipe bb file, an example is # dsoftbus_1.0.bb where multi repos required by dsoftbus are @@ -200,7 +200,7 @@ def get_manifest(manifest_dir): # from openeuler's gitee repo. # if success, other part of base_do_fetch will skip download as # files are already downloaded by do_openeuler_fetch -python base_do_fetch_prepend() { +python base_do_fetch:prepend() { if not d.getVar('OPENEULER_FETCH') or d.getVar('OPENEULER_FETCH') == "enable": bb.build.exec_func("do_openeuler_fetch", d) } diff --git a/meta-openeuler/classes/openeuler_source.bbclass b/meta-openeuler/classes/openeuler_source.bbclass index 0b1fe1d39a06985e2640dc007d3f6d8f13907471..55e5d6f265938bb3de23991b458b73a72127af61 100644 --- a/meta-openeuler/classes/openeuler_source.bbclass +++ b/meta-openeuler/classes/openeuler_source.bbclass @@ -108,12 +108,12 @@ python add_openeuler_source_uri() { d.setVar('SRC_URI', '%s %s' % (' '.join(tarballs), d.getVar("SRC_URI"))) } -base_do_unpack_prepend() { +base_do_unpack:prepend() { if check_source_list(d): bb.build.exec_func("clean_tarball_workspace", d) } -do_unpack_append() { +do_unpack:append() { if check_source_list(d): bb.build.exec_func("prepare_tarball_workspace", d) } diff --git a/meta-openeuler/classes/python3native.bbclass b/meta-openeuler/classes/python3native.bbclass new file mode 100644 index 0000000000000000000000000000000000000000..de7e2f1e9bd06c28d815b1b05eae473931d6fdc3 --- /dev/null +++ b/meta-openeuler/classes/python3native.bbclass @@ -0,0 +1,10 @@ +# openeuler's python3native.bbclass requires meta/classes/python3native.bbclass. +# And make some adaptations, the reason is: +# openeuler use python3 from nativesdk tool, not python3-native + +require ${COREBASE}/meta/classes/python3native.bbclass + +PYTHON="${OPENEULER_NATIVESDK_SYSROOT}/usr/bin/python3" +EXTRANATIVEPATH:remove = "python3-native" +DEPENDS:remove = "python3-native" + diff --git a/meta-openeuler/classes/sanity-external-toolchain.bbclass b/meta-openeuler/classes/sanity-external-toolchain.bbclass index bb07204179260a32e519f25ff97649e79add94e5..863bfd814f072adc791a1fc2ac30857773e203e7 100644 --- a/meta-openeuler/classes/sanity-external-toolchain.bbclass +++ b/meta-openeuler/classes/sanity-external-toolchain.bbclass @@ -47,7 +47,7 @@ def check_toolchain_sanity(d, generate_events=False): l = d.createCopy() l.setVar('TOOLCHAIN_OPTIONS', '') l.setVar('TARGET_PREFIX', '${EXTERNAL_TARGET_SYS}-') - l.setVar('HOST_CC_ARCH_remove', '--no-sysroot-suffix') + l.setVar('HOST_CC_ARCH:remove', '--no-sysroot-suffix') cmd = l.expand('${EXTERNAL_TOOLCHAIN_BIN}/${EXTERNAL_CC} ${HOST_CC_ARCH} ${CFLAGS} ${LDFLAGS} test.c -o test') exttc_sanity_run(shlex.split(cmd), d, generate_events, tmpdir) diff --git a/meta-openeuler/classes/skip_recipe_dynamic.bbclass b/meta-openeuler/classes/skip_recipe_dynamic.bbclass new file mode 100644 index 0000000000000000000000000000000000000000..ac71b11ae59a2e545ddcffcdc44e9a415826b1ef --- /dev/null +++ b/meta-openeuler/classes/skip_recipe_dynamic.bbclass @@ -0,0 +1,39 @@ +# Skip recipes for names which include variable references, handling multilibs. +# +# Ex. +# SKIP_RECIPE_DYNAMIC += "${MLPREFIX}gcc-cross-${TARGET_ARCH}" +# SKIP_RECIPE_DYNAMIC += "gcc-source-${@'${GCCVERSION}'.replace('%', '')}" + +SKIP_RECIPE_DYNAMIC ?= "" + +python skip_recipe_dynamic_setup () { + d = e.data + + blacklisted = d.getVar('SKIP_RECIPE_DYNAMIC', False) + if not blacklisted.strip(): + return + + multilibs = d.getVar('MULTILIBS', True) or '' + + # this block has been copied from base.bbclass so keep it in sync + prefixes = [] + for ext in multilibs.split(): + eext = ext.split(':') + if len(eext) > 1 and eext[0] == 'multilib': + prefixes.append(eext[1]) + + to_blacklist = set() + for prefix in [''] + prefixes: + localdata = bb.data.createCopy(d) + if prefix: + localdata.setVar('MLPREFIX', prefix + '-') + override = ':virtclass-multilib-' + prefix + localdata.setVar('OVERRIDES', localdata.getVar('OVERRIDES', False) + override) + + to_blacklist |= set(filter(None, localdata.getVar('SKIP_RECIPE_DYNAMIC').split())) + + for blrecipe in to_blacklist: + d.setVarFlag('SKIP_RECIPE', blrecipe, 'skipped by SKIP_RECIPE_DYNAMIC') +} +skip_recipe_dynamic_setup[eventmask] = "bb.event.ConfigParsed" +addhandler skip_recipe_dynamic_setup \ No newline at end of file diff --git a/meta-openeuler/conf/distro/include/openeuler_hosttools.inc b/meta-openeuler/conf/distro/include/openeuler_hosttools.inc index 5bf5f743df5238f45847e75005509515ad28583e..d058fbb797950666ec93da21636184981e5900b9 100644 --- a/meta-openeuler/conf/distro/include/openeuler_hosttools.inc +++ b/meta-openeuler/conf/distro/include/openeuler_hosttools.inc @@ -2,7 +2,7 @@ # use as many as possible prebuilt nativesdk/host tools to replace native tools. # this file has related HOSTTOOLS and ASSUME_PROVIDED settings. -HOSTTOOLS_remove += "chrpath cpp rpcgen" +HOSTTOOLS:remove = "chrpath cpp rpcgen" HOSTTOOLS_NONFATAL += "chrpath cpp rpcgen" # basic tools HOSTTOOLS += "python3 python pod2man pkg-config" @@ -26,7 +26,7 @@ ASSUME_PROVIDED += "automake-native autoconf-native libtool-native m4-native" # source file build tools HOSTTOOLS_NONFATAL += "cmake ninja meson" -ASSUME_PROVIDED += "cmake-native ninja-native make-native meson-native" +ASSUME_PROVIDED += "cmake-native meson-native ninja-native make-native" # used by cracklib, built from cracklib-native HOSTTOOLS_NONFATAL += "create-cracklib-dict cracklib-format cracklib-packer cracklib-unpacker" @@ -60,10 +60,10 @@ ASSUME_PROVIDED += "pixman-native mesa-native virglrenderer-native libsdl2-nati ASSUME_PROVIDED += "alsa-lib-native" #some commands added in poky by default do not used now, make it optional -HOSTTOOLS_remove += "diffstat lz4c pzstd" +HOSTTOOLS:remove = "diffstat lz4c pzstd" HOSTTOOLS_NONFATAL += "diffstat lz4c pzstd" -SANITY_REQUIRED_UTILITIES_remove += "diffstat chrpath" +SANITY_REQUIRED_UTILITIES:remove = "diffstat chrpath" CONNECTIVITY_CHECK_URIS = "" # Misc. assume provided software package diff --git a/meta-openeuler/conf/distro/include/tcmode-external-openeuler.inc b/meta-openeuler/conf/distro/include/tcmode-external-openeuler.inc index bd96b5fc8ceecb88ce19bde31578e10be70ba4a0..f41578ed028fe41d1f20f8dc45d02250cddcc268 100644 --- a/meta-openeuler/conf/distro/include/tcmode-external-openeuler.inc +++ b/meta-openeuler/conf/distro/include/tcmode-external-openeuler.inc @@ -12,7 +12,7 @@ SKIP_RECIPE[linux-libc-headers-yocto] = "not building with an external toolchain EXTERNAL_CROSS_NOPSEUDO = "gcc g++ cpp" # Use tuning-defined baselib to align with multilib and external toolchain -baselib = "${@d.getVar('BASE_LIB_tune-' + (d.getVar('DEFAULTTUNE') or 'INVALID')) or d.getVar('BASELIB')}" +baselib = "${@d.getVar('BASE_LIB:tune-' + (d.getVar('DEFAULTTUNE') or 'INVALID')) or d.getVar('BASELIB')}" # Ensure that the licensing variables are available to the toolchain. export MGLS_LICENSE_FILE @@ -62,7 +62,7 @@ python openeuler_metadata_setup () { openeuler_metadata_setup[eventmask] = "bb.event.ConfigParsed" addhandler openeuler_metadata_setup -python extract_env_setup_metadata_prepend() { +python extract_env_setup_metadata:prepend() { from pathlib import Path external_toolchain = d.getVar('EXTERNAL_TOOLCHAIN') if not external_toolchain or external_toolchain == 'UNKNOWN': diff --git a/meta-openeuler/conf/distro/include/tcmode-external.inc b/meta-openeuler/conf/distro/include/tcmode-external.inc index d5690ac12c94ce36155a6a5290cb3da67cb55f62..1439df4a22c6c94bc83a8d72d57059024be5f2da 100644 --- a/meta-openeuler/conf/distro/include/tcmode-external.inc +++ b/meta-openeuler/conf/distro/include/tcmode-external.inc @@ -39,8 +39,8 @@ PREFERRED_PROVIDER_${MLPREFIX}gdbserver ?= "${MLPREFIX}gdb" # This is defined in default-providers.inc, which is parsed before the tcmode, # so we can't use ?= PREFERRED_PROVIDER_linux-libc-headers = "${TCMODE-LIBC}" -PNBLACKLIST[linux-libc-headers] = "not building with an external toolchain" -PNBLACKLIST[linux-libc-headers-yocto] = "not building with an external toolchain" +SKIP_RECIPE[linux-libc-headers] = "not building with an external toolchain" +SKIP_RECIPE[linux-libc-headers-yocto] = "not building with an external toolchain" PREFERRED_PROVIDER_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ??= "gcc-external-cross-canadian-${TRANSLATED_TARGET_ARCH}" PREFERRED_PROVIDER_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ??= "binutils-external-cross-canadian-${TRANSLATED_TARGET_ARCH}" @@ -51,24 +51,24 @@ PREFERRED_PROVIDER_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} ??= "gdb-externa PREFERRED_PROVIDER_libgcc = "libgcc-external" # Pass --no-sysroot-suffix when using an external toolchain with the SDK -TOOLCHAIN_TARGET_TASK_append = " sdk-env-external-toolchain" +TOOLCHAIN_TARGET_TASK:append = " sdk-env-external-toolchain" # Sanity check the toolchain configuration and toolchain INHERIT += "sanity-external-toolchain" # Ensure that we don't pull in any internal toolchain recipes -INHERIT += "blacklist blacklist_dynamic" -PNBLACKLIST[uclibc] = "not building with an external toolchain" -PNBLACKLIST[glibc] = "not building with an external toolchain" -PNBLACKLIST[glibc-intermediate] = "not building with an external toolchain" -PNBLACKLIST[gcc-runtime] = "not building with an external toolchain" -PNBLACKLIST[gcc-sanitizers] = "not building with an external toolchain" -PNBLACKLIST[gcc-source] = "not building with an external toolchain" -PNBLACKLIST[libgcc-initial] = "not building with an external toolchain" -PNBLACKLIST[libgcc] = "not building with an external toolchain" -PNBLACKLIST[libgfortran] = "not building with an external toolchain" - -PNBLACKLIST_DYNAMIC += "\ +INHERIT += "skip_recipe_dynamic" +SKIP_RECIPE[uclibc] = "not building with an external toolchain" +SKIP_RECIPE[glibc] = "not building with an external toolchain" +SKIP_RECIPE[glibc-intermediate] = "not building with an external toolchain" +SKIP_RECIPE[gcc-runtime] = "not building with an external toolchain" +SKIP_RECIPE[gcc-sanitizers] = "not building with an external toolchain" +SKIP_RECIPE[gcc-source] = "not building with an external toolchain" +SKIP_RECIPE[libgcc-initial] = "not building with an external toolchain" +SKIP_RECIPE[libgcc] = "not building with an external toolchain" +SKIP_RECIPE[libgfortran] = "not building with an external toolchain" + +SKIP_RECIPE_DYNAMIC += "\ ${MLPREFIX}gcc-cross-${TARGET_ARCH} \ \ binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} \ @@ -80,7 +80,7 @@ PNBLACKLIST_DYNAMIC += "\ # We need our -cross recipes to rebuild when the external toolchain changes, # to recreate the links / wrapper scripts -BB_HASHBASE_WHITELIST_remove = "EXTERNAL_TOOLCHAIN" +BB_BASEHASH_IGNORE_VARS:remove = "EXTERNAL_TOOLCHAIN" # For a toolchain built with multilibs, we don't want any suffix implicitly # added to the oe sysroot path, as those dirs will not exist. @@ -125,12 +125,12 @@ addhandler toolchain_metadata_setup GCCVERSION ?= "${@'.'.join('${GCC_VERSION}'.split('.')[:2])}%" GCC_VERSION = "${@external_run(d, d.getVar('EXTERNAL_CC'), '-dumpversion').rstrip()}" -GCC_VERSION_allarch = "" +GCC_VERSION:allarch = "" GCC_VERSION[vardepvalue] = "${GCC_VERSION}" # macro-prefix-map was introduced in gcc 8 REMOVE_MACRO_PREFIX_MAP = "-fmacro-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}" -DEBUG_PREFIX_MAP_remove_class-target = "${@'${REMOVE_MACRO_PREFIX_MAP}' if '${GCC_VERSION}' not in ['', 'UNKNOWN'] and [int(v) for v in '${GCC_VERSION}'.split('.')] < [8,0] else ''}" +DEBUG_PREFIX_MAP:remove:class-target = "${@'${REMOVE_MACRO_PREFIX_MAP}' if '${GCC_VERSION}' not in ['', 'UNKNOWN'] and [int(v) for v in '${GCC_VERSION}'.split('.')] < [8,0] else ''}" BUILDCFG_VARS += "EXTERNAL_TOOLCHAIN EXTERNAL_TARGET_SYS GCC_VERSION" diff --git a/meta-openeuler/conf/distro/openeuler.conf b/meta-openeuler/conf/distro/openeuler.conf index fecc173bd9d026ecbdef207bcddf10b3c3ebd1d8..cbb0fb82c92611e1160b0ac80d7e806c61fd280a 100644 --- a/meta-openeuler/conf/distro/openeuler.conf +++ b/meta-openeuler/conf/distro/openeuler.conf @@ -28,7 +28,7 @@ DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${OPENEULER_DEFAULT_DISTRO_FEATUR DISTRO_FEATURES += "sysvinit" # remove currently unsupported features -DISTRO_FEATURES_DEFAULT_remove = "bluetooth x11" +DISTRO_FEATURES_DEFAULT:remove = "bluetooth x11" PREFERRED_VERSION_linux-openeuler ?= "5.10%" PREFERRED_VERSION_linux-openeuler-rt ?= "5.10%" @@ -55,14 +55,15 @@ DL_DIR ?= "${OPENEULER_SP_DIR}/${OPENEULER_REPO_NAME}" OPENEULER_BRANCH ?= "openEuler-${DISTRO_VERSION}" OPENEULER_GIT_URL ?= "https://gitee.com/src-openeuler" -INHERIT += "reproducible_build" - BB_SIGNATURE_HANDLER ?= "OEEquivHash" BB_HASHSERVE ??= "auto" # set default kernel provider PREFERRED_PROVIDER_virtual/kernel ?= "linux-openeuler" +# +PREFERRED_PROVIDER_dhcp-relay = "dhcp" + #UNINATIVE_CHECKSUM[x86_64] = "dead" #UNINATIVE_URL = "unset" @@ -70,7 +71,7 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1" # for all .bb file, OPENEULER_SP_DIR will be included # in file path -FILESEXTRAPATHS_prepend = "${OPENEULER_SP_DIR}:" +FILESEXTRAPATHS:prepend = "${OPENEULER_SP_DIR}:" # the sysroot of openeuler native sdk OPENEULER_NATIVESDK_SYSROOT ?= "" @@ -92,7 +93,7 @@ SDK_INCLUDE_BUILDTOOLS = "0" require conf/distro/openeuler-bsp.conf # OPENEULER_SP_DIR should never be included when generating the signatures -BB_HASHBASE_WHITELIST_append = " OPENEULER_SP_DIR" +BB_BASEHASH_IGNORE_VARS:append = " OPENEULER_SP_DIR" # define root home, default /home/root ROOT_HOME ?= "/root" diff --git a/meta-openeuler/conf/layer.conf b/meta-openeuler/conf/layer.conf index a5befdfbff76757f7949a3a24a6ca4dda2343c62..ebb344a1c6443f8a0e7648dd60658ad60fca5445 100644 --- a/meta-openeuler/conf/layer.conf +++ b/meta-openeuler/conf/layer.conf @@ -9,13 +9,13 @@ BBFILE_COLLECTIONS += "openeuler" BBFILE_PATTERN_openeuler = "^${LAYERDIR}/" BBFILE_PRIORITY_openeuler = "30" -LAYERSERIES_COMPAT_openeuler = "hardknott" +LAYERSERIES_COMPAT_openeuler = "kirkstone honister" # This should only be incremented on significant changes that will # cause compatibility issues with other layers LAYERVERSION_openeuler = "13" -LAYERDEPENDS_openeuler = "core" +LAYERDEPENDS:openeuler = "core" REQUIRED_POKY_BBLAYERS_CONF_VERSION = "2" @@ -59,7 +59,7 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += "\ " # Needed for external_run() for PV & LICENSE in the recipes, to be able to parse -INHERIT_append = " external_global" +INHERIT:append = " external_global" # Fallback default for when the tcmode isn't sourced GCC_VERSION ?= "0.0" diff --git a/meta-openeuler/conf/local.conf.sample b/meta-openeuler/conf/local.conf.sample deleted file mode 100644 index ce568b4df8dfec21459bf4ad421784274d16914a..0000000000000000000000000000000000000000 --- a/meta-openeuler/conf/local.conf.sample +++ /dev/null @@ -1,332 +0,0 @@ -# -# This file is your local configuration file and is where all local user settings -# are placed. The comments in this file give some guide to the options a new user -# to the system might want to change but pretty much any configuration option can -# be set in this file. More adventurous users can look at local.conf.extended -# which contains other examples of configuration which can be placed in this file -# but new users likely won't need any of them initially. -# -# Lines starting with the '#' character are commented out and in some cases the -# default values are provided as comments to show people example syntax. Enabling -# the option is a question of removing the # character and making any change to the -# variable as required. - -# -# Machine Selection -# -# You need to select a specific machine to target the build with. There are a selection -# of emulated machines available which can boot and run in the QEMU emulator: -# -#MACHINE ?= "qemuarm" -#MACHINE ?= "qemuarm64" -#MACHINE ?= "qemumips" -#MACHINE ?= "qemumips64" -#MACHINE ?= "qemuppc" -#MACHINE ?= "qemux86" -#MACHINE ?= "qemux86-64" -# -# There are also the following hardware board target machines included for -# demonstration purposes: -# -#MACHINE ?= "beaglebone-yocto" -#MACHINE ?= "genericx86" -#MACHINE ?= "genericx86-64" -#MACHINE ?= "edgerouter" -# -# This sets the default machine to be qemux86-64 if no other machine is selected: -MACHINE ??= "qemu-aarch64" - -# -# Where to place downloads -# -# During a first build the system will download many different source code tarballs -# from various upstream projects. This can take a while, particularly if your network -# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you -# can preserve this directory to speed up this part of subsequent builds. This directory -# is safe to share between multiple builds on the same machine too. -# -# The default is a downloads directory under TOPDIR which is the build directory. -# -#DL_DIR ?= "${TOPDIR}/downloads" - -# -# Where to place shared-state files -# -# BitBake has the capability to accelerate builds based on previously built output. -# This is done using "shared state" files which can be thought of as cache objects -# and this option determines where those files are placed. -# -# You can wipe out TMPDIR leaving this directory intact and the build would regenerate -# from these files if no changes were made to the configuration. If changes were made -# to the configuration, only shared state files where the state was still valid would -# be used (done using checksums). -# -# The default is a sstate-cache directory under TOPDIR. -# -#SSTATE_DIR ?= "${TOPDIR}/sstate-cache" - -# -# Where to place the build output -# -# This option specifies where the bulk of the building work should be done and -# where BitBake should place its temporary files and output. Keep in mind that -# this includes the extraction and compilation of many applications and the toolchain -# which can use Gigabytes of hard disk space. -# -# The default is a tmp directory under TOPDIR. -# -#TMPDIR = "${TOPDIR}/tmp" - -# -# Default policy config -# -# The distribution setting controls which policy settings are used as defaults. -# The default value is fine for general Yocto project use, at least initially. -# Ultimately when creating custom policy, people will likely end up subclassing -# these defaults. -# -DISTRO ?= "openeuler" -# As an example of a subclass there is a "bleeding" edge policy configuration -# where many versions are set to the absolute latest code from the upstream -# source control systems. This is just mentioned here as an example, its not -# useful to most new users. -# DISTRO ?= "poky-bleeding" - -# -# Package Management configuration -# -# This variable lists which packaging formats to enable. Multiple package backends -# can be enabled at once and the first item listed in the variable will be used -# to generate the root filesystems. -# Options are: -# - 'package_deb' for debian style deb files -# - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager) -# - 'package_rpm' for rpm style packages -# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" -# We default to rpm: -PACKAGE_CLASSES ?= "package_rpm" - -# -# SDK target architecture -# -# This variable specifies the architecture to build SDK items for and means -# you can build the SDK packages for architectures other than the machine you are -# running the build on (i.e. building i686 packages on an x86_64 host). -# Supported values are i686, x86_64, aarch64 -#SDKMACHINE ?= "i686" - -# -# Extra image configuration defaults -# -# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated -# images. Some of these options are added to certain image types automatically. The -# variable can contain the following options: -# "dbg-pkgs" - add -dbg packages for all installed packages -# (adds symbol information for debugging/profiling) -# "src-pkgs" - add -src packages for all installed packages -# (adds source code for debugging) -# "dev-pkgs" - add -dev packages for all installed packages -# (useful if you want to develop against libs in the image) -# "ptest-pkgs" - add -ptest packages for all ptest-enabled packages -# (useful if you want to run the package test suites) -# "tools-sdk" - add development tools (gcc, make, pkgconfig etc.) -# "tools-debug" - add debugging tools (gdb, strace) -# "eclipse-debug" - add Eclipse remote debugging support -# "tools-profile" - add profiling tools (oprofile, lttng, valgrind) -# "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) -# "debug-tweaks" - make an image suitable for development -# e.g. ssh root access has a blank password -# There are other application targets that can be used here too, see -# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details. -# We default to enabling the debugging tweaks. -EXTRA_IMAGE_FEATURES ?= "debug-tweaks" - -# -# Additional image features -# -# The following is a list of additional classes to use when building images which -# enable extra features. Some available options which can be included in this variable -# are: -# - 'buildstats' collect build statistics -USER_CLASSES ?= "buildstats" - -# -# Runtime testing of images -# -# The build system can test booting virtual machine images under qemu (an emulator) -# after any root filesystems are created and run tests against those images. It can also -# run tests against any SDK that are built. To enable this uncomment these lines. -# See classes/test{image,sdk}.bbclass for further details. -#IMAGE_CLASSES += "testimage testsdk" -#TESTIMAGE_AUTO:qemuall = "1" - -# -# Interactive shell configuration -# -# Under certain circumstances the system may need input from you and to do this it -# can launch an interactive shell. It needs to do this since the build is -# multithreaded and needs to be able to handle the case where more than one parallel -# process may require the user's attention. The default is iterate over the available -# terminal types to find one that works. -# -# Examples of the occasions this may happen are when resolving patches which cannot -# be applied, to use the devshell or the kernel menuconfig -# -# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none -# Note: currently, Konsole support only works for KDE 3.x due to the way -# newer Konsole versions behave -#OE_TERMINAL = "auto" -# By default disable interactive patch resolution (tasks will just fail instead): -PATCHRESOLVE = "noop" - -# -# Disk Space Monitoring during the build -# -# Monitor the disk space during the build. If there is less that 1GB of space or less -# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully -# shutdown the build. If there is less than 100MB or 1K inodes, perform a hard abort -# of the build. The reason for this is that running completely out of space can corrupt -# files and damages the build in ways which may not be easily recoverable. -# It's necessary to monitor /tmp, if there is no space left the build will fail -# with very exotic errors. -BB_DISKMON_DIRS ??= "\ - STOPTASKS,${TMPDIR},1G,100K \ - STOPTASKS,${DL_DIR},1G,100K \ - STOPTASKS,${SSTATE_DIR},1G,100K \ - STOPTASKS,/tmp,100M,100K \ - ABORT,${TMPDIR},100M,1K \ - ABORT,${DL_DIR},100M,1K \ - ABORT,${SSTATE_DIR},100M,1K \ - ABORT,/tmp,10M,1K" - -# -# Shared-state files from other locations -# -# As mentioned above, shared state files are prebuilt cache data objects which can be -# used to accelerate build time. This variable can be used to configure the system -# to search other mirror locations for these objects before it builds the data itself. -# -# This can be a filesystem directory, or a remote url such as http or ftp. These -# would contain the sstate-cache results from previous builds (possibly from other -# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the -# cache locations to check for the shared objects. -# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH -# at the end as shown in the examples below. This will be substituted with the -# correct path within the directory structure. -#SSTATE_MIRRORS ?= "\ -#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ -#file://.* file:///some/local/dir/sstate/PATH" - -# -# Yocto Project SState Mirror -# -# The Yocto Project has prebuilt artefacts available for its releases, you can enable -# use of these by uncommenting the following line. This will mean the build uses -# the network to check for artefacts at the start of builds, which does slow it down -# equally, it will also speed up the builds by not having to build things if they are -# present in the cache. It assumes you can download something faster than you can build it -# which will depend on your network. -# -#SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/2.5/PATH;downloadfilename=PATH" - -# -# Qemu configuration -# -# By default native qemu will build with a builtin VNC server where graphical output can be -# seen. The line below enables the SDL UI frontend too. -#PACKAGECONFIG_append:pn-qemu-system-native = " sdl" -# By default libsdl2-native will be built, if you want to use your host's libSDL instead of -# the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below. -#ASSUME_PROVIDED += "libsdl2-native" - -# You can also enable the Gtk UI frontend, which takes somewhat longer to build, but adds -# a handy set of menus for controlling the emulator. -#PACKAGECONFIG_append:pn-qemu-system-native = " gtk+" - -# -# Hash Equivalence -# -# Enable support for automatically running a local hash equivalence server and -# instruct bitbake to use a hash equivalence aware signature generator. Hash -# equivalence improves reuse of sstate by detecting when a given sstate -# artifact can be reused as equivalent, even if the current task hash doesn't -# match the one that generated the artifact. -# -# A shared hash equivalent server can be set with ":" format -# -#BB_HASHSERVE = "auto" -#BB_SIGNATURE_HANDLER = "OEEquivHash" - -# -# Memory Resident Bitbake -# -# Bitbake's server component can stay in memory after the UI for the current command -# has completed. This means subsequent commands can run faster since there is no need -# for bitbake to reload cache files and so on. Number is in seconds, after which the -# server will shut down. -# -#BB_SERVER_TIMEOUT = "60" - -# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to -# track the version of this file when it was generated. This can safely be ignored if -# this doesn't mean anything to you. -CONF_VERSION = "2" - -require conf/distro/include/openeuler_hosttools.inc - -PATCHTOOL = "patch" -TCMODE = "external-openeuler" -INHERIT_remove += "uninative" -PATCHDEPENDENCY_remove += "patch-replacement-native:do_populate_sysroot" - -# openEuler software package dir -# all openeEuler software packages will be downloaded by specific tool -# into this dir with the following format: -# -# busybox -# openssh -# ..... -OPENEULER_SP_DIR = "/usr1/openeuler/src/" - -# the sysroot of native sdk of openeuler which contains all the native tools -# used for building openeuler -# -# OPENEULER_NATIVESDK_SYSROOT用于指向nativesdk工具目录 -OPENEULER_NATIVESDK_SYSROOT = "/opt/buildtools/nativesdk/sysroots/x86_64-pokysdk-linux" - -# openEuler cross toolchain dir -# prebuilt toolchain with c library is used to build openEuler embedded -# distribution. The prebuilt toolchain should be downloaded and placed in -# EXTERNAL_TOOLCHAIN with the following format: -# -# openeuler_gcc_arm64le -# openeuler_gcc_arm32le" -EXTERNAL_TOOLCHAIN_arm = "/usr1/openeuler/gcc/openeuler_gcc_arm32le" -EXTERNAL_TOOLCHAIN_aarch64 = "/usr1/openeuler/gcc/openeuler_gcc_arm64le" -EXTERNAL_TOOLCHAIN_x86-64 = "/usr1/openeuler/gcc/openeuler_gcc_x86_64" -EXTERNAL_TOOLCHAIN_riscv64 = "/usr1/openeuler/gcc/openeuler_gcc_riscv64" -EXTERNAL_TARGET_SYS_arm = "arm-openeuler-linux-gnueabi" -EXTERNAL_TARGET_SYS_aarch64 = "aarch64-openeuler-linux-gnu" -EXTERNAL_TARGET_SYS_x86-64 = "x86_64-openeuler-linux-gnu" -EXTERNAL_TARGET_SYS_riscv64 = "riscv64-openeuler-linux-gnu" - -# default openeuler platform -OPENEULER_PLATFORM = "aarch64-std" -MACHINEOVERRIDES =. "${OPENEULER_PLATFORM}:" - -# add openeuler security flags -require conf/distro/include/security_flags.inc -require conf/distro/include/security_flags_openeuler.inc - -# OE-built toolchains assume en_US is utf8 -EXTERNAL_TOOLCHAIN_FEATURES_DEFAULT = "locale-utf8-is-default" - -# define root home, default /home/root -ROOT_HOME ?= "/root" - -# define default init and device manager -OPENEULER_INIT_MANAGER = "mdev-busybox" -OPENEULER_DEV_MANAGER = "busybox-mdev" - -# set default kernel provider -PREFERRED_PROVIDER_virtual/kernel = "linux-openeuler" diff --git a/meta-openeuler/conf/machine/include/qemu-aarch64-common.inc b/meta-openeuler/conf/machine/include/qemu-aarch64-common.inc index 279001bd4842db191c1f01fbd0cca2d019cb6aa8..d26ec3258d9d4f783211860537d9631fb9ad1314 100644 --- a/meta-openeuler/conf/machine/include/qemu-aarch64-common.inc +++ b/meta-openeuler/conf/machine/include/qemu-aarch64-common.inc @@ -24,10 +24,10 @@ require conf/machine/include/arm/arch-armv8a.inc TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexa9', ' -mtune=cortex-a9', '', d)}" MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'cortexa9', 'armv7a:', '' ,d)}" -MACHINEOVERRIDES_remove_virtclass-multilib-lib32 =. "march64:" -MACHINEOVERRIDES_append_virtclass-multilib-lib32 =. "march32:" -TUNE_FEATURES_append_virtclass-multilib-lib32 += " cortexa9" -TUNE_FEATURES_remove_virtclass-multilib-lib32 += " vfp" +MACHINEOVERRIDES:remove:virtclass-multilib-lib32 = "march64:" +MACHINEOVERRIDES:append:virtclass-multilib-lib32 = "march32:" +TUNE_FEATURES:append:virtclass-multilib-lib32 = " cortexa9" +TUNE_FEATURES:remove:virtclass-multilib-lib32 = " vfp" # simplest serial console setting, no VT SERIAL_CONSOLES ?= "115200;ttyAMA0" diff --git a/meta-openeuler/conf/machine/include/qemu-arm-common.inc b/meta-openeuler/conf/machine/include/qemu-arm-common.inc index f3ff60c41ca2023b4880f9989f61926efeee1911..e6c857c821ef4c8e215b157c4b222dd99ff2a8aa 100644 --- a/meta-openeuler/conf/machine/include/qemu-arm-common.inc +++ b/meta-openeuler/conf/machine/include/qemu-arm-common.inc @@ -11,8 +11,8 @@ kernel-module-unix \ " KERNEL_MODULE_AUTOLOAD = "${INSTALLMODULES}" -TUNE_FEATURES_append += " cortexa9" -TUNE_FEATURES_remove += " vfp" +TUNE_FEATURES:append = " cortexa9" +TUNE_FEATURES:remove = " vfp" TUNE_CCARGS .= " -mno-unaligned-access" diff --git a/meta-openeuler/conf/machine/qemu-riscv64.conf b/meta-openeuler/conf/machine/qemu-riscv64.conf index 30e3b2d41046985cca3d4799f2be05bbad0b2eaf..9425796c326f9246b4c1807e742570eb3505531c 100644 --- a/meta-openeuler/conf/machine/qemu-riscv64.conf +++ b/meta-openeuler/conf/machine/qemu-riscv64.conf @@ -10,7 +10,7 @@ KERNEL_IMAGETYPE = "Image" KERNEL_IMAGETYPE_FOR_MAKE = "Image" require conf/machine/include/riscv/tune-riscv.inc -BASE_LIB_tune-riscv64 = "lib64/lp64d" +BASE_LIB:tune-riscv64 = "lib64/lp64d" require conf/multilib.conf MULTILIBS ?= "" diff --git a/meta-openeuler/conf/openeuler-ros-distro-recipe-blacklist.inc b/meta-openeuler/conf/openeuler-ros-distro-recipe-blacklist.inc index 75a1202081072b495d381bcae695620c0c832032..72586930e958631adf4c72b259c090e4bdc655a6 100644 --- a/meta-openeuler/conf/openeuler-ros-distro-recipe-blacklist.inc +++ b/meta-openeuler/conf/openeuler-ros-distro-recipe-blacklist.inc @@ -1,7 +1,7 @@ # remove from blacklist for runtime decouple -PNBLACKLIST[navigation2] = "" -PNBLACKLIST[nav2-bringup] = "" -PNBLACKLIST[slam-toolbox] = "" +SKIP_RECIPE[navigation2] = "" +SKIP_RECIPE[nav2-bringup] = "" +SKIP_RECIPE[slam-toolbox] = "" # current oe's tbb version is too new for ros-foxy PREFERRED_VERSION_tbb = "2020.3" diff --git a/meta-openeuler/dynamic-layers/clang-layer/recipes-connectivity/dhcp/dhcp_%.bbappend b/meta-openeuler/dynamic-layers/clang-layer/recipes-connectivity/dhcp/dhcp_%.bbappend index e837b47046d7a2f73a54e62cbeb35cb43746e85b..416cc3f6ed958c7de2248588e289350fd33727a3 100644 --- a/meta-openeuler/dynamic-layers/clang-layer/recipes-connectivity/dhcp/dhcp_%.bbappend +++ b/meta-openeuler/dynamic-layers/clang-layer/recipes-connectivity/dhcp/dhcp_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files/:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files/:" # fix segmentfault error when compiling with clang SRC_URI:append = " \ diff --git a/meta-openeuler/dynamic-layers/clang-layer/recipes-core/busybox/busybox_%.bbappend b/meta-openeuler/dynamic-layers/clang-layer/recipes-core/busybox/busybox_%.bbappend index d2a69fa42be312fbcc1afba36fc50a8f9086fbfc..dd3fc8349d6510e3c0f867b54fdf317741a18a3b 100644 --- a/meta-openeuler/dynamic-layers/clang-layer/recipes-core/busybox/busybox_%.bbappend +++ b/meta-openeuler/dynamic-layers/clang-layer/recipes-core/busybox/busybox_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files/:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files/:" # fix segmentfault error when compiling with clang SRC_URI:append = " \ diff --git a/meta-openeuler/dynamic-layers/clang-layer/recipes-core/dsoftbus/dsoftbus_%.bbappend b/meta-openeuler/dynamic-layers/clang-layer/recipes-core/dsoftbus/dsoftbus_%.bbappend index d617d953f4778ca57757ea0cd06eff45209abde2..97edcba24f0322308147a8ed34234e7e13e8ae06 100644 --- a/meta-openeuler/dynamic-layers/clang-layer/recipes-core/dsoftbus/dsoftbus_%.bbappend +++ b/meta-openeuler/dynamic-layers/clang-layer/recipes-core/dsoftbus/dsoftbus_%.bbappend @@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" # add patch to support clang -SRC_URI_append = " \ +SRC_URI:append = " \ file://0001-change-toolchain-for-clang-build.patch;patchdir=${S}/build \ " diff --git a/meta-openeuler/dynamic-layers/clang-layer/recipes-core/images/openeuler-image-llvm.bb b/meta-openeuler/dynamic-layers/clang-layer/recipes-core/images/openeuler-image-llvm.bb index 9774214641ed85df2376f40bad6a22f129e9944e..fb7816d2baf9a340b285939717d24bdb56011ee6 100644 --- a/meta-openeuler/dynamic-layers/clang-layer/recipes-core/images/openeuler-image-llvm.bb +++ b/meta-openeuler/dynamic-layers/clang-layer/recipes-core/images/openeuler-image-llvm.bb @@ -1,9 +1,9 @@ # build an iso image, the live-os uses openeuler-image-live, it must be the same as itself(openeuler-image) # when LIVE_ROOTFS_TYPE defined, bug may come out in poky, so just use default value ext4 in image-live.bbclass. # notice we need MACHINE_FEATURES += "efi" in machine conf -IMAGE_FSTYPES_append_aarch64 = " iso" -IMAGE_FSTYPES_append_x86-64 = " iso" -IMAGE_FSTYPES_remove_raspberrypi4 = "iso" +IMAGE_FSTYPES:append:aarch64 = " iso" +IMAGE_FSTYPES:append:x86-64 = " iso" +IMAGE_FSTYPES:remove:raspberrypi4 = "iso" INITRD_IMAGE_LIVE = "openeuler-image-live" # notice: IMAGE_FEATURE configs such as IMAGE_FSTYPES should be defined before openeuler-image-common.inc(before core-image and image.bbclass) diff --git a/meta-openeuler/dynamic-layers/clang-layer/recipes-external/binutils/binutils-external-cross-canadian.bbappend b/meta-openeuler/dynamic-layers/clang-layer/recipes-external/binutils/binutils-external-cross-canadian.bbappend index 7dbbe86b659fec8abd55a7fafa603601af9e0f10..6f00e6cbf01297addf1e38ff1e61d26cb1bd9519 100644 --- a/meta-openeuler/dynamic-layers/clang-layer/recipes-external/binutils/binutils-external-cross-canadian.bbappend +++ b/meta-openeuler/dynamic-layers/clang-layer/recipes-external/binutils/binutils-external-cross-canadian.bbappend @@ -3,14 +3,14 @@ binutils_binaries = "as ld ld.bfd ld.gold elfedit addr2line" # using llvm binutils clang_binutils = "ar nm objcopy objdump ranlib strip cxxfilt readelf size strings readobj" # add llvm-* binutils -FILES_${PN} += "\ +FILES:${PN} += "\ ${bindir}/ld* \ ${bindir}/lld* \ ${@' '.join('${bindir}/llvm-' + i for i in '${clang_binutils}'.split())} \ " # add ${TARGET_PREFIX}{binutils} links to llvm-{binutils} -do_install_append () { +do_install:append () { for i in ${D}${bindir}/llvm-*; do if [ -e "$i" ]; then j="$(basename "$i")" @@ -25,12 +25,12 @@ python add_llvm_files_links () { full_prefix = os.path.join(d.getVar('bindir'), prefix) new_prefix = d.getVar('TARGET_PREFIX') for pkg in d.getVar('PACKAGES').split(): - files = (d.getVar('FILES_%s' % pkg) or '').split() + files = (d.getVar('FILES:%s' % pkg) or '').split() new_files = [] for f in files: if f.startswith(full_prefix): new_files.append(f.replace(prefix, new_prefix)) if new_files: - d.appendVar('FILES_%s' % pkg, ' ' + ' '.join(new_files)) + d.appendVar('FILES:%s' % pkg, ' ' + ' '.join(new_files)) } do_package[prefuncs] += "add_llvm_files_links" diff --git a/meta-openeuler/dynamic-layers/clang-layer/recipes-external/clang/clang-external-cross-canadian.bb b/meta-openeuler/dynamic-layers/clang-layer/recipes-external/clang/clang-external-cross-canadian.bb index 9e3f96568e81f51fe50eb270cde84461d018f94a..ceb596ea5c70dd49a2f2073ab5fdf40cb38858b6 100644 --- a/meta-openeuler/dynamic-layers/clang-layer/recipes-external/clang/clang-external-cross-canadian.bb +++ b/meta-openeuler/dynamic-layers/clang-layer/recipes-external/clang/clang-external-cross-canadian.bb @@ -7,21 +7,21 @@ PV = "${CLANG_VERSION}" clanglibdir = "${exec_prefix}/lib" clangincdir = "${exec_prefix}/include" -RDEPENDS_${PN} = "binutils-external-cross-canadian-${TRANSLATED_TARGET_ARCH}" -FILES_${PN} = "\ +RDEPENDS:${PN} = "binutils-external-cross-canadian-${TRANSLATED_TARGET_ARCH}" +FILES:${PN} = "\ ${bindir}/clang* \ ${clanglibdir}/* \ ${clangincdir}/* \ " # no debug package -FILES_${PN}-dbg = "" +FILES:${PN}-dbg = "" # no need do autolibname(handle the dependency of .so libs) # auto_libname in debian.bbclass will call ${TARGET_PREFIX}objdump to get shlibs2 related info # for gcc-external-cross-canadian, can't find ${TARGET_PREFIX}objdump AUTO_LIBNAME_PKGS = "" -INSANE_SKIP_${PN} += "dev-so staticdev" +INSANE_SKIP:${PN} += "dev-so staticdev" INHIBIT_PACKAGE_STRIP = "1" INHIBIT_SYSROOT_STRIP = "1" diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/pypi-src-openeuler.inc b/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/pypi-src-openeuler.inc index 8f835223ea41708e075b61157897cf7b15c0fb3b..53c7814a6a9cd8c17dda5f56a672dae6fd1ed95f 100644 --- a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/pypi-src-openeuler.inc +++ b/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/pypi-src-openeuler.inc @@ -1,5 +1,5 @@ OPENEULER_REPO_NAME = "python-${PYPI_PACKAGE}" # use openeuler's pkg src -SRC_URI_remove += "${PYPI_SRC_URI} " -SRC_URI_prepend += "file://${PYPI_PACKAGE}-${PV}.tar.gz " +SRC_URI:remove = "${PYPI_SRC_URI} " +SRC_URI:prepend = "file://${PYPI_PACKAGE}-${PV}.tar.gz " diff --git a/meta-openeuler/recipes-devtools/python/python3-argcomplete_%.bbappend b/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-argcomplete_%.bbappend similarity index 100% rename from meta-openeuler/recipes-devtools/python/python3-argcomplete_%.bbappend rename to meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-argcomplete_%.bbappend diff --git a/meta-openeuler/recipes-devtools/python/python3-cmd2/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch b/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-cmd2/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch similarity index 100% rename from meta-openeuler/recipes-devtools/python/python3-cmd2/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch rename to meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-cmd2/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch diff --git a/meta-openeuler/recipes-devtools/python/python3-cmd2_%.bbappend b/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-cmd2_%.bbappend similarity index 88% rename from meta-openeuler/recipes-devtools/python/python3-cmd2_%.bbappend rename to meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-cmd2_%.bbappend index ba09733fce141f42435546e8dec076084a9a491a..2f191b6463066c198c497587f4a7f10e5f7b8688 100644 --- a/meta-openeuler/recipes-devtools/python/python3-cmd2_%.bbappend +++ b/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-cmd2_%.bbappend @@ -10,5 +10,5 @@ require pypi-src-openeuler.inc # and mirror structure. The only usage of scm is the generation of the _version.py # file and in the release tarball it is already correctly created FILESEXTRAPATHS:prepend := "${THISDIR}/python3-cmd2/:" -SRC_URI_append += "file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch" +SRC_URI:append = "file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch" diff --git a/meta-openeuler/recipes-devtools/python/python3-dateutil_%.bbappend b/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-dateutil_%.bbappend similarity index 100% rename from meta-openeuler/recipes-devtools/python/python3-dateutil_%.bbappend rename to meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-dateutil_%.bbappend diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-docopt_%.bbappend b/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-docopt_%.bbappend new file mode 100644 index 0000000000000000000000000000000000000000..cfcc22838dfb145a90f69138d0a249dd2124dfc8 --- /dev/null +++ b/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-docopt_%.bbappend @@ -0,0 +1,5 @@ +PV = "0.6.2" +LIC_FILES_CHKSUM = "file://LICENSE-MIT;md5=09b77fb74986791a3d4a0e746a37d88f" +SRC_URI[md5sum] = "a6c44155426fd0f7def8b2551d02fef6" +SRC_URI[sha256sum] = "2113eed1e7fbbcd43fb7ee6a977fb02d0b482753586c9dc1a8e3b7d541426e99" +require pypi-src-openeuler.inc diff --git a/meta-openeuler/recipes-devtools/python/python3-lxml_%.bbappend b/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-lxml_%.bbappend similarity index 80% rename from meta-openeuler/recipes-devtools/python/python3-lxml_%.bbappend rename to meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-lxml_%.bbappend index cecebf4d1215a6837e2ca75eb8b5eff470731ee6..7c2158b46cb62d3932ed9ad28f60d1af79aea11e 100644 --- a/meta-openeuler/recipes-devtools/python/python3-lxml_%.bbappend +++ b/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-lxml_%.bbappend @@ -3,7 +3,10 @@ SRC_URI[md5sum] = "e27240a7319d80d0c1e5390ca31eb1d8" SRC_URI[sha256sum] = "fe749b052bb7233fe5d072fcb549221a8cb1a16725c47c37e42b0b9cb3ff2c3f" require pypi-src-openeuler.inc +SRC_URI:remove = "file://CVE-2022-2309.patch \ +" + # apply openeuler's patches -SRC_URI_append += " \ +SRC_URI:append = " \ file://backport-Work-around-libxml2-bug-in-affected-versions.patch \ " diff --git a/meta-openeuler/recipes-devtools/python/python3-mccabe_%.bbappend b/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-mccabe_%.bbappend similarity index 100% rename from meta-openeuler/recipes-devtools/python/python3-mccabe_%.bbappend rename to meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-mccabe_%.bbappend diff --git a/meta-openeuler/recipes-devtools/python/python3-mock_%.bbappend b/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-mock_%.bbappend similarity index 100% rename from meta-openeuler/recipes-devtools/python/python3-mock_%.bbappend rename to meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-mock_%.bbappend diff --git a/meta-openeuler/recipes-devtools/python/python3-netifaces_%.bbappend b/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-netifaces_%.bbappend similarity index 100% rename from meta-openeuler/recipes-devtools/python/python3-netifaces_%.bbappend rename to meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-netifaces_%.bbappend diff --git a/meta-openeuler/recipes-devtools/python/python3-pep8_%.bbappend b/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-pep8_%.bbappend similarity index 100% rename from meta-openeuler/recipes-devtools/python/python3-pep8_%.bbappend rename to meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-pep8_%.bbappend diff --git a/meta-openeuler/recipes-devtools/python/python3-prettytable/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch b/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-prettytable/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch similarity index 100% rename from meta-openeuler/recipes-devtools/python/python3-prettytable/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch rename to meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-prettytable/0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch diff --git a/meta-openeuler/recipes-devtools/python/python3-prettytable_%.bbappend b/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-prettytable_%.bbappend similarity index 83% rename from meta-openeuler/recipes-devtools/python/python3-prettytable_%.bbappend rename to meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-prettytable_%.bbappend index 5a191e511669ce1372902f4d801dd23e6bc30a55..6552595dbcb38651784203578f1f4829ff8f965c 100644 --- a/meta-openeuler/recipes-devtools/python/python3-prettytable_%.bbappend +++ b/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-prettytable_%.bbappend @@ -3,13 +3,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c9a6829fcd174d9535b46211917c7671" SRC_URI[md5sum] = "c4784a3ea8bd6b326932d112458e051a" SRC_URI[sha256sum] = "18e56447f636b447096977d468849c1e2d3cfa0af8e7b5acfcf83a64790c0aca" -SRC_URI_remove += " \ +SRC_URI:remove = " \ https://pypi.python.org/packages/source/P/PrettyTable/${SRCNAME}-${PV}.zip \ " OPENEULER_REPO_NAME = "python-prettytable" -SRC_URI_prepend += "file://prettytable-${PV}.tar.gz " +SRC_URI:prepend = "file://prettytable-${PV}.tar.gz " # remove the setup_requires for setuptools-scm(same as python3-pytest): # The setup_requires argument forces the download of the egg file for setuptools-scm @@ -17,5 +17,5 @@ SRC_URI_prepend += "file://prettytable-${PV}.tar.gz " # and mirror structure. The only usage of scm is the generation of the _version.py # file and in the release tarball it is already correctly created FILESEXTRAPATHS:prepend := "${THISDIR}/python3-prettytable/:" -SRC_URI_append += "file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch" +SRC_URI:append = "file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch" diff --git a/meta-openeuler/recipes-devtools/python/python3-pybind11_%.bbappend b/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-pybind11_%.bbappend similarity index 87% rename from meta-openeuler/recipes-devtools/python/python3-pybind11_%.bbappend rename to meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-pybind11_%.bbappend index 0af90d52928ea3229b76c3d59ea5bc9a444537ee..98d7531e84c25b0362e406095474d3d2e49f9963 100644 --- a/meta-openeuler/recipes-devtools/python/python3-pybind11_%.bbappend +++ b/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-pybind11_%.bbappend @@ -3,7 +3,7 @@ SRC_URI[md5sum] = "06d173fb97f1d2d804d318e47f924892" SRC_URI[sha256sum] = "f1bcc07caa568eb312411dde5308b1e250bd0e1bc020fae855bf9f43209940cc" # remove meta-python conflict src -SRC_URI_remove += " \ +SRC_URI:remove = " \ git://github.com/pybind/pybind11.git;branch=master;protocol=https \ file://0001-Do-not-strip-binaries.patch \ file://0001-Do-not-check-pointer-size-when-cross-compiling.patch \ @@ -12,4 +12,4 @@ SRC_URI_remove += " \ S = "${WORKDIR}/pybind11-${PV}" OPENEULER_REPO_NAME = "pybind11" -SRC_URI_prepend += "file://v${PV}.tar.gz " +SRC_URI:prepend = "file://v${PV}.tar.gz " diff --git a/meta-openeuler/recipes-devtools/python/python3-pyflakes_%.bbappend b/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-pyflakes_%.bbappend similarity index 94% rename from meta-openeuler/recipes-devtools/python/python3-pyflakes_%.bbappend rename to meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-pyflakes_%.bbappend index a90265013d84f3f4132b60d70fe5602b45b93fc0..24867f7dbfd8483d532206d29b6a90e95b82c6eb 100644 --- a/meta-openeuler/recipes-devtools/python/python3-pyflakes_%.bbappend +++ b/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-pyflakes_%.bbappend @@ -5,6 +5,6 @@ SRC_URI[sha256sum] = "f5bc8ecabc05bb9d291eb5203d6810b49040f6ff446a756326104746cc require pypi-src-openeuler.inc OPENEULER_REPO_NAME = "pyflakes" -SRC_URI_append += " \ +SRC_URI:append = " \ file://fix-syntax-error-offsets-for-python-3.10-635.patch \ " diff --git a/meta-openeuler/recipes-devtools/python/python3-pyperclip_%.bbappend b/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-pyperclip_%.bbappend similarity index 100% rename from meta-openeuler/recipes-devtools/python/python3-pyperclip_%.bbappend rename to meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-pyperclip_%.bbappend diff --git a/meta-openeuler/recipes-support/bridge-utils/bridge-utils_%.bbappend b/meta-openeuler/dynamic-layers/networking-layer/recipes-support/bridge-utils/bridge-utils_%.bbappend similarity index 93% rename from meta-openeuler/recipes-support/bridge-utils/bridge-utils_%.bbappend rename to meta-openeuler/dynamic-layers/networking-layer/recipes-support/bridge-utils/bridge-utils_%.bbappend index 80ab083537bc7b1027137241796aaa5c603c8109..b86d19a96d6473ceb67ae288a0e8bc1f707123df 100644 --- a/meta-openeuler/recipes-support/bridge-utils/bridge-utils_%.bbappend +++ b/meta-openeuler/dynamic-layers/networking-layer/recipes-support/bridge-utils/bridge-utils_%.bbappend @@ -4,12 +4,12 @@ PV = "1.7.1" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = "\ +SRC_URI:remove = "\ git://git.kernel.org/pub/scm/network/bridge/bridge-utils.git;branch=main \ " # files, patches that come from openeuler -SRC_URI_prepend = "\ +SRC_URI:prepend = "\ file://${BP}.tar.gz \ file://bugfix-avoid-showmacs-memory-leak.patch \ file://bugfix-bridge-not-check-parameters.patch \ diff --git a/meta-openeuler/dynamic-layers/networking-layer/recipes-support/cifs-utils/cifs-utils_%.bbappend b/meta-openeuler/dynamic-layers/networking-layer/recipes-support/cifs-utils/cifs-utils_%.bbappend index 90c9913d040f2519195cdb294c78ced90a80ec17..395430fa857f0ebddd74d17e62a80a85f9ecbbed 100644 --- a/meta-openeuler/dynamic-layers/networking-layer/recipes-support/cifs-utils/cifs-utils_%.bbappend +++ b/meta-openeuler/dynamic-layers/networking-layer/recipes-support/cifs-utils/cifs-utils_%.bbappend @@ -1,12 +1,17 @@ PV = "7.0" OPENEULER_SRC_URI_REMOVE = "https git http" -SRC_URI_prepend = "file://${BP}.tar.bz2 \ +SRC_URI:prepend = "file://${BP}.tar.bz2 \ " +SRC_URI:remove = " \ + file://CVE-2022-27239.patch \ + file://CVE-2022-29869.patch \ +" + SRC_URI[sha256sum] = "a7b6940e93250c1676a6fa66b6ead91b78cd43a5fee99cc462459c8b9cf1e6f4" S = "${WORKDIR}/${BP}" # keep the same as before, otherwise a large number of dependencies will be introduced -DEPENDS_remove = "libtalloc" +DEPENDS:remove = "libtalloc" diff --git a/meta-openeuler/recipes-support/ntp/ntp_%.bbappend b/meta-openeuler/dynamic-layers/networking-layer/recipes-support/ntp/ntp_%.bbappend similarity index 90% rename from meta-openeuler/recipes-support/ntp/ntp_%.bbappend rename to meta-openeuler/dynamic-layers/networking-layer/recipes-support/ntp/ntp_%.bbappend index eb97e75fc86b0abc53789891d184a451f75381e0..511b750191cebd649ae71f03ad4e530e756f860d 100644 --- a/meta-openeuler/recipes-support/ntp/ntp_%.bbappend +++ b/meta-openeuler/dynamic-layers/networking-layer/recipes-support/ntp/ntp_%.bbappend @@ -4,7 +4,7 @@ PV = "4.2.8p15" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.gz \ +SRC_URI:remove = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.gz \ file://ntp-4.2.4_p6-nano.patch \ file://reproducibility-fixed-path-to-posix-shell.patch \ file://0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch \ @@ -13,7 +13,7 @@ SRC_URI_remove = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV " # files, patches that come from openeuler -SRC_URI_prepend = "file://ntp-${PV}.tar.gz \ +SRC_URI:prepend = "file://ntp-${PV}.tar.gz \ file://Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch \ file://bugfix-fix-bind-port-in-debug-mode.patch \ file://fix-MD5-manpage.patch \ diff --git a/meta-openeuler/recipes-support/tcpdump/tcpdump_%.bbappend b/meta-openeuler/dynamic-layers/networking-layer/recipes-support/tcpdump/tcpdump_%.bbappend similarity index 95% rename from meta-openeuler/recipes-support/tcpdump/tcpdump_%.bbappend rename to meta-openeuler/dynamic-layers/networking-layer/recipes-support/tcpdump/tcpdump_%.bbappend index aa01183b68e5fb9fc3e761897b0de07f935cdf35..152995457ac5c1cf1d2b033502bc060cf0d73690 100644 --- a/meta-openeuler/recipes-support/tcpdump/tcpdump_%.bbappend +++ b/meta-openeuler/dynamic-layers/networking-layer/recipes-support/tcpdump/tcpdump_%.bbappend @@ -4,14 +4,14 @@ PV = "4.99.3" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = " \ +SRC_URI:remove = " \ http://www.tcpdump.org/release/${BP}.tar.gz \ file://add-ptest.patch \ file://run-ptest \ " # files, patches that come from openeuler # the backport-0003-Drop-root-priviledges-before-opening-first-savefile-.patch will result in error -SRC_URI_prepend = " \ +SRC_URI:prepend = " \ file://${BP}.tar.gz \ file://backport-0002-Use-getnameinfo-instead-of-gethostbyaddr.patch \ file://backport-0007-Introduce-nn-option.patch \ diff --git a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-benchmark/libhugetlbfs/libhugetlbfs_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-benchmark/libhugetlbfs/libhugetlbfs_%.bbappend index da31ce87ca85ecd9faf0e2b642d0d7d7c5aeba6d..caf55afc6b63fb650a3901b0adfcc10fa9d5c279 100644 --- a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-benchmark/libhugetlbfs/libhugetlbfs_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-benchmark/libhugetlbfs/libhugetlbfs_%.bbappend @@ -3,16 +3,16 @@ OPENEULER_SRC_URI_REMOVE = "git" # remove patch conflicting with openeuler -SRC_URI_remove = "file://0001-tests-makefile-Append-CPPFLAGS-rather-then-override.patch \ +SRC_URI:remove = "file://0001-tests-makefile-Append-CPPFLAGS-rather-then-override.patch \ " -SRC_URI_prepend = "file://${BP}.tar.gz \ +SRC_URI:prepend = "file://${BP}.tar.gz \ file://0000-build_flags.patch \ file://Disable-hugepage-backed-malloc-if-__morecore-is-not-.patch \ file://libhugetlbfs-make-cflags.patch \ " -do_install_append(){ +do_install:append(){ rm ${D}/${libdir}/libhugetlbfs.a rm ${D}/${libdir}/../bin/hugeadm rm ${D}/${libdir}/../bin/hugectl diff --git a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-connectivity/libwebsockets/libwebsockets_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-connectivity/libwebsockets/libwebsockets_%.bbappend index a169550be229c226681bd14a463c9cf83cc29194..f273a9ad734489ccc718e8d20223ed4f4b72bc3f 100644 --- a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-connectivity/libwebsockets/libwebsockets_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-connectivity/libwebsockets/libwebsockets_%.bbappend @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=382bfdf329e774859fd401eaf850d29b" OPENEULER_SRC_URI_REMOVE = "git" # apply openeuler source and patch -SRC_URI_prepend = "file://${BP}.tar.gz \ +SRC_URI:prepend = "file://${BP}.tar.gz \ file://0001-add-secure-compile-option-in-Makefile.patch \ file://0002-solve-the-BEP-problem.patch \ file://0003-route-extend-lws_route_uidx_t-from-1-byte-to-2-bytes.patch \ @@ -19,5 +19,5 @@ SRC_URI[md5sum] = "0f82cf061d50d4a2492c32aa149cd930" SRC_URI[sha256sum] = "e6693ab5aa925930b2c6471129b42a79b8f3cbbc493e5f8b89311cecc0c99bc0" # no libwebsockets-test-server -EXTRA_OECMAKE_append = " \ +EXTRA_OECMAKE:append = " \ -DLWS_WITHOUT_TEST_SERVER=ON" diff --git a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-connectivity/zeromq/zeromq_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-connectivity/zeromq/zeromq_%.bbappend index 43b59f61bb17f0eb3c4842d8f8631df3f4963e3b..2b7aaea40a07d5b75320a72520b31500034d2354 100644 --- a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-connectivity/zeromq/zeromq_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-connectivity/zeromq/zeromq_%.bbappend @@ -1,11 +1,10 @@ # main bbfile: yocto-meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.4.bb -OPENEULER_BRANCH = "master" OPENEULER_SRC_URI_REMOVE = "git https http" PV = "4.3.4" -SRC_URI_append = " \ +SRC_URI:append = " \ file://libzmq-${PV}.tar.gz \ file://fix-test_inproc_connect-occasionally-fails-on-slow-archs.patch \ " diff --git a/meta-openeuler/recipes-crypto/libsodium/libsodium_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-crypto/libsodium/libsodium_%.bbappend similarity index 91% rename from meta-openeuler/recipes-crypto/libsodium/libsodium_%.bbappend rename to meta-openeuler/dynamic-layers/openembedded-layer/recipes-crypto/libsodium/libsodium_%.bbappend index 7f1b585c50fd22ee103993bc167d8d58a3af9f0b..1c0e826f701a4055abb4d3580507c32fd050e5ed 100644 --- a/meta-openeuler/recipes-crypto/libsodium/libsodium_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-crypto/libsodium/libsodium_%.bbappend @@ -3,9 +3,7 @@ OPENEULER_BRANCH = "master" OPENEULER_SRC_URI_REMOVE = "git https http" -PV = "1.0.18" - -SRC_URI_append = " \ +SRC_URI:append = " \ file://libsodium-${PV}.tar.gz \ " diff --git a/meta-openeuler/recipes-devtools/abseil-cpp/abseil-cpp_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/abseil-cpp/abseil-cpp_%.bbappend similarity index 95% rename from meta-openeuler/recipes-devtools/abseil-cpp/abseil-cpp_%.bbappend rename to meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/abseil-cpp/abseil-cpp_%.bbappend index becb2f7526aea99d1912892ac8fcc287b3ffa3b2..777b53a9803093395be06e4f5e5d321ce9159694 100644 --- a/meta-openeuler/recipes-devtools/abseil-cpp/abseil-cpp_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/abseil-cpp/abseil-cpp_%.bbappend @@ -19,6 +19,6 @@ SRC_URI += " \ S = "${WORKDIR}/abseil-cpp-${PV}" # contains symbol link -INSANE_SKIP_${PN} += "dev-so" +INSANE_SKIP:${PN} += "dev-so" FILES:${PN} += "${libdir}/libabsl_*.so*" FILES:${PN}-dev += "${libdir}/pkgconfig" diff --git a/meta-openeuler/recipes-devtools/abseil-cpp/files/0001-absl-always-use-asm-sgidefs.h.patch b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/abseil-cpp/files/0001-absl-always-use-asm-sgidefs.h.patch similarity index 100% rename from meta-openeuler/recipes-devtools/abseil-cpp/files/0001-absl-always-use-asm-sgidefs.h.patch rename to meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/abseil-cpp/files/0001-absl-always-use-asm-sgidefs.h.patch diff --git a/meta-openeuler/recipes-devtools/abseil-cpp/files/0002-Remove-maes-option-from-cross-compilation.patch b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/abseil-cpp/files/0002-Remove-maes-option-from-cross-compilation.patch similarity index 100% rename from meta-openeuler/recipes-devtools/abseil-cpp/files/0002-Remove-maes-option-from-cross-compilation.patch rename to meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/abseil-cpp/files/0002-Remove-maes-option-from-cross-compilation.patch diff --git a/meta-openeuler/recipes-devtools/abseil-cpp/files/0003-Remove-neon-option-from-cross-compilation.patch b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/abseil-cpp/files/0003-Remove-neon-option-from-cross-compilation.patch similarity index 100% rename from meta-openeuler/recipes-devtools/abseil-cpp/files/0003-Remove-neon-option-from-cross-compilation.patch rename to meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/abseil-cpp/files/0003-Remove-neon-option-from-cross-compilation.patch diff --git a/meta-openeuler/recipes-devtools/abseil-cpp/files/abseil-ppc-fixes.patch b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/abseil-cpp/files/abseil-ppc-fixes.patch similarity index 100% rename from meta-openeuler/recipes-devtools/abseil-cpp/files/abseil-ppc-fixes.patch rename to meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/abseil-cpp/files/abseil-ppc-fixes.patch diff --git a/meta-openeuler/recipes-devtools/cjson/cjson_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/cjson/cjson_%.bbappend similarity index 100% rename from meta-openeuler/recipes-devtools/cjson/cjson_%.bbappend rename to meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/cjson/cjson_%.bbappend diff --git a/meta-openeuler/recipes-devtools/lapack/lapack_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/lapack/lapack_%.bbappend similarity index 94% rename from meta-openeuler/recipes-devtools/lapack/lapack_%.bbappend rename to meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/lapack/lapack_%.bbappend index 628539d04bef82d3972535a19d26dd1be8c6cb93..e7dec895be50f9f0f999ddecb2d3258d5f4fd4b1 100644 --- a/meta-openeuler/recipes-devtools/lapack/lapack_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/lapack/lapack_%.bbappend @@ -11,10 +11,10 @@ PV = "3.10.0" S = "${WORKDIR}/lapack-${PV}" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = " \ +SRC_URI:remove = " \ " # files, patches that come from openeuler -SRC_URI_prepend = " \ +SRC_URI:prepend = " \ file://v${PV}.tar.gz \ file://0001-fix-lapack-devel-build-error.patch \ file://0002-Fix-out-of-bounds-read-in-slarrv.patch \ diff --git a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/lua/lua_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/lua/lua_%.bbappend index d1a18d3e562b749cba0798283e78cea439400817..c1637012f1b23cef35eb987dbf5dc42f18f5f6f0 100644 --- a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/lua/lua_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/lua/lua_%.bbappend @@ -1,63 +1,23 @@ -LIC_FILES_CHKSUM = "file://doc/readme.html;beginline=307;endline=330;md5=79c3f6b19ad05efe24c1681f025026bb" -PV = "5.4.4" -PV_testsuites = "5.4.3" -MINOR_VERSION = "5.4" +# the main bb file: yocto-poky/meta/recipes-devtools/lua/lua_5.4.4.bb # remove patches out of date -SRC_URI_remove = "file://0001-Allow-building-lua-without-readline-on-Linux.patch \ - file://CVE-2020-15888.patch \ - file://CVE-2020-15945.patch \ - file://0001-Fixed-bug-barriers-cannot-be-active-during-sweep.patch \ +SRC_URI:remove = "http://www.lua.org/ftp/lua-${PV}.tar.gz;name=tarballsrc \ " # openeuler has patches for lua-${PV}-tests -SRC_URI += " \ - http://www.lua.org/tests/lua-${PV}-tests.tar.gz;name=tarballtest;subdir=${BP}/ \ - file://run-ptest \ - file://lua-5.4.0-beta-autotoolize.patch \ - file://lua-5.3.0-idsize.patch \ - file://lua-5.2.2-configure-linux.patch \ - file://lua-5.3.0-configure-compat-module.patch \ - file://backport-CVE-2022-28805.patch \ - file://backport-CVE-2022-33099.patch \ - file://backport-luaV_concat-can-use-invalidated-pointer-to-stack.patch \ +SRC_URI:prepend = " \ + file://${BP}.tar.gz;name=tarballsrc \ " +# the follow openeuler patchs apply failed +# file://lua-5.4.0-beta-autotoolize.patch +# file://lua-5.3.0-idsize.patch +# file://lua-5.2.2-configure-linux.patch +# file://lua-5.3.0-configure-compat-module.patch +# file://backport-CVE-2022-28805.patch +# file://backport-CVE-2022-33099.patch +# file://backport-luaV_concat-can-use-invalidated-pointer-to-stack.patch SRC_URI[tarballsrc.md5sum] = "bd8ce7069ff99a400efd14cf339a727b" SRC_URI[tarballsrc.sha256sum] = "164c7849653b80ae67bec4b7473b884bf5cc8d2dca05653475ec2ed27b9ebf61" SRC_URI[tarballtest.md5sum] = "0e28a9b48b3596d6b12989d04ae403c4" SRC_URI[tarballtest.sha256sum] = "04d28355cd67a2299dfe5708b55a0ff221ccb1a3907a3113cc103ccc05ac6aad" - -EXTRA_OEMAKE = "'CC=${CC} -fPIC' 'MYCFLAGS=${CFLAGS} -fPIC' MYLDFLAGS='${LDFLAGS}' 'AR=ar rcD' 'RANLIB=ranlib -D'" - -do_prepare_before_patch() { - cd ${S} - # openeuler has change its name, and patch it - cp -f src/luaconf.h src/luaconf.h.template.in - cd - -} - -addtask do_prepare_before_patch before do_patch after do_unpack - -do_compile () { - oe_runmake ${@bb.utils.contains('PACKAGECONFIG', 'readline', 'linux-readline', 'linux', d)} -} - -# use MINOR_VERSION instead of 5.3 -do_install () { - oe_runmake \ - 'INSTALL_TOP=${D}${prefix}' \ - 'INSTALL_BIN=${D}${bindir}' \ - 'INSTALL_INC=${D}${includedir}/' \ - 'INSTALL_MAN=${D}${mandir}/man1' \ - 'INSTALL_SHARE=${D}${datadir}/lua' \ - 'INSTALL_LIB=${D}${libdir}' \ - 'INSTALL_CMOD=${D}${libdir}/lua/${MINOR_VERSION}' \ - install - install -d ${D}${libdir}/pkgconfig - - sed -e s/@VERSION@/${PV}/ ${WORKDIR}/lua.pc.in > ${WORKDIR}/lua.pc - install -m 0644 ${WORKDIR}/lua.pc ${D}${libdir}/pkgconfig/ - rmdir ${D}${datadir}/lua/${MINOR_VERSION} - rmdir ${D}${datadir}/lua -} diff --git a/meta-openeuler/recipes-devtools/nlohmann-json/nlohmann-json_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/nlohmann-json/nlohmann-json_%.bbappend similarity index 100% rename from meta-openeuler/recipes-devtools/nlohmann-json/nlohmann-json_%.bbappend rename to meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/nlohmann-json/nlohmann-json_%.bbappend diff --git a/meta-openeuler/recipes-devtools/protobuf/protobuf_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/protobuf/protobuf_%.bbappend similarity index 95% rename from meta-openeuler/recipes-devtools/protobuf/protobuf_%.bbappend rename to meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/protobuf/protobuf_%.bbappend index 83c1909fe5d7b3de1d75b7671e541d895f47f342..62c8cc9da84fec3d63cdd411923bff14c34daadf 100644 --- a/meta-openeuler/recipes-devtools/protobuf/protobuf_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/protobuf/protobuf_%.bbappend @@ -9,11 +9,11 @@ PV = "3.14.0" S = "${WORKDIR}/protobuf-${PV}" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = " \ +SRC_URI:remove = " \ file://0001-Lower-init-prio-for-extension-attributes.patch \ " # files, patches that come from openeuler -SRC_URI_prepend = " \ +SRC_URI:prepend = " \ file://protobuf-all-${PV}.tar.gz \ file://0001-add-secure-compile-option-in-Makefile.patch \ file://0002-add-secure-compile-fs-check-in-Makefile.patch \ diff --git a/meta-openeuler/recipes-devtools/xerces-c/xerces-c_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/xerces-c/xerces-c_%.bbappend similarity index 95% rename from meta-openeuler/recipes-devtools/xerces-c/xerces-c_%.bbappend rename to meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/xerces-c/xerces-c_%.bbappend index 3462c6a1b247c97f6248ef3ccce7f6bdaa53e948..3db99065b53dc85dfe05213cdcd74b63d46920d7 100644 --- a/meta-openeuler/recipes-devtools/xerces-c/xerces-c_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/xerces-c/xerces-c_%.bbappend @@ -13,10 +13,10 @@ PV = "3.2.4" S = "${WORKDIR}/xerces-c-${PV}" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = " \ +SRC_URI:remove = " \ " # files, patches that come from openeuler -SRC_URI_prepend = " \ +SRC_URI:prepend = " \ file://xerces-c-${PV}.tar.gz \ file://CVE-2018-1311.patch \ " diff --git a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/yajl/yajl_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/yajl/yajl_%.bbappend index a7f43ac75cfdb0ccabb477f8ff3fcf1af072039c..8c2e7260b688c3414abb7b5e487d89195f41507b 100644 --- a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/yajl/yajl_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-devtools/yajl/yajl_%.bbappend @@ -2,7 +2,7 @@ OPENEULER_SRC_URI_REMOVE = "git" -SRC_URI_prepend = " \ +SRC_URI:prepend = " \ file://${PV}.tar.gz \ file://0001-yajl-2.1.0-pkgconfig-location.patch \ file://0002-yajl-2.1.0-pkgconfig-includedir.patch \ diff --git a/meta-openeuler/recipes-extended/libmodbus/libmodbus_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-extended/libmodbus/libmodbus_3.1.7%.bbappend similarity index 34% rename from meta-openeuler/recipes-extended/libmodbus/libmodbus_%.bbappend rename to meta-openeuler/dynamic-layers/openembedded-layer/recipes-extended/libmodbus/libmodbus_3.1.7%.bbappend index cfb7a7dc3493b13cf91290c271f49ed4cd83415d..db2802ad291e27f0e9775442e0dc4f425ef0f5db 100644 --- a/meta-openeuler/recipes-extended/libmodbus/libmodbus_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-extended/libmodbus/libmodbus_3.1.7%.bbappend @@ -1,7 +1,13 @@ +# yocto-meta-openembedded/meta-oe/recipes-graphics/gphoto2/libmodbus_3.1.7.bb + +# note: the upstream bb file has two version: 3.1.7 and 3.0.6, so in order to fix +# us openeuler version better, the bbappend name set to "libmodbus_3.1%.bbappend" + PV = "3.1.6" OPENEULER_BRANCH = "master" -SRC_URI += "file://0000-libmodbus-Heap-based-Buffer-Overflow-in-modbus_reply.patch" +SRC_URI:append = " \ + file://0000-libmodbus-Heap-based-Buffer-Overflow-in-modbus_reply.patch" SRC_URI[md5sum] = "15c84c1f7fb49502b3efaaa668cfd25e" SRC_URI[sha256sum] = "d7d9fa94a16edb094e5fdf5d87ae17a0dc3f3e3d687fead81835d9572cf87c16" diff --git a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-extended/libpwquality/libpwquality_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-extended/libpwquality/libpwquality_%.bbappend index 8b1a5b7e4e84ea7ced2fa512605f69c40b7eb17b..3ea5481c4b61bcb5af0b6a0a2acaf590dfbf1e51 100644 --- a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-extended/libpwquality/libpwquality_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-extended/libpwquality/libpwquality_%.bbappend @@ -1,7 +1,7 @@ # main bbfile: meta-oe/recipes-extended/libpwquality/libpwquality_1.4.4.bb # change install dir: ${base_libdir}(meta-openeuler) -> ${libdir}(meta-oe) -SRC_URI_remove = "file://add-missing-python-include-dir-for-cross.patch \ +SRC_URI:remove = "file://add-missing-python-include-dir-for-cross.patch \ " OPENEULER_SRC_URI_REMOVE = "https git" @@ -16,10 +16,10 @@ SRC_URI =+ " \ " # do not enable python bindings, as well as not use gettext to translate -DEPENDS_remove = "virtual/gettext ${PYTHON_PN}-native ${PYTHON_PN}" -RDEPENDS_${PN}_remove = "${@['', '${PYTHON_PN}-core']['${CLASSOVERRIDE}' == 'class-target']}" +DEPENDS:remove = "virtual/gettext ${PYTHON_PN}-native ${PYTHON_PN}" +RDEPENDS:${PN}:remove = "${@['', '${PYTHON_PN}-core']['${CLASSOVERRIDE}' == 'class-target']}" -EXTRA_OECONF_remove = "--with-python-rev=${PYTHON_BASEVERSION} \ +EXTRA_OECONF:remove = "--with-python-rev=${PYTHON_BASEVERSION} \ --with-python-binary=${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} \ --with-pythonsitedir=${PYTHON_SITEPACKAGES_DIR} \ " diff --git a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-extended/rsyslog/libfastjson_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-extended/rsyslog/libfastjson_%.bbappend index d886bdd99de756bca21e0c3e9c779d7ee8e30f9c..8a95aa74ba6135d00bc9eed4dab35714247aeda8 100644 --- a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-extended/rsyslog/libfastjson_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-extended/rsyslog/libfastjson_%.bbappend @@ -1,6 +1,9 @@ # main bbfile: meta-oe/recipes-extended/rsyslog/libfastjson_0.99.9.bb?h=hardknott -SRC_URI = "file://${BP}.tar.gz" +SRC_URI = " \ + file://${BP}.tar.gz \ + file://backport-CVE-2020-12762.patch \ +" SRC_URI[md5sum] = "b4668f067145d4eb2a44433d5256f277" SRC_URI[sha256sum] = "a330e1bdef3096b7ead53b4bad1a6158f19ba9c9ec7c36eda57de7729d84aaee" diff --git a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-extended/rsyslog/rsyslog_%.bbappend index 39a390e0411f5a1f3629bad445af5fa32e8c39ae..c982dd6a161a412a3e1eeb872839ccb8e577b28d 100644 --- a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-extended/rsyslog/rsyslog_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-extended/rsyslog/rsyslog_%.bbappend @@ -1,6 +1,6 @@ # main bbfile: meta-oe/recipes-extended/rsyslog/rsyslog_8.2102.0.bb?h=hardknott -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" # version in openEuler PV = "8.2210.0" @@ -19,5 +19,5 @@ SRC_URI[md5sum] = "23239f609af189b0814f8adc95ad9c02" SRC_URI[sha256sum] = "643ee279139d694a07c9ff3ff10dc5213bdf874983d27d373525e95e05fa094d" # according to openEuler, no need to use liblogging libgcrypt -DEPENDS_remove = "liblogging" -PACKAGECONFIG_remove = "libgcrypt" +DEPENDS:remove = "liblogging" +PACKAGECONFIG:remove = "libgcrypt" diff --git a/meta-openeuler/recipes-graphics/gphoto2/gphoto2_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-graphics/gphoto2/gphoto2_%.bbappend similarity index 95% rename from meta-openeuler/recipes-graphics/gphoto2/gphoto2_%.bbappend rename to meta-openeuler/dynamic-layers/openembedded-layer/recipes-graphics/gphoto2/gphoto2_%.bbappend index 4710a104285768c29d1c3b23648513ba83b3f99e..a6e66d7c4332e3df7d3a5f82326f9b432fd6872f 100644 --- a/meta-openeuler/recipes-graphics/gphoto2/gphoto2_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-graphics/gphoto2/gphoto2_%.bbappend @@ -7,7 +7,7 @@ OPENEULER_SRC_URI_REMOVE = "https http git" PV = "2.5.17" # file can't apply form oe -SRC_URI:remove += " \ +SRC_URI:remove = " \ ${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2;name=gphoto2 \ " diff --git a/meta-openeuler/recipes-graphics/gphoto2/libgphoto2_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-graphics/gphoto2/libgphoto2_%.bbappend similarity index 66% rename from meta-openeuler/recipes-graphics/gphoto2/libgphoto2_%.bbappend rename to meta-openeuler/dynamic-layers/openembedded-layer/recipes-graphics/gphoto2/libgphoto2_%.bbappend index 4fe7cfb20552dbd99f94387893d3d07c0bb9c2e4..320e45f270dc6e3bf4320847adc7578ed960ec4d 100644 --- a/meta-openeuler/recipes-graphics/gphoto2/libgphoto2_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-graphics/gphoto2/libgphoto2_%.bbappend @@ -7,15 +7,19 @@ OPENEULER_SRC_URI_REMOVE = "https http git" PV = "2.5.18" # file can't apply form oe -SRC_URI:remove += " \ - " +SRC_URI:remove = " \ + ${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2;name=libgphoto2 \ +" # source change to openEuler -SRC_URI += " \ - file://libgphoto2-${PV}.tar.bz2 \ - file://gphoto2-pkgcfg.patch \ - file://gphoto2-device-return.patch \ - " +SRC_URI:append = " \ + file://libgphoto2-${PV}.tar.bz2;name=libgphoto2 \ + file://gphoto2-pkgcfg.patch \ + file://gphoto2-device-return.patch \ +" + +SRC_URI[libgphoto2.md5sum] = "36c386f4c4e450d20bbc8b5a448e8b73" +SRC_URI[libgphoto2.sha256sum] = "5b17b89d7ca0ec35c72c94ac3701e87d49e52371f9509b8e5c08c913ae57a7ec" # for native sdk of gettext, its a workaround to avoid STAGING_DATADIR_NATIVE gettext files not exist do_configure:prepend() { diff --git a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-graphics/tslib/tslib_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-graphics/tslib/tslib_%.bbappend index 62e0237557f766eba044bb98296849ce5ba2cde3..079796cdf2f42baad24a2137d15dca19d48a4f65 100644 --- a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-graphics/tslib/tslib_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-graphics/tslib/tslib_%.bbappend @@ -2,10 +2,17 @@ PV = "1.16" -SRC_URI_remove = "https://github.com/kergoth/tslib/releases/download/${PV}/tslib-${PV}.tar.xz;downloadfilename=tslib-${PV}.tar.xz \ +SRC_URI:remove = "https://github.com/kergoth/tslib/releases/download/${PV}/tslib-${PV}.tar.xz;downloadfilename=tslib-${PV}.tar.xz \ " -SRC_URI_prepend = "file://${BP}.tar.bz2 \ +SRC_URI:prepend = "file://${BP}.tar.bz2 \ " S = "${WORKDIR}/${BP}" + +PACKAGECONFIG[evthres] = "" +PACKAGECONFIG[one-wire-ts-input] = "" +PACKAGECONFIG:remove = "evthres" + +SRC_URI[md5sum] = "22adf05cb3f828889bbb329a505b3847" +SRC_URI[sha256sum] = "15bf44035a05a8ce4f7b0686cf5e989492fda3a1fcd8b3ad9e850db1fcd51928" \ No newline at end of file diff --git a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-multimedia/cdrkit/cdrkit_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-multimedia/cdrkit/cdrkit_%.bbappend index 42b9dfffe968f3f57177307a78a03ec43560d0ff..2293b7732dceb1552837c03644405a11f1bd5061 100644 --- a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-multimedia/cdrkit/cdrkit_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-multimedia/cdrkit/cdrkit_%.bbappend @@ -2,7 +2,7 @@ # files, patches can't be applied in openeuler or conflict with openeuler # patches apply fail: 0001-genisoimage-Add-missing-extern-definition.patch -SRC_URI_remove = " \ +SRC_URI:remove = " \ ${DEBIAN_MIRROR}/main/c/${BPN}/${BPN}_${PV}.orig.tar.gz \ file://0001-genisoimage-Add-missing-extern-definition.patch \ " @@ -10,7 +10,7 @@ SRC_URI_remove = " \ # files, patches that come from openeuler # CDDA cdparanoia is an audio CDs tool, thus don't apply cdrkit-1.1.11-paranoiacdda.patch # cdrkit-1.1.11-cmakewarn.patch requires that the minimum version of cmake is 2.8, current is 3.19.5 -SRC_URI_prepend = "file://${BP}.tar.gz \ +SRC_URI:prepend = "file://${BP}.tar.gz \ file://cdrkit-1.1.8-werror.patch \ file://cdrkit-1.1.9-efi-boot.patch \ file://cdrkit-1.1.9-no_mp3.patch \ @@ -37,7 +37,7 @@ SRC_URI[md5sum] = "efe08e2f3ca478486037b053acd512e9" SRC_URI[sha256sum] = "d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc78e47da" # fix problem "do_populate_sysroot: sstate found an absolute path symlink" -do_install_append() { +do_install:append() { rm -f ${D}${bindir}/mkisofs ln -sf --relative ${D}${bindir}/genisoimage ${D}${bindir}/mkisofs } diff --git a/meta-openeuler/recipes-multimedia/v4l2apps/v4l-utils_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-multimedia/v4l2apps/v4l-utils_%.bbappend similarity index 77% rename from meta-openeuler/recipes-multimedia/v4l2apps/v4l-utils_%.bbappend rename to meta-openeuler/dynamic-layers/openembedded-layer/recipes-multimedia/v4l2apps/v4l-utils_%.bbappend index 8dfa0ded4b177aff16d5362fe3b4c2099dcdfe2a..158534973d43cb506cfc325683aed1c231646b38 100644 --- a/meta-openeuler/recipes-multimedia/v4l2apps/v4l-utils_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-multimedia/v4l2apps/v4l-utils_%.bbappend @@ -7,7 +7,7 @@ OPENEULER_SRC_URI_REMOVE = "https http git" PV = "1.14.2" # file can't apply form oe -SRC_URI:remove += " \ +SRC_URI:remove = " \ file://0001-Revert-media-ctl-Don-t-install-libmediactl-and-libv4.patch \ file://mediactl-pkgconfig.patch \ file://export-mediactl-headers.patch \ @@ -15,6 +15,7 @@ SRC_URI:remove += " \ file://0007-Do-not-use-getsubopt.patch \ file://0008-configure.ac-autodetect-availability-of-systemd.patch \ file://0009-keytable-restrict-installation-of-50-rc_keymap.conf.patch \ + file://0003-original-patch-export-mediactl-headers.patch \ " # source change to openEuler @@ -25,12 +26,12 @@ SRC_URI += " \ " # we don't want feature of udev and keymaps for out embedded OS, if use, delete those code. -DEPENDS:remove:class-target += "udev" +DEPENDS:remove:class-target = "udev" EXTRA_OECONF = "--disable-qv4l2 --enable-shared" -PACKAGES:remove += " ir-keytable rc-keymaps " -FILES_ir-keytable = "" -RDEPENDS_ir-keytable = "" -FILES_rc-keymaps = "" +PACKAGES:remove = " ir-keytable rc-keymaps " +FILES:ir-keytable = "" +RDEPENDS:ir-keytable = "" +FILES:rc-keymaps = "" # udev and keymaps files still generated, so we put in a package and may not pack in rootfs -PACKAGES:append += " udev-keymaps " -FILES_udev-keymaps = "${sysconfdir}/rc* ${base_libdir}/udev* ${libdir}/udev* /lib/udev" +PACKAGES:append = " udev-keymaps " +FILES:udev-keymaps = "${sysconfdir}/rc* ${base_libdir}/udev* ${libdir}/udev* /lib/udev" diff --git a/meta-openeuler/recipes-support/asio/asio_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/asio/asio_%.bbappend similarity index 83% rename from meta-openeuler/recipes-support/asio/asio_%.bbappend rename to meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/asio/asio_%.bbappend index 57d5711ffe09c9d2e00c44c044207c0712dc42b0..8bf9ba0bd712c6ceafa0cb5257bd3eaf7ee1f4dd 100644 --- a/meta-openeuler/recipes-support/asio/asio_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/asio/asio_%.bbappend @@ -4,7 +4,7 @@ PV = "1.16.1" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = " \ +SRC_URI:remove = " \ ${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2 \ " @@ -15,3 +15,4 @@ SRC_URI += " \ SRC_URI[md5sum] = "d34b58ce6e452eeb142d90d48d09422b" SRC_URI[sha256sum] = "f818986015f26002dfade21f7769aff4e6cd1e720373750536e5e5d00cf922af" +LIC_FILES_CHKSUM = "file://COPYING;md5=de86c8210a433f72bd3cc98e797a6084" \ No newline at end of file diff --git a/meta-openeuler/recipes-support/ceres-solver/ceres-solver_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/ceres-solver/ceres-solver_%.bbappend similarity index 90% rename from meta-openeuler/recipes-support/ceres-solver/ceres-solver_%.bbappend rename to meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/ceres-solver/ceres-solver_%.bbappend index 3e03fb0bb85cccaf995377b2806333b68474830b..c867c0436266f68d2f37277baf17aa49bcc3a5f5 100644 --- a/meta-openeuler/recipes-support/ceres-solver/ceres-solver_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/ceres-solver/ceres-solver_%.bbappend @@ -9,11 +9,11 @@ PV = "2.0.0" S = "${WORKDIR}/ceres-solver-${PV}" # files, patches that come from openeuler -SRC_URI_prepend = " \ +SRC_URI:prepend = " \ file://ceres-solver-${PV}.tar.gz \ " # bb need .git to do_configure -do_configure_prepend() { +do_configure:prepend() { mkdir -p ${S}/.git/hooks/ } diff --git a/meta-openeuler/recipes-support/fmt/fmt_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/fmt/fmt_%.bbappend similarity index 96% rename from meta-openeuler/recipes-support/fmt/fmt_%.bbappend rename to meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/fmt/fmt_%.bbappend index d116ac046e9dd5d9441c3bebc7346310a27cb970..3e523912b3432c0dd6d8beb94bf9c89571e3473d 100644 --- a/meta-openeuler/recipes-support/fmt/fmt_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/fmt/fmt_%.bbappend @@ -6,7 +6,7 @@ PV = "8.0.1" S = "${WORKDIR}/${BPN}-${PV}" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = " \ +SRC_URI:remove = " \ git://github.com/fmtlib/fmt;branch=master;protocol=https \ " diff --git a/meta-openeuler/recipes-support/gflags/gflags_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/gflags/gflags_%.bbappend similarity index 90% rename from meta-openeuler/recipes-support/gflags/gflags_%.bbappend rename to meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/gflags/gflags_%.bbappend index 6b146653fc0c78add168832ddbcc53bc11ec883d..2f51c6ea2298de5afba6a1efc30740cc17d8b2db 100644 --- a/meta-openeuler/recipes-support/gflags/gflags_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/gflags/gflags_%.bbappend @@ -9,11 +9,11 @@ PV = "2.2.2" S = "${WORKDIR}/gflags-${PV}" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = " \ +SRC_URI:remove = " \ " # files, patches that come from openeuler -SRC_URI_prepend = " \ +SRC_URI:prepend = " \ file://gflags-${PV}.tar.gz \ " diff --git a/meta-openeuler/recipes-support/glog/files/0001-Find-Libunwind-during-configure.patch b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/glog/files/0001-Find-Libunwind-during-configure.patch similarity index 100% rename from meta-openeuler/recipes-support/glog/files/0001-Find-Libunwind-during-configure.patch rename to meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/glog/files/0001-Find-Libunwind-during-configure.patch diff --git a/meta-openeuler/recipes-support/glog/glog_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/glog/glog_%.bbappend similarity index 84% rename from meta-openeuler/recipes-support/glog/glog_%.bbappend rename to meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/glog/glog_%.bbappend index ddb625dbeaaaa6f9fa4dd69a2bb035f83e779677..68152ebdb035a2a1ad404b7ef934a07e166a9cb1 100644 --- a/meta-openeuler/recipes-support/glog/glog_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/glog/glog_%.bbappend @@ -1,21 +1,21 @@ # main bbfile: yocto-meta-openembedded/meta-oe/recipes-support/glog/glog_0.4.0.bb -FILESEXTRAPATHS_prepend := "${THISDIR}/files/:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files/:" OPENEULER_SRC_URI_REMOVE = "https git" OPENEULER_REPO_NAME = "glog" # version in openEuler -PV = "0.3.5" +PV = "0.6.0" S = "${WORKDIR}/glog-${PV}" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = " \ +SRC_URI:remove = " \ file://libexecinfo.patch \ " # files, patches that come from openeuler -SRC_URI_prepend = " \ +SRC_URI:prepend = " \ file://glog-${PV}.tar.gz \ " @@ -23,7 +23,7 @@ SRC_URI[md5sum] = "5df6d78b81e51b90ac0ecd7ed932b0d4" SRC_URI[sha256sum] = "7580e408a2c0b5a89ca214739978ce6ff480b5e7d8d7698a2aa92fadc484d1e0" # make libs compatible with lib64 -do_configure_prepend_class-target() { +do_configure:prepend_class-target() { if [ -f ${S}/CMakeLists.txt ] && [[ "${libdir}" =~ "lib64" ]]; then cat ${S}/CMakeLists.txt | grep "DESTINATION lib\${LIB_SUFFIX}" || sed -i 's:DESTINATION lib:DESTINATION lib\${LIB_SUFFIX}:g' ${S}/CMakeLists.txt fi diff --git a/meta-openeuler/recipes-support/libeigen/libeigen_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/libeigen/libeigen_%.bbappend similarity index 54% rename from meta-openeuler/recipes-support/libeigen/libeigen_%.bbappend rename to meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/libeigen/libeigen_%.bbappend index df5256085d7bfb4fb49dc16e4df04caa403390a3..c301a7e81e80494efd9cb5a26f09b9e2058f3229 100644 --- a/meta-openeuler/recipes-support/libeigen/libeigen_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/libeigen/libeigen_%.bbappend @@ -8,11 +8,19 @@ OPENEULER_BRANCH = "master" PV = "3.3.8" S = "${WORKDIR}/eigen-${PV}" +LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad \ + file://COPYING.BSD;md5=543367b8e11f07d353ef894f71b574a0 \ + file://COPYING.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ + file://COPYING.MINPACK;md5=5fe4603e80ef7390306f51ef74449bbd \ +" + # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = " \ +SRC_URI:remove = " \ + file://0001-Default-eigen_packet_wrapper-constructor.patch \ " # files, patches that come from openeuler -SRC_URI_prepend = " \ +SRC_URI:prepend = " \ file://eigen-${PV}.tar.bz2 \ file://0001-rebuild-and-modify-exception-error.patch \ " diff --git a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/libestr/libestr_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/libestr/libestr_%.bbappend new file mode 100644 index 0000000000000000000000000000000000000000..1312cdfc58e846aeb91ac9bfcf41ca65a58bdfc1 --- /dev/null +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/libestr/libestr_%.bbappend @@ -0,0 +1,4 @@ +# the main bb file: yocto-meta-openembedded/meta-oe/recipes-support/libestr/libestr_0.1.11.bb + +SRC_URI = "file://${BP}.tar.gz \ +" \ No newline at end of file diff --git a/meta-openeuler/recipes-support/libtinyxml/libtinyxml_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/libtinyxml/libtinyxml_%.bbappend similarity index 87% rename from meta-openeuler/recipes-support/libtinyxml/libtinyxml_%.bbappend rename to meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/libtinyxml/libtinyxml_%.bbappend index c8bf835d911556a3b37069447048899597ac5164..d9e4000bbd66c404d9f2b265e1000c55a47f5337 100644 --- a/meta-openeuler/recipes-support/libtinyxml/libtinyxml_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/libtinyxml/libtinyxml_%.bbappend @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://readme.txt;md5=f8f366f3370dda889f60faa7db162cf4" S = "${WORKDIR}/tinyxml" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = "${SOURCEFORGE_MIRROR}/tinyxml/tinyxml_${@'${PV}'.replace('.', '_')}.tar.gz " +SRC_URI:remove = "${SOURCEFORGE_MIRROR}/tinyxml/tinyxml_${@'${PV}'.replace('.', '_')}.tar.gz " SRC_URI += "file://tinyxml_2_6_2.tar.gz \ file://CVE-2021-42260.patch \ diff --git a/meta-openeuler/recipes-support/libtinyxml2/libtinyxml2_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/libtinyxml2/libtinyxml2_%.bbappend similarity index 58% rename from meta-openeuler/recipes-support/libtinyxml2/libtinyxml2_%.bbappend rename to meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/libtinyxml2/libtinyxml2_%.bbappend index 175e9a7f88f9db1a1270984192f79ce872ccf08e..11baf8dc4fc8eb7f424aabcbc7ec4ec0dde050f3 100644 --- a/meta-openeuler/recipes-support/libtinyxml2/libtinyxml2_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/libtinyxml2/libtinyxml2_%.bbappend @@ -1,21 +1,20 @@ -# main bbfile: yocto-meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.0.0.bb +# main bbfile: yocto-meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_9.0.0.bb # openeuler version -PV = "6.0.0" +PV = "9.0.0" OPENEULER_REPO_NAME = "tinyxml2" -LIC_FILES_CHKSUM = "file://readme.md;md5=7592e8f93f0317236424a2f6f34121a7" - -S = "${WORKDIR}/tinyxml2-8c8293ba8969a46947606a93ff0cb5a083aab47a" +# the dir name after unpacking the tar file +S = "${WORKDIR}/tinyxml2-${PV}" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = "git://github.com/leethomason/tinyxml2.git;branch=master;protocol=https " +SRC_URI:remove = "git://github.com/leethomason/tinyxml2.git;branch=master;protocol=https " -SRC_URI += "file://tinyxml2-${PV}-8c8293b.tar.gz " +SRC_URI += "file://tinyxml2-${PV}.tar.gz " # make libs compatible with lib64 -do_configure_prepend_class-target() { +do_configure:prepend_class-target() { if [ -f ${S}/CMakeLists.txt ] && [[ "${libdir}" =~ "lib64" ]]; then cat ${S}/CMakeLists.txt | grep "DESTINATION lib\${LIB_SUFFIX}" || sed -i 's:DESTINATION lib:DESTINATION lib\${LIB_SUFFIX}:g' ${S}/CMakeLists.txt fi diff --git a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/libusb/libusb-compat_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/libusb/libusb-compat_%.bbappend index 65bb0c3643d6892ef2a8a876c767b143e3090fd8..3793edd33c2cce0c6baec9d699109f7590840c19 100644 --- a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/libusb/libusb-compat_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/libusb/libusb-compat_%.bbappend @@ -2,11 +2,11 @@ OPENEULER_REPO_NAME = "libusb" OPENEULER_SRC_URI_REMOVE = "https http git" # modify 0001-usb.h-Include-sys-types.h.patch -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}/:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}/:" PV = "0.1.5" -SRC_URI_prepend = "file://${BP}.tar.bz2 \ +SRC_URI:prepend = "file://${BP}.tar.bz2 \ file://0000-Link-with-znodelete-to-disallow-unloading.patch \ file://0001-Revert-use-atexit-to-call-libusb_exit.patch \ " diff --git a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/lvm2/lvm2-src.inc b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/lvm2/lvm2-src.inc index 670bdcbb88911ad55c7564f1259b880421ef0aec..d3013674cdfebc89c2817afc4942e01e2f2ba4af 100644 --- a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/lvm2/lvm2-src.inc +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/lvm2/lvm2-src.inc @@ -1,7 +1,7 @@ # use src-openEuler package # adapt 0005-do-not-build-manual.patch for 2.03.14 version -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" OPENEULER_REPO_NAME = "lvm2" @@ -12,11 +12,11 @@ PV = "2.03.18" OPENEULER_SRC_URI_REMOVE = "git" # remove open_embedded patch that not use -SRC_URI_remove = "file://0002-Guard-use-of-mallinfo-with-__GLIBC__.patch \ +SRC_URI:remove = "file://0002-Guard-use-of-mallinfo-with-__GLIBC__.patch \ file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \ " -SRC_URI_prepend = "file://LVM2.${PV}.tgz \ +SRC_URI:prepend = "file://LVM2.${PV}.tgz \ file://0001-lvm2-set-default-preferred_names.patch \ file://0002-lvm2-default-allow-changes-with-duplicate-pvs.patch \ file://0003-bugfix-lvm2-add-SSD.patch \ diff --git a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/lvm2/lvm2_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/lvm2/lvm2_%.bbappend index 8205e5c8d42760c2c6a8a150b10739c42fbc6c74..cb94a6eeef2ea172debed0cf6ecf52105107a1ec 100644 --- a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/lvm2/lvm2_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/lvm2/lvm2_%.bbappend @@ -5,9 +5,9 @@ require lvm2-src.inc # remove strong dependence on udev, use condition statements to decide whether to depend udev # keep the same as before # use PACKAGECONFIG instead of LVM2_PACKAGECONFIG -LVM2_PACKAGECONFIG_remove_class-target = " \ +LVM2_PACKAGECONFIG:remove:class-target = " \ udev \ " -PACKAGECONFIG_append_class-target = " \ +PACKAGECONFIG:append:class-target = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'udev', '', d)} \ " diff --git a/meta-openeuler/recipes-support/opencv/opencv_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_%.bbappend similarity index 91% rename from meta-openeuler/recipes-support/opencv/opencv_%.bbappend rename to meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_%.bbappend index 567d905dd01303b47e612869c8342755020197f7..db54de3a167d82044151b10c0e664e42df19713c 100644 --- a/meta-openeuler/recipes-support/opencv/opencv_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/opencv/opencv_%.bbappend @@ -23,13 +23,13 @@ S = "${WORKDIR}/opencv-4.5.2" # no support of ade package in src-openeuler currently, # so remove it from pkgconfig -PACKAGECONFIG:remove += "gapi" +PACKAGECONFIG:remove = "gapi" # ippicv is not enable in src-openuler, so sync the config to our recipes -EXTRA_OECMAKE:append += " \ +EXTRA_OECMAKE:append = " \ -DWITH_IPP=OFF \ " -EXTRA_OECMAKE:remove += " \ +EXTRA_OECMAKE:remove = " \ -DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ -DOPENCV_ICV_HASH=${IPP_MD5} \ -DIPPROOT=${WORKDIR}/ippicv_lnx \ diff --git a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/spdlog/spdlog_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/spdlog/spdlog_%.bbappend index 93be00309975fa7bad724fe169fa00f87509c4b3..559e729fe6525bf7cbace0dc28a491d6b4a13441 100644 --- a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/spdlog/spdlog_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/spdlog/spdlog_%.bbappend @@ -1,5 +1,14 @@ -# main bbfile: yocto-meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.2.bb +# main bbfile: yocto-meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.9.2.bb inherit openeuler_source +PV = "1.11.0" + +SRC_URI:remove = "git://github.com/gabime/spdlog.git;protocol=https;branch=v1.x; \ + file://0001-Enable-use-of-external-fmt-library.patch \ +" + +SRC_URI:prepend = "file://v${PV}.tar.gz \ +" + S = "${WORKDIR}/git" diff --git a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/uthash/uthash_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/uthash/uthash_%.bbappend index 654e46506490237bb0b8f0ed528f146a8a63a2f1..7d612414c800b11f6a880f5993293d3046a6ce10 100644 --- a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/uthash/uthash_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/uthash/uthash_%.bbappend @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a2513f7d2291df840527b76b2a8f9718" OPENEULER_SRC_URI_REMOVE = "git" -SRC_URI_prepend = " \ +SRC_URI:prepend = " \ file://v${PV}.tar.gz \ " diff --git a/meta-openeuler/recipes-support/yaml-cpp/yaml-cpp_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/yaml-cpp/yaml-cpp_%.bbappend similarity index 96% rename from meta-openeuler/recipes-support/yaml-cpp/yaml-cpp_%.bbappend rename to meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/yaml-cpp/yaml-cpp_%.bbappend index f7a73a586e7aca11c3119ce4ff771352ba859ae9..c24665625cd5126c97a1870cbfece619905cee4f 100644 --- a/meta-openeuler/recipes-support/yaml-cpp/yaml-cpp_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-support/yaml-cpp/yaml-cpp_%.bbappend @@ -9,10 +9,10 @@ PV = "0.6.3" S = "${WORKDIR}/yaml-cpp-yaml-cpp-${PV}" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = " \ +SRC_URI:remove = " \ " # files, patches that come from openeuler -SRC_URI_prepend = " \ +SRC_URI:prepend = " \ file://yaml-cpp-${PV}.tar.gz \ file://CVE-2017-5950.patch \ " diff --git a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-test/googletest/googletest_%.bbappend b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-test/googletest/googletest_%.bbappend index be43c588d0042b8901185ae5b2fa3379dc948b93..d9530f5090bb7294a2ac946db06a6eb6d444456a 100644 --- a/meta-openeuler/dynamic-layers/openembedded-layer/recipes-test/googletest/googletest_%.bbappend +++ b/meta-openeuler/dynamic-layers/openembedded-layer/recipes-test/googletest/googletest_%.bbappend @@ -7,7 +7,7 @@ OPENEULER_LOCAL_NAME = "gtest" PV = "1.8.1" S = "${WORKDIR}/googletest-release-${PV}" -SRC_URI += " \ +SRC_URI:append = " \ file://${OPENEULER_LOCAL_NAME}/release-${PV}.tar.gz \ file://${OPENEULER_LOCAL_NAME}/gtest-1.8.1-null-pointer.patch \ file://${OPENEULER_LOCAL_NAME}/gtest-PR1839-Fix-Python3-support.patch \ @@ -16,3 +16,5 @@ SRC_URI += " \ file://${OPENEULER_LOCAL_NAME}/0001-Googletest-export.patch \ " +SRC_URI:remove = "file://0001-work-around-GCC-6-11-ADL-bug.patch \ +" diff --git a/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/examples/helloworld-gui_1.5.bb b/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/examples/helloworld-gui_1.5.bb index b70a162e9ed8a9533488e8546d18332bf4ca70ae..39b2cf1960d9f7a89b507cebe323d9d1cf5f6471 100644 --- a/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/examples/helloworld-gui_1.5.bb +++ b/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/examples/helloworld-gui_1.5.bb @@ -23,4 +23,4 @@ do_prepare_lrelease() { do_prepare_recipe_sysroot[postfuncs] += "do_prepare_lrelease" -FILES_${PN} += "/usr/local/*" +FILES:${PN} += "/usr/local/*" diff --git a/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/examples/qt5-opengles2-test_%.bbappend b/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/examples/qt5-opengles2-test_%.bbappend index db6897eff342e788aa915d65ef8077f29707812a..e87bdced753bacb88e6c757fbd842c8aa5ac1800 100644 --- a/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/examples/qt5-opengles2-test_%.bbappend +++ b/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/examples/qt5-opengles2-test_%.bbappend @@ -1,9 +1,9 @@ PV = "1.0.4" -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" -LIC_FILES_CHKSUM_remove = "file://${WORKDIR}/git/main.cpp;beginline=1;endline=26;md5=93b83ece006c9e76b9fca80c3aecb169" -LIC_FILES_CHKSUM_prepend = "file://main.cpp;beginline=1;endline=26;md5=93b83ece006c9e76b9fca80c3aecb169" +LIC_FILES_CHKSUM:remove = "file://${WORKDIR}/git/main.cpp;beginline=1;endline=26;md5=93b83ece006c9e76b9fca80c3aecb169" +LIC_FILES_CHKSUM:prepend = "file://main.cpp;beginline=1;endline=26;md5=93b83ece006c9e76b9fca80c3aecb169" SRC_URI = "file://${BP}.tar.gz" diff --git a/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/packagegroups/packagegroup-base.bbappend b/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/packagegroups/packagegroup-base.bbappend index c3542cf3cc3cd5814bbaf996e705f272df9e33c5..b87aecc6533646360d35cd8a839a7356571727bc 100644 --- a/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/packagegroups/packagegroup-base.bbappend +++ b/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/packagegroups/packagegroup-base.bbappend @@ -1,3 +1,3 @@ -RDEPENDS_packagegroup-base_append = " \ +RDEPENDS:packagegroup-base:append = " \ packagegroup-qt \ " diff --git a/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/packagegroups/packagegroup-qt.bb b/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/packagegroups/packagegroup-qt.bb index 80b65e7bbb5cfc4d6a817ea5109ae941fce8ea6c..234168fda5c40d32ce05c0a3b526778f752c4257 100644 --- a/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/packagegroups/packagegroup-qt.bb +++ b/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/packagegroups/packagegroup-qt.bb @@ -5,7 +5,7 @@ inherit packagegroup PACKAGES = "${PN}" -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ weston \ qtwayland \ qtbase \ diff --git a/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qt5-src.inc b/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qt5-src.inc index 838af844c47d40060de842952ae945f7578fbdb3..2e691bfb8435d54c6de0bbb7b7e6a035df961a01 100644 --- a/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qt5-src.inc +++ b/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qt5-src.inc @@ -4,11 +4,11 @@ OPENEULER_REPO_NAME = "qt5-${BPN}" PV = "5.15.2" -SRC_URI_prepend = "file://${BPN}-everywhere-src-${PV}.tar.xz \ +SRC_URI:prepend = "file://${BPN}-everywhere-src-${PV}.tar.xz \ " # Use the source packages from src-openEuler, remove patch conflict with openeuler -SRC_URI_remove = " \ +SRC_URI:remove = " \ ${QT_GIT}/${QT_MODULE}.git;name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL} \ " diff --git a/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase-native_%.bbappend b/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase-native_%.bbappend index eec429a6081767aba2107ff028f9f1b31e6d49d2..9c08b0f10a2e701b3c10eb5804cd158d3aa1877e 100644 --- a/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase-native_%.bbappend +++ b/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase-native_%.bbappend @@ -1,6 +1,6 @@ require qt5-src.inc -SRC_URI_prepend = "file://tell-the-truth-about-private-api.patch \ +SRC_URI:prepend = "file://tell-the-truth-about-private-api.patch \ file://qtbase-opensource-src-5.8.0-QT_VERSION_CHECK.patch \ file://qtbase-opensource-src-5.7.1-moc_macros.patch \ file://qtbase-everywhere-src-5.12.1-qt5gui_cmake_isystem_includes.patch \ diff --git a/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend index 66a472064eaa2266a1a0f9e1d28513fd217eab37..8ede2737f43f67077d0267c91470debb66a5126f 100644 --- a/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend +++ b/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend @@ -1,7 +1,7 @@ # main bbfile: meta-qt5/recipes-qt/qt5/qtbase_git.bb require qt5-src.inc -SRC_URI_prepend = "file://tell-the-truth-about-private-api.patch \ +SRC_URI:prepend = "file://tell-the-truth-about-private-api.patch \ file://qtbase-opensource-src-5.8.0-QT_VERSION_CHECK.patch \ file://qtbase-opensource-src-5.7.1-moc_macros.patch \ file://qtbase-everywhere-src-5.12.1-qt5gui_cmake_isystem_includes.patch \ diff --git a/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qtdeclarative_%.bbappend b/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qtdeclarative_%.bbappend index 5b20c2e3bd83e6bd3835e0b5f62fa06f9c2b5e18..fd0ecd8a29a3a05fbc5d914277777fe2586d9e8a 100644 --- a/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qtdeclarative_%.bbappend +++ b/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qtdeclarative_%.bbappend @@ -1,6 +1,6 @@ require qt5-src.inc -SRC_URI_prepend = "file://0005-QQuickView-docs-show-correct-usage-of-setInitialProp.patch \ +SRC_URI:prepend = "file://0005-QQuickView-docs-show-correct-usage-of-setInitialProp.patch \ file://0006-QQuickWindow-Check-if-QQuickItem-was-not-deleted.patch \ file://0007-Avoid-GHS-linker-to-optimize-away-QML-type-registrat.patch \ file://0008-QML-Text-doesn-t-reset-lineCount-when-text-is-empty.patch \ diff --git a/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qttools_%.bbappend b/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qttools_%.bbappend index 62c7b5f45159730eae87caf6a7861f64aa3733a2..bf9ea781fcbee23f4550b32f5ee06fa794696231 100644 --- a/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qttools_%.bbappend +++ b/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qttools_%.bbappend @@ -1,6 +1,6 @@ require qt5-src.inc -SRC_URI_prepend = "file://qttools-opensource-src-5.13.2-runqttools-with-qt5-suffix.patch \ +SRC_URI:prepend = "file://qttools-opensource-src-5.13.2-runqttools-with-qt5-suffix.patch \ file://qttools-opensource-src-5.7-add-libatomic.patch \ file://0001-Link-against-libclang-cpp.so-instead-of-the-clang-co.patch \ file://0001-modify-lupdate-qt5-run-error.patch \ diff --git a/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend b/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend index 1d9764767227fa85ec05b7fb301158ee53de7c6d..9c724cc379913cfb2e1ce15425e420795edb376c 100644 --- a/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend +++ b/meta-openeuler/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend @@ -1,6 +1,6 @@ require qt5-src.inc -SRC_URI_prepend = "file://0005-Scanner-Avoid-accessing-dangling-pointers-in-destroy.patch \ +SRC_URI:prepend = "file://0005-Scanner-Avoid-accessing-dangling-pointers-in-destroy.patch \ file://0006-Make-setting-QT_SCALE_FACTOR-work-on-Wayland.patch \ file://0007-Do-not-try-to-eglMakeCurrent-for-unintended-case.patch \ file://0008-Make-setting-QT_SCALE_FACTOR-work-on-Wayland.patch \ diff --git a/meta-openeuler/dynamic-layers/ros2-layer/recipes-core/images/openeuler-image-ros.bb b/meta-openeuler/dynamic-layers/ros2-layer/recipes-core/images/openeuler-image-ros.bb index 2a0822c0bd6f00bf775f415ee9f184fbb77f2e54..9c9be46a538fe0434234873faf687bcfef42964a 100644 --- a/meta-openeuler/dynamic-layers/ros2-layer/recipes-core/images/openeuler-image-ros.bb +++ b/meta-openeuler/dynamic-layers/ros2-layer/recipes-core/images/openeuler-image-ros.bb @@ -1,9 +1,9 @@ # build an iso image, the live-os uses openeuler-image-live, it must be the same as itself(openeuler-image) # when LIVE_ROOTFS_TYPE defined, bug may come out in poky, so just use default value ext4 in image-live.bbclass. # notice we need MACHINE_FEATURES += "efi" in machine conf -IMAGE_FSTYPES_append_aarch64 = " iso" -IMAGE_FSTYPES_append_x86-64 = " iso" -IMAGE_FSTYPES_remove_raspberrypi4 = "iso" +IMAGE_FSTYPES:append:aarch64 = " iso" +IMAGE_FSTYPES:append:x86-64 = " iso" +IMAGE_FSTYPES:remove:raspberrypi4 = "iso" INITRD_IMAGE_LIVE = "openeuler-image-live" # notice: IMAGE_FEATURE configs such as IMAGE_FSTYPES should be defined before openeuler-image-common.inc(before core-image and image.bbclass) diff --git a/meta-openeuler/dynamic-layers/ros2-layer/recipes-core/packagegroups/packagegroup-ros.bb b/meta-openeuler/dynamic-layers/ros2-layer/recipes-core/packagegroups/packagegroup-ros.bb index fde597f87e2e12481ba8bae18a93ab4aea5fa49e..2094415caed90fe1c6938b2d9e51be54d890c2c0 100644 --- a/meta-openeuler/dynamic-layers/ros2-layer/recipes-core/packagegroups/packagegroup-ros.bb +++ b/meta-openeuler/dynamic-layers/ros2-layer/recipes-core/packagegroups/packagegroup-ros.bb @@ -5,7 +5,7 @@ inherit packagegroup PACKAGES = "${PN}" -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ packagegroup-roscore \ ${@bb.utils.contains("DISTRO_FEATURES", "ros-camera", "packagegroup-roscamera", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "ros-slam", "packagegroup-rosslam", "", d)} \ diff --git a/meta-openeuler/dynamic-layers/ros2-layer/recipes-core/packagegroups/packagegroup-roscamera.bb b/meta-openeuler/dynamic-layers/ros2-layer/recipes-core/packagegroups/packagegroup-roscamera.bb index 38a8a398eec06e82b8b6563217ccbad49388210b..870dfe9a4294fbeef960a52ed66d875de24a01a0 100644 --- a/meta-openeuler/dynamic-layers/ros2-layer/recipes-core/packagegroups/packagegroup-roscamera.bb +++ b/meta-openeuler/dynamic-layers/ros2-layer/recipes-core/packagegroups/packagegroup-roscamera.bb @@ -5,7 +5,7 @@ inherit packagegroup PACKAGES = "${PN}" -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ libuvc \ camera-calibration-parsers \ camera-info-manager \ diff --git a/meta-openeuler/dynamic-layers/ros2-layer/recipes-core/packagegroups/packagegroup-roscore.bb b/meta-openeuler/dynamic-layers/ros2-layer/recipes-core/packagegroups/packagegroup-roscore.bb index a2e8db5dfbbbd10cc1c5660870362e59f1db3b5f..be0abef5e52035c69cd76a26b378bf5b0e73b675 100644 --- a/meta-openeuler/dynamic-layers/ros2-layer/recipes-core/packagegroups/packagegroup-roscore.bb +++ b/meta-openeuler/dynamic-layers/ros2-layer/recipes-core/packagegroups/packagegroup-roscore.bb @@ -5,7 +5,7 @@ inherit packagegroup PACKAGES = "${PN}" -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ ros-core \ demo-nodes-cpp \ " diff --git a/meta-openeuler/dynamic-layers/ros2-layer/recipes-core/packagegroups/packagegroup-rosslam.bb b/meta-openeuler/dynamic-layers/ros2-layer/recipes-core/packagegroups/packagegroup-rosslam.bb index 2a1b4d84d54306057b4ac7b03289082cc2530781..b692ce18e6aacb7051af5f841a54442ab8d0cdde 100644 --- a/meta-openeuler/dynamic-layers/ros2-layer/recipes-core/packagegroups/packagegroup-rosslam.bb +++ b/meta-openeuler/dynamic-layers/ros2-layer/recipes-core/packagegroups/packagegroup-rosslam.bb @@ -5,7 +5,7 @@ inherit packagegroup PACKAGES = "${PN}" -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ ros-core \ demo-nodes-cpp \ originbot-navigation \ diff --git a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/foonathan-memory/foonathan-memory_%.bbappend b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/foonathan-memory/foonathan-memory_%.bbappend index 7be2c4ca315cbdb01ccf1b55b78a63fa1021f048..72539ab8e25640ce6771b02f9729367aa07954e8 100644 --- a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/foonathan-memory/foonathan-memory_%.bbappend +++ b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/foonathan-memory/foonathan-memory_%.bbappend @@ -4,6 +4,6 @@ inherit openeuler_source LIC_FILES_CHKSUM = "file://LICENSE;md5=b68ca6474a0f8d6c83a635ef86bcd757" # droped under new version -EXTRA_OECMAKE:remove += " -DCOMP_CMAKE_PATH=${S}/cmake/comp " +EXTRA_OECMAKE:remove = " -DCOMP_CMAKE_PATH=${S}/cmake/comp " FILES:${PN} += " ${libdir}/foonathan_memory/cmake " diff --git a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/graphicsmagick/graphicsmagick_%.bbappend b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/graphicsmagick/graphicsmagick_%.bbappend index 06a888b81252b8df3e1b8e2e3a9305c1c59aae35..64699901276b9595b18a14e13743cd0cb5db3af0 100644 --- a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/graphicsmagick/graphicsmagick_%.bbappend +++ b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/graphicsmagick/graphicsmagick_%.bbappend @@ -8,12 +8,12 @@ LIC_FILES_CHKSUM = "file://Copyright.txt;md5=d46c64029c86acbab3a4deffc237d406" PV = "1.3.38" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove += " \ +SRC_URI:remove = " \ ${SOURCEFORGE_MIRROR}/${BPN}/GraphicsMagick-${PV}.tar.bz2 \ " # files, patches that come from openeuler -SRC_URI_prepend = " \ +SRC_URI:prepend = " \ file://GraphicsMagick-${PV}.tar.xz \ file://GraphicsMagick-1.3.16-multilib.patch \ file://GraphicsMagick-1.3.31-perl_linkage.patch \ @@ -22,6 +22,6 @@ SRC_URI_prepend = " \ SRC_URI[md5sum] = "9a5978427c3841711f470e15343ca71f" SRC_URI[sha256sum] = "d60cd9db59351d2b9cb19beb443170acaa28f073d13d258f67b3627635e32675" -FILES:${PN}:remove += "${datadir}/GraphicsMagick-1.3.33/config ${libdir}/GraphicsMagick-1.3.33/config" +FILES:${PN}:remove = "${datadir}/GraphicsMagick-1.3.33/config ${libdir}/GraphicsMagick-1.3.33/config" FILES:${PN} += "${datadir}/GraphicsMagick-${PV}/config ${libdir}/GraphicsMagick-${PV}/config" diff --git a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/libflann/libflann_%.bbappend b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/libflann/libflann_%.bbappend index 63bb21d3ccf65fad8f41147241c334db1c8fe5f0..ee8d44de1f013cb05b76f93db50bc049c15e3719 100644 --- a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/libflann/libflann_%.bbappend +++ b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/libflann/libflann_%.bbappend @@ -2,8 +2,8 @@ inherit openeuler_source EXTRA_OECMAKE += " -DBUILD_MATLAB_BINDINGS=OFF -DBUILD_PYTHON_BINDINGS=ON -DBUILD_TESTS=OFF" -SRC_URI:remove += "file://0001-Use-object-libraries-instead-of-empty-file-list-in-C.patch" -SRC_URI:append += " \ +SRC_URI:remove = "file://0001-Use-object-libraries-instead-of-empty-file-list-in-C.patch" +SRC_URI:append = " \ file://flann/flann-1.9.1-fixpyflann.patch \ file://flann/flann-libdir.patch \ file://flann/flann-fix-lz4.patch \ diff --git a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/navigation2/navigation2_%.bbappend b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/navigation2/navigation2_%.bbappend index ac7ac1bb7228fc068ec33719343b6dcc93146961..a777320c65493352271dc91db697015be948c29b 100644 --- a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/navigation2/navigation2_%.bbappend +++ b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/navigation2/navigation2_%.bbappend @@ -1,2 +1,2 @@ # not need rviz for runtime -ROS_EXEC_DEPENDS:remove += " nav2-rviz-plugins " +ROS_EXEC_DEPENDS:remove = " nav2-rviz-plugins " diff --git a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/originbot/originbot-base_%.bbappend b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/originbot/originbot-base_%.bbappend index d5698fbe34f2f8297facca175e062b158eba6b20..67c2644cf3a9cfc4c5da76c1fbb0d6545b884c14 100644 --- a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/originbot/originbot-base_%.bbappend +++ b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/originbot/originbot-base_%.bbappend @@ -4,4 +4,4 @@ SRC_URI:prepend = " \ file://00-originbot-base-fix-error.patch \ " -FILES_${PN} += "/usr/share /usr/lib" +FILES:${PN} += "/usr/share /usr/lib" diff --git a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/originbot/originbot-bringup_%.bbappend b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/originbot/originbot-bringup_%.bbappend index 0f7eeaa756b703a6a0f5cd201d5068ebc176a47e..11672f62063abb34d23d471ae26c9b8ad79b116f 100644 --- a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/originbot/originbot-bringup_%.bbappend +++ b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/originbot/originbot-bringup_%.bbappend @@ -1,11 +1,11 @@ -ROS_BUILD_DEPENDS:remove += " \ +ROS_BUILD_DEPENDS:remove = " \ joy-linux \ teleop-twist-joy \ " -FILES_${PN} += "/usr/share" +FILES:${PN} += "/usr/share" -do_configure_prepend_class-target() { +do_configure:prepend_class-target() { if [ -f ${S}/CMakeLists.txt ]; then cat ${S}/CMakeLists.txt | grep "joy_linux" && sed -i 's:find_package(joy_linux REQUIRED)::g' ${S}/CMakeLists.txt cat ${S}/CMakeLists.txt | grep "teleop_twist_joy" && sed -i 's:find_package(teleop_twist_joy REQUIRED)::g' ${S}/CMakeLists.txt diff --git a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/originbot/originbot-msgs_%.bbappend b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/originbot/originbot-msgs_%.bbappend index a294362b3aa3eb59b218f22ce94a25fe26548180..04c0dee3a3ce8c47e38f88c080bce5c5766a6d91 100644 --- a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/originbot/originbot-msgs_%.bbappend +++ b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/originbot/originbot-msgs_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" ROS_BUILD_DEPENDS += " \ std-msgs \ @@ -14,4 +14,4 @@ ROS_EXEC_DEPENDS = " \ std-msgs \ " -FILES_${PN} += "/usr/share" +FILES:${PN} += "/usr/share" diff --git a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/originbot/originbot-navigation_%.bbappend b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/originbot/originbot-navigation_%.bbappend index 48fb8218ac4b715a538f2e9c85e809972face1eb..5a3ca36b960cb3fe282faba0167ece3dcb88caec 100644 --- a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/originbot/originbot-navigation_%.bbappend +++ b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/originbot/originbot-navigation_%.bbappend @@ -5,4 +5,4 @@ SRC_URI:prepend = " \ file://01-originbot-navigation-fix-amcl-load-error.patch \ " -FILES_${PN} += "/usr/share /usr/lib" +FILES:${PN} += "/usr/share /usr/lib" diff --git a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/originbot/originbot-teleop_%.bbappend b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/originbot/originbot-teleop_%.bbappend index 7a943a3c21836ca0dd5caf9175e14792c914d257..f55aa44dbe761bfe75d2295daca893c7b9b22a91 100644 --- a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/originbot/originbot-teleop_%.bbappend +++ b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/originbot/originbot-teleop_%.bbappend @@ -1,2 +1,2 @@ -FILES_${PN} += "/usr/share /usr/lib" +FILES:${PN} += "/usr/share /usr/lib" diff --git a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/originbot/send-goal_%.bbappend b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/originbot/send-goal_%.bbappend index d92aba9d0b1e0513a4766baa5cab80f3dac63d76..6bd1fb8616218be80b4a731ef1f1e45813dea7f6 100644 --- a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/originbot/send-goal_%.bbappend +++ b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/originbot/send-goal_%.bbappend @@ -11,5 +11,5 @@ ROS_BUILD_DEPENDS += " \ nav2-msgs \ " -FILES_${PN} += "/usr/share /usr/lib" +FILES:${PN} += "/usr/share /usr/lib" diff --git a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/originbot/ydlidar-ros2-driver_%.bbappend b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/originbot/ydlidar-ros2-driver_%.bbappend index 70841cafc66b1c7e64b6ddf11bea774d3504f9aa..acf60a2b2dc93ce8f428682439f4334f49eab60e 100644 --- a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/originbot/ydlidar-ros2-driver_%.bbappend +++ b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/originbot/ydlidar-ros2-driver_%.bbappend @@ -17,4 +17,4 @@ ROS_EXEC_DEPENDS += " \ ydlidar \ " -FILES_${PN} += "/usr/share /usr/lib" +FILES:${PN} += "/usr/share /usr/lib" diff --git a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/pcl/pcl_%.bbappend b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/pcl/pcl_%.bbappend index 02fa10d0bcf1906bdedd3754535c00d8d6e447ee..a1a811be603c985cc2d7ac27bbc5609971c03c9f 100644 --- a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/pcl/pcl_%.bbappend +++ b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/pcl/pcl_%.bbappend @@ -1,6 +1,6 @@ inherit ros_distro_humble -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += " \ file://pcl-1.12.0-metslib.patch \ diff --git a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/python/pypi-src-openeuler.inc b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/python/pypi-src-openeuler.inc index 8f835223ea41708e075b61157897cf7b15c0fb3b..53c7814a6a9cd8c17dda5f56a672dae6fd1ed95f 100644 --- a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/python/pypi-src-openeuler.inc +++ b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/python/pypi-src-openeuler.inc @@ -1,5 +1,5 @@ OPENEULER_REPO_NAME = "python-${PYPI_PACKAGE}" # use openeuler's pkg src -SRC_URI_remove += "${PYPI_SRC_URI} " -SRC_URI_prepend += "file://${PYPI_PACKAGE}-${PV}.tar.gz " +SRC_URI:remove = "${PYPI_SRC_URI} " +SRC_URI:prepend = "file://${PYPI_PACKAGE}-${PV}.tar.gz " diff --git a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/python/python3-catkin-pkg_%.bbappend b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/python/python3-catkin-pkg_%.bbappend index 1dde515a4ca7106e95c58f511c982fbebc1e57ef..856f42322143abd7b35903d733dd562181d3be48 100644 --- a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/python/python3-catkin-pkg_%.bbappend +++ b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/python/python3-catkin-pkg_%.bbappend @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f223d8c5dc6d4bd04ad8bf355633bfc8" S = "${WORKDIR}/catkin_pkg-${PV}" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove += " \ +SRC_URI:remove = " \ ${PYPI_SRC_URI} \ file://0001-python_setup.py-fix-build-with-setuptools-v59.0.0-an.patch \ " diff --git a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/python/python3-distlib_%.bbappend b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/python/python3-distlib_%.bbappend index 77a1d27c2245b446a6dc2329a0638bf2081e1b9b..918944c4edfafeb0a9aebedf8052d4209eb160dc 100644 --- a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/python/python3-distlib_%.bbappend +++ b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/python/python3-distlib_%.bbappend @@ -4,8 +4,8 @@ OPENEULER_REPO_NAME = "python-${PYPI_PACKAGE}" OPENEULER_BRANCH = "master" # use openeuler's pkg src -SRC_URI_remove += "${PYPI_SRC_URI} " -SRC_URI_prepend += "file://${PYPI_PACKAGE}-${PV}.tar.gz " +SRC_URI:remove = "${PYPI_SRC_URI} " +SRC_URI:prepend = "file://${PYPI_PACKAGE}-${PV}.tar.gz " SRC_URI += " \ file://0001-add-setup.py.patch \ diff --git a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/python/python3-empy_%.bbappend b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/python/python3-empy_%.bbappend index b7bd14d4588576cac9534892012fd6d8878c5834..450a3c5352c508567bd21c23892a94ab5cd34f32 100644 --- a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/python/python3-empy_%.bbappend +++ b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/python/python3-empy_%.bbappend @@ -12,7 +12,7 @@ SRC_URI[sha256sum] = "9126211471fc7ff83fdd40beca93eb6de5681758fbe68b4cf8af632625 S = "${WORKDIR}/empy-${PV}" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = "http://www.alcyone.com/software/empy/empy-${PV}.tar.gz " +SRC_URI:remove = "http://www.alcyone.com/software/empy/empy-${PV}.tar.gz " SRC_URI += "file://${OPENEULER_LOCAL_NAME}/empy-${PV}.tar.gz " diff --git a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/python/python3-sphinx_%.bbappend b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/python/python3-sphinx_%.bbappend index 85f9344c5c56f11b4e829de22dc1f83861b8cac0..a8c490ccc4a38632f0a4b552ef5db0e713de1a05 100644 --- a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/python/python3-sphinx_%.bbappend +++ b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/python/python3-sphinx_%.bbappend @@ -7,5 +7,5 @@ SRC_URI[sha256sum] = "6caad9786055cb1fa22b4a365c1775816b876f91966481765d7d50e9f0 OPENEULER_BRANCH = "master" OPENEULER_REPO_NAME = "python-sphinx" -SRC_URI_remove += "${PYPI_SRC_URI} " -SRC_URI_prepend += "file://${PYPI_PACKAGE}-${PV}.tar.gz " +SRC_URI:remove = "${PYPI_SRC_URI} " +SRC_URI:prepend = "file://${PYPI_PACKAGE}-${PV}.tar.gz " diff --git a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/slam-toolbox/slam-toolbox_%.bbappend b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/slam-toolbox/slam-toolbox_%.bbappend index 6cbd6ac0710d280578d09df61b165140a485abc3..516c2137b963af09df622c7d21e6694366d881e2 100644 --- a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/slam-toolbox/slam-toolbox_%.bbappend +++ b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/slam-toolbox/slam-toolbox_%.bbappend @@ -14,7 +14,7 @@ ROS_EXEC_DEPENDS:remove = "ceres-solver" FILES:${PN}-dev += "${datadir}/karto_sdk ${datadir}/solver_plugins.xml" -ROS_EXEC_DEPENDS:remove += " \ +ROS_EXEC_DEPENDS:remove = " \ qtbase \ rviz-common \ rviz-ogre-vendor \ @@ -22,7 +22,7 @@ ROS_EXEC_DEPENDS:remove += " \ rviz-rendering \ " -ROS_BUILD_DEPENDS:remove += " \ +ROS_BUILD_DEPENDS:remove = " \ qtbase \ rviz-common \ rviz-ogre-vendor \ @@ -30,7 +30,7 @@ ROS_BUILD_DEPENDS:remove += " \ rviz-rendering \ " -ROS_EXPORT_DEPENDS:remove += " \ +ROS_EXPORT_DEPENDS:remove = " \ rviz-common \ rviz-ogre-vendor \ rviz-default-plugins \ diff --git a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/sros2/sros2_%.bbappend b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/sros2/sros2_%.bbappend index cbb440931778405a97a710258cd14205cbf112ce..5e7959fdce354f5d8c0df64d776be2b7021173f3 100644 --- a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/sros2/sros2_%.bbappend +++ b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/sros2/sros2_%.bbappend @@ -1,3 +1,3 @@ # python3-cryptography -> python3-cffi-> python3-pycparser-> cpp/cpp-symlinks-> gcc # we current do not want gcc be embedded -ROS_EXEC_DEPENDS:remove += "python3-cryptography" +ROS_EXEC_DEPENDS:remove = "python3-cryptography" diff --git a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/ydlidar/ydlidar_1.1.3.bb b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/ydlidar/ydlidar_1.1.3.bb index 2123441304a232b31ba05be50693ed1612505c80..d16c58db5a480f3e7c08ad2a261825a1666148fc 100644 --- a/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/ydlidar/ydlidar_1.1.3.bb +++ b/meta-openeuler/dynamic-layers/ros2-layer/recipes-ros/ydlidar/ydlidar_1.1.3.bb @@ -23,11 +23,11 @@ DEPENDS = "swig-native python3" SYSROOT_DIRS += "/usr/lib" -FILES_${PN}-staticdev += "/usr/lib/libydlidar_sdk.a" -FILES_${PN} += "/usr/share /usr/startup /usr/lib/python*" +FILES:${PN}-staticdev += "/usr/lib/libydlidar_sdk.a" +FILES:${PN} += "/usr/share /usr/startup /usr/lib/python*" # fix pkgconfig installdir conflict and driver compile warnings (which fix buffer overflow) -do_configure_prepend_class-target() { +do_configure:prepend_class-target() { if [ -f ${S}/cmake/install_package.cmake ]; then cat ${S}/cmake/install_package.cmake | grep "\${CMAKE_INSTALL_DATAROOTDIR}\/pkgconfig" || sed -i 's:${CMAKE_INSTALL_PREFIX}/lib/pkgconfig:${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig:g' ${S}/cmake/install_package.cmake cat ${S}/cmake/install_package.cmake | grep "\${CMAKE_INSTALL_DATAROOTDIR}\/cmake" || sed -i 's:lib/cmake:${CMAKE_INSTALL_DATAROOTDIR}/cmake:g' ${S}/cmake/install_package.cmake diff --git a/meta-openeuler/lib/oe/external.py b/meta-openeuler/lib/oe/external.py index 9fd78d60faa80a89c33d152f9e2b51324ef5f024..1e021a7922a3ebb6c2901b615931e073541d6e87 100644 --- a/meta-openeuler/lib/oe/external.py +++ b/meta-openeuler/lib/oe/external.py @@ -69,7 +69,7 @@ def gather_pkg_files(d): import itertools files = [] for pkg in d.getVar('PACKAGES').split(): - files = itertools.chain(files, (d.getVar('EXTERNAL_FILES_{}'.format(pkg)) or d.getVar('FILES_{}'.format(pkg)) or '').split()) + files = itertools.chain(files, (d.getVar('EXTERNAL_FILES_{}'.format(pkg)) or d.getVar('FILES:{}'.format(pkg)) or '').split()) files = itertools.chain(files, d.getVar('EXTERNAL_EXTRA_FILES').split()) return files diff --git a/meta-openeuler/recipes-arm/arm-compute-library/arm-compute-library_19.02.bb b/meta-openeuler/recipes-arm/arm-compute-library/arm-compute-library_19.02.bb index fe02087a17c164ff9470953908233d7d66bb9e41..8f62cbe714fe8eb8a4bf230aac645491987d3110 100644 --- a/meta-openeuler/recipes-arm/arm-compute-library/arm-compute-library_19.02.bb +++ b/meta-openeuler/recipes-arm/arm-compute-library/arm-compute-library_19.02.bb @@ -35,10 +35,10 @@ do_install() { cp $CP_ARGS ${S}/support ${D}${datadir}/${BPN}/. } -INSANE_SKIP_${PN} = "ldflags" -INSANE_SKIP_${PN}-dev = "dev-elf ldflags" +INSANE_SKIP:${PN} = "ldflags" +INSANE_SKIP:${PN}-dev = "dev-elf ldflags" -FILES_${PN}-source = "${datadir}/${BPN}" -INSANE_SKIP_${PN}-source = "ldflags libdir staticdev" +FILES:${PN}-source = "${datadir}/${BPN}" +INSANE_SKIP:${PN}-source = "ldflags libdir staticdev" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" diff --git a/meta-openeuler/recipes-arm/armnn/armnn_%.bbappend b/meta-openeuler/recipes-arm/armnn/armnn_%.bbappend index 29f8cc38d1c138a8e6c3504b269477380b3a8521..8f51bed9bc60e15f099f5e127d59ff567ac2fa59 100644 --- a/meta-openeuler/recipes-arm/armnn/armnn_%.bbappend +++ b/meta-openeuler/recipes-arm/armnn/armnn_%.bbappend @@ -64,7 +64,7 @@ cmake_do_configure() { -Wno-dev } -SRC_URI_remove = " \ +SRC_URI:remove = " \ git://github.com/ARM-software/armnn.git;name=armnn;branch=${BRANCH_ARMNN} \ file://0001-stdlib-issue-work-around.patch \ file://0002-enable-use-of-boost-shared-library.patch \ @@ -82,7 +82,7 @@ SRC_URI += " \ " S = "${WORKDIR}/${BP}" -DEPENDS_remove = "\ +DEPENDS:remove = "\ armnn-tensorflow-lite \ stb \ " @@ -90,9 +90,9 @@ DEPENDS += " \ tensorflow-lite \ " -do_configure_remove() { +do_configure:remove() { install -m 0555 ${WORKDIR}/TfLiteMobilenetQuantized_0_25-Armnn.cpp ${S}/tests/TfLiteMobilenetQuantized-Armnn install -m 0555 ${WORKDIR}/TfLiteMobilenetQuantized_1_0-Armnn.cpp ${S}/tests/TfLiteMobilenetQuantized-Armnn } -FILES_${PN} += "${libdir}/*" +FILES:${PN} += "${libdir}/*" diff --git a/meta-openeuler/recipes-arm/armnn/armnn_19.02.bb b/meta-openeuler/recipes-arm/armnn/armnn_19.02.bb index cf7b2cd967b744ba1e2cda2796296c90248517f5..9bd2bba40596ee1f13a06ebcaa8eff497858421f 100644 --- a/meta-openeuler/recipes-arm/armnn/armnn_19.02.bb +++ b/meta-openeuler/recipes-arm/armnn/armnn_19.02.bb @@ -39,18 +39,18 @@ DEPENDS += " \ stb \ " -RDEPENDS_${PN} = " arm-compute-library " +RDEPENDS:${PN} = " arm-compute-library " TESTVECS_INSTALL_DIR = "${datadir}/arm/armnn" EXTRA_OEMAKE += "'LIBS=${LIBS}' 'CXX=${CXX}' 'CC=${CC}' 'AR=${AR}' 'CXXFLAGS=${CXXFLAGS}' 'CFLAGS=${CFLAGS}'" -do_configure_prepend() { +do_configure:prepend() { install -m 0555 ${WORKDIR}/TfLiteMobilenetQuantized_0_25-Armnn.cpp ${S}/tests/TfLiteMobilenetQuantized-Armnn install -m 0555 ${WORKDIR}/TfLiteMobilenetQuantized_1_0-Armnn.cpp ${S}/tests/TfLiteMobilenetQuantized-Armnn } -do_install_append() { +do_install:append() { CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership" install -d ${D}${bindir} find ${WORKDIR}/build/tests -maxdepth 1 -type f -executable -exec cp $CP_ARGS {} ${D}${bindir} \; @@ -59,5 +59,5 @@ do_install_append() { chrpath -d ${D}${bindir}/* } -FILES_${PN}-dev += "{libdir}/cmake/*" -INSANE_SKIP_${PN}-dev = "dev-elf" +FILES:${PN}-dev += "{libdir}/cmake/*" +INSANE_SKIP:${PN}-dev = "dev-elf" diff --git a/meta-openeuler/recipes-bsp/gnu-efi/gnu-efi_%.bbappend b/meta-openeuler/recipes-bsp/gnu-efi/gnu-efi_%.bbappend index 47f634b3638fbb91b8075fd36a97e4d96078dc06..a8f60c22f9a728927ec72e47418f25746e965421 100644 --- a/meta-openeuler/recipes-bsp/gnu-efi/gnu-efi_%.bbappend +++ b/meta-openeuler/recipes-bsp/gnu-efi/gnu-efi_%.bbappend @@ -3,7 +3,7 @@ PV = "3.0.8" # remove tar.gz files and code patches from poky -SRC_URI_remove = " \ +SRC_URI:remove = " \ ${SOURCEFORGE_MIRROR}/${BPN}/files/${BP}.tar.bz2 \ " diff --git a/meta-openeuler/recipes-bsp/grub/grub-source-openeuler.inc b/meta-openeuler/recipes-bsp/grub/grub-source-openeuler.inc index fe124bc27923d80e3863f3d9b9ee490e86fe4c82..fa4033f963f1b39d5955a0649a22679d45ac3e19 100644 --- a/meta-openeuler/recipes-bsp/grub/grub-source-openeuler.inc +++ b/meta-openeuler/recipes-bsp/grub/grub-source-openeuler.inc @@ -4,6 +4,13 @@ PV = "2.06" # Notice: openeuler's patches have many conflicts to patch, drop them. OPENEULER_REPO_NAME = "grub2" + +SRC_URI:remove = "${GNU_MIRROR}/grub/grub-${PV}.tar.gz \ +" + +SRC_URI:prepend = "file://grub-${PV}.tar.xz \ +" + SRC_URI[sha256sum] = "b79ea44af91b93d17cd3fe80bdae6ed43770678a9a5ae192ccea803ebb657ee1" -CVE_CHECK_WHITELIST = "" +CVE_CHECK_IGNORE = "" diff --git a/meta-openeuler/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch b/meta-openeuler/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch new file mode 100644 index 0000000000000000000000000000000000000000..d2a8048e87ecade46ff88775515d29ad78bb2a29 --- /dev/null +++ b/meta-openeuler/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch @@ -0,0 +1,36 @@ +From fe9860fd85e49a75bef545e5d9914070491e8002 Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Fri, 15 Feb 2019 14:57:41 -0800 +Subject: [PATCH] Makefile: Don't specify mabi or march + +To avoid + can't link double-float modules with soft-float modules +errors when building 32-bit openSBI don't specify mabi or march. + +Upstream-Status: Inappropriate [Fixes a 32-bit OE flow bug] +Signed-off-by: Alistair Francis + +--- + Makefile | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Makefile b/Makefile +index ccf8ea3..69e5b38 100644 +--- a/Makefile ++++ b/Makefile +@@ -169,7 +169,6 @@ GENFLAGS += $(firmware-genflags-y) + CFLAGS = -g -Wall -Werror -ffreestanding -nostdlib -fno-strict-aliasing -O2 + CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls + CFLAGS += -mno-save-restore -mstrict-align +-CFLAGS += -mabi=$(PLATFORM_RISCV_ABI) -march=$(PLATFORM_RISCV_ISA) + CFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) + CFLAGS += $(GENFLAGS) + CFLAGS += $(platform-cflags-y) +@@ -183,7 +182,6 @@ CPPFLAGS += $(firmware-cppflags-y) + ASFLAGS = -g -Wall -nostdlib -D__ASSEMBLY__ + ASFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls + ASFLAGS += -mno-save-restore -mstrict-align +-ASFLAGS += -mabi=$(PLATFORM_RISCV_ABI) -march=$(PLATFORM_RISCV_ISA) + ASFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) + ASFLAGS += $(GENFLAGS) + ASFLAGS += $(platform-asflags-y) diff --git a/meta-openeuler/recipes-bsp/opensbi/opensbi-payloads.inc b/meta-openeuler/recipes-bsp/opensbi/opensbi-payloads.inc new file mode 100644 index 0000000000000000000000000000000000000000..2e329432452fe3c8283230a4d2b34ba504fe2681 --- /dev/null +++ b/meta-openeuler/recipes-bsp/opensbi/opensbi-payloads.inc @@ -0,0 +1,21 @@ +def riscv_get_extra_oemake_image(d): + sbi_payload = d.getVar('RISCV_SBI_PAYLOAD') + deploy_dir = d.getVar('DEPLOY_DIR_IMAGE') + + if sbi_payload is None: + return "" + + return "FW_PAYLOAD_PATH=" + deploy_dir + "/" + sbi_payload + +def riscv_get_do_compile_depends(d): + sbi_payload = d.getVar('RISCV_SBI_PAYLOAD') + + if sbi_payload is None: + return "" + + if 'linux' in sbi_payload or 'Image' in sbi_payload: + return "virtual/kernel:do_deploy" + if 'u-boot.bin' in sbi_payload: + return "virtual/bootloader:do_deploy" + + return "" diff --git a/meta-openeuler/recipes-bsp/opensbi/opensbi_0.9.bbappend b/meta-openeuler/recipes-bsp/opensbi/opensbi_%.bbappend similarity index 100% rename from meta-openeuler/recipes-bsp/opensbi/opensbi_0.9.bbappend rename to meta-openeuler/recipes-bsp/opensbi/opensbi_%.bbappend diff --git a/meta-openeuler/recipes-bsp/opensbi/opensbi_0.9.bb b/meta-openeuler/recipes-bsp/opensbi/opensbi_0.9.bb new file mode 100644 index 0000000000000000000000000000000000000000..c7100b01322ff41ef8a7ee960de3f7bb526991cc --- /dev/null +++ b/meta-openeuler/recipes-bsp/opensbi/opensbi_0.9.bb @@ -0,0 +1,48 @@ +SUMMARY = "RISC-V Open Source Supervisor Binary Interface (OpenSBI)" +DESCRIPTION = "OpenSBI aims to provide an open-source and extensible implementation of the RISC-V SBI specification for a platform specific firmware (M-mode) and a general purpose OS, hypervisor or bootloader (S-mode or HS-mode). OpenSBI implementation can be easily extended by RISC-V platform or System-on-Chip vendors to fit a particular hadware configuration." +HOMEPAGE = "https://github.com/riscv/opensbi" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING.BSD;md5=42dd9555eb177f35150cf9aa240b61e5" + +require opensbi-payloads.inc + +inherit autotools-brokensep deploy + +SRCREV = "234ed8e427f4d92903123199f6590d144e0d9351" +SRC_URI = "git://github.com/riscv/opensbi.git;branch=master;protocol=https \ + file://0001-Makefile-Don-t-specify-mabi-or-march.patch \ + " + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D}" +# If RISCV_SBI_PAYLOAD is set then include it as a payload +EXTRA_OEMAKE:append = " ${@riscv_get_extra_oemake_image(d)}" + +# Required if specifying a custom payload +do_compile[depends] += "${@riscv_get_do_compile_depends(d)}" + +do_install:append() { + # In the future these might be required as a dependency for other packages. + # At the moment just delete them to avoid warnings + rm -r ${D}/include + rm -r ${D}/lib* + rm -r ${D}/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/payloads +} + +do_deploy () { + install -m 755 ${D}/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_payload.* ${DEPLOYDIR}/ + install -m 755 ${D}/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_jump.* ${DEPLOYDIR}/ + install -m 755 ${D}/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_dynamic.* ${DEPLOYDIR}/ +} + +addtask deploy before do_build after do_install + +FILES:${PN} += "/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_jump.*" +FILES:${PN} += "/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_payload.*" +FILES:${PN} += "/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_dynamic.*" + +COMPATIBLE_HOST = "(riscv64|riscv32).*" +INHIBIT_PACKAGE_STRIP = "1" + +SECURITY_CFLAGS = "" diff --git a/meta-openeuler/recipes-bsp/pciutils/pciutils_%.bbappend b/meta-openeuler/recipes-bsp/pciutils/pciutils_%.bbappend index 011e5f9f91a5aaebf318d7fdc538532e88733350..ce8b5d172fe3dbe21dfd0c403d967fd060b13965 100644 --- a/meta-openeuler/recipes-bsp/pciutils/pciutils_%.bbappend +++ b/meta-openeuler/recipes-bsp/pciutils/pciutils_%.bbappend @@ -1,11 +1,13 @@ +# the main bb file: yocto-poky/meta/recipes-bsp/pciutils/pciutils_3.7.0.bb + PV = "3.9.0" # update configure.patch of poky -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" OPENEULER_SRC_URI_REMOVE = "https http git" -SRC_URI_prepend = " \ +SRC_URI:prepend = " \ file://pciutils-${PV}.tar.gz \ file://0000-pciutils-2.2.1-idpath.patch \ file://0001-pciutils-dir-d.patch \ @@ -27,5 +29,5 @@ ALTERNATIVE:${PN} = "lspci" ALTERNATIVE_PRIORITY = "100" # file of ids package is /usr/share/hwdata/pci.ids.gz, but datadir is /usr/share/ -# update it from FILES_${PN}-ids = "${datadir}/pci.ids*" in poky bb. -FILES_${PN}-ids = "${datadir}/*/pci.ids*" +# update it from FILES:${PN}-ids = "${datadir}/pci.ids*" in poky bb. +FILES:${PN}-ids = "${datadir}/*/pci.ids*" diff --git a/meta-openeuler/recipes-connectivity/bind/bind-dhclient_%.bbappend b/meta-openeuler/recipes-connectivity/bind/bind-dhclient_%.bbappend index 6ee1ee832f26eeb6d877618881509188988b83cf..47433e7b838295676a4630caf053e97735dbfb8c 100644 --- a/meta-openeuler/recipes-connectivity/bind/bind-dhclient_%.bbappend +++ b/meta-openeuler/recipes-connectivity/bind/bind-dhclient_%.bbappend @@ -8,13 +8,13 @@ DHCP_PV = "4.4.3" # fix LIC_FILES_CHKSUM error LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=b88e7ca5f21908e1b2720169f6807cf6" -SRC_URI_remove = "https://ftp.isc.org/isc/bind9/${PV}/${PACKAGE_FETCH_NAME}-${PV}.tar.gz \ +SRC_URI:remove = "https://ftp.isc.org/isc/bind9/${PV}/${PACKAGE_FETCH_NAME}-${PV}.tar.gz \ " S = "${WORKDIR}/dhcp-${DHCP_PV}/bind/bind-${PV}" # apply openEuler/dhcp patches -SRC_URI_prepend = "file://dhcp-${DHCP_PV}.tar.gz;name=dhcp.tarball \ +SRC_URI:prepend = "file://dhcp-${DHCP_PV}.tar.gz;name=dhcp.tarball \ file://backport-0025-bind-Detect-system-time-changes.patch;striplevel=3 \ file://backport-Fix-CVE-2021-25220.patch;striplevel=3 \ " @@ -22,7 +22,7 @@ SRC_URI_prepend = "file://dhcp-${DHCP_PV}.tar.gz;name=dhcp.tarball \ SRC_URI[dhcp.tarball.sha256sum] = "1a7ccd64a16e5e68f7b5e0f527fd07240a2892ea53fe245620f4f5f607004521" # bind users do not need shell/login access for secure -USERADD_PARAM_${PN} = "--system --home ${localstatedir}/cache/bind --no-create-home \ +USERADD_PARAM:${PN} = "--system --home ${localstatedir}/cache/bind --no-create-home \ --shell /sbin/nologin --user-group bind" # decompress the source code from dhcp-${DHCP_PV}.tar.gz diff --git a/meta-openeuler/recipes-connectivity/bind/bind-dhclient_9.11.22.bb b/meta-openeuler/recipes-connectivity/bind/bind-dhclient_9.11.22.bb index 3ac860af953af6916e6725cb871c1cca5d843ac3..25e1a55e1ac2bab01402bebeb8f5981f94f4565d 100644 --- a/meta-openeuler/recipes-connectivity/bind/bind-dhclient_9.11.22.bb +++ b/meta-openeuler/recipes-connectivity/bind/bind-dhclient_9.11.22.bb @@ -62,7 +62,7 @@ inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native setuptoo REMOVE_LIBTOOL_LA = "0" USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --home ${localstatedir}/cache/bind --no-create-home \ +USERADD_PARAM:${PN} = "--system --home ${localstatedir}/cache/bind --no-create-home \ --user-group bind" # INITSCRIPT_NAME = "bind" @@ -70,14 +70,14 @@ USERADD_PARAM_${PN} = "--system --home ${localstatedir}/cache/bind --no-create-h # SYSTEMD_SERVICE:${PN} = "named.service" -do_install_prepend() { +do_install:prepend() { # clean host path in isc-config.sh before the hardlink created # by "make install": # bind9-config -> isc-config.sh sed -i -e "s,${STAGING_LIBDIR},${libdir}," ${B}/isc-config.sh } -do_install_append() { +do_install:append() { rmdir "${D}${localstatedir}/run" rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" @@ -116,7 +116,7 @@ do_install_append() { oe_multilib_header isc/platform.h } -CONFFILES_${PN} = " \ +CONFFILES:${PN} = " \ ${sysconfdir}/bind/named.conf \ ${sysconfdir}/bind/named.conf.local \ ${sysconfdir}/bind/named.conf.options \ @@ -127,22 +127,22 @@ CONFFILES_${PN} = " \ ${sysconfdir}/bind/db.root \ " -ALTERNATIVE_${PN}-utils = "nslookup" +ALTERNATIVE:${PN}-utils = "nslookup" ALTERNATIVE_LINK_NAME[nslookup] = "${bindir}/nslookup" ALTERNATIVE_PRIORITY = "100" PACKAGE_BEFORE_PN += "${PN}-utils" -FILES_${PN}-utils = "${bindir}/host ${bindir}/dig ${bindir}/mdig ${bindir}/nslookup ${bindir}/nsupdate" -FILES_${PN}-dev += "${bindir}/isc-config.h" -FILES_${PN} += "${sbindir}/generate-rndc-key.sh" +FILES:${PN}-utils = "${bindir}/host ${bindir}/dig ${bindir}/mdig ${bindir}/nslookup ${bindir}/nsupdate" +FILES:${PN}-dev += "${bindir}/isc-config.h" +FILES:${PN} += "${sbindir}/generate-rndc-key.sh" PACKAGE_BEFORE_PN += "${PN}-libs" -FILES_${PN}-libs = "${libdir}/*.so*" -FILES_${PN}-staticdev += "${libdir}/*.la" +FILES:${PN}-libs = "${libdir}/*.so*" +FILES:${PN}-staticdev += "${libdir}/*.la" PACKAGE_BEFORE_PN += "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-bind', '', d)}" -FILES_python3-bind = "${sbindir}/dnssec-coverage ${sbindir}/dnssec-checkds \ +FILES:python3-bind = "${sbindir}/dnssec-coverage ${sbindir}/dnssec-checkds \ ${sbindir}/dnssec-keymgr ${PYTHON_SITEPACKAGES_DIR}" -RDEPENDS_${PN}-dev = "" -RDEPENDS_python3-bind = "python3-core python3-ply" +RDEPENDS:${PN}-dev = "" +RDEPENDS:python3-bind = "python3-core python3-ply" diff --git a/meta-openeuler/recipes-connectivity/bluez5/bluez5_%.bbappend b/meta-openeuler/recipes-connectivity/bluez5/bluez5_%.bbappend index b26b2204fac362a801d04c63067e6d4c0ebf6da4..4beb44e3874a0a36f714f6ae2b67ea1aac5cfc27 100644 --- a/meta-openeuler/recipes-connectivity/bluez5/bluez5_%.bbappend +++ b/meta-openeuler/recipes-connectivity/bluez5/bluez5_%.bbappend @@ -5,13 +5,13 @@ PV = "5.54" # these two patches fix CVE-2021-0129 and CVE-2021-3658, which isn't suitable version 5.54 # openeuler package has another patches to fix these cves. -SRC_URI_remove = "\ +SRC_URI:remove = "\ ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ file://0001-adapter-Fix-storing-discoverable-setting.patch \ file://0001-shared-gatt-server-Fix-not-properly-checking-for-sec.patch \ " -SRC_URI_prepend = "\ +SRC_URI:prepend = "\ file://bluez-${PV}.tar.xz \ file://0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch \ file://0001-build-Always-define-confdir-and-statedir.patch \ @@ -38,10 +38,10 @@ SRC_URI_prepend = "\ # openeuler do not has udev package, which is not necessary for bluez # so remove it. -PACKAGECONFIG_remove = "udev" +PACKAGECONFIG:remove = "udev" # testtools depends python3-core python3-dbus python3-pygobject, we do not need these -RDEPENDS_${PN}-testtools = "" +RDEPENDS:${PN}-testtools = "" # adapte md5 checksum LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ diff --git a/meta-openeuler/recipes-connectivity/dhcp/dhcp.inc b/meta-openeuler/recipes-connectivity/dhcp/dhcp.inc index 78778005be05693506cec7fd661adbb6433084be..829dc24491e56420d8e7b4cb75f3ec8efc313f55 100644 --- a/meta-openeuler/recipes-connectivity/dhcp/dhcp.inc +++ b/meta-openeuler/recipes-connectivity/dhcp/dhcp.inc @@ -27,21 +27,21 @@ UPSTREAM_CHECK_REGEX = "(?P\d+\.\d+\.(\d+?))/" inherit autotools-brokensep systemd useradd update-rc.d USERADD_PACKAGES = "${PN}-server" -USERADD_PARAM_${PN}-server = "--system --no-create-home --home-dir /var/run/${BPN} --shell /bin/false --user-group ${BPN}" +USERADD_PARAM:${PN}-server = "--system --no-create-home --home-dir /var/run/${BPN} --shell /bin/false --user-group ${BPN}" SYSTEMD_PACKAGES = "${PN}-server ${PN}-relay ${PN}-client" -SYSTEMD_SERVICE_${PN}-server = "dhcpd.service dhcpd6.service" -SYSTEMD_AUTO_ENABLE_${PN}-server = "disable" +SYSTEMD_SERVICE:${PN}-server = "dhcpd.service dhcpd6.service" +SYSTEMD_AUTO_ENABLE:${PN}-server = "disable" -SYSTEMD_SERVICE_${PN}-relay = "dhcrelay.service" -SYSTEMD_AUTO_ENABLE_${PN}-relay = "disable" +SYSTEMD_SERVICE:${PN}-relay = "dhcrelay.service" +SYSTEMD_AUTO_ENABLE:${PN}-relay = "disable" -SYSTEMD_SERVICE_${PN}-client = "dhclient.service" -SYSTEMD_AUTO_ENABLE_${PN}-client = "disable" +SYSTEMD_SERVICE:${PN}-client = "dhclient.service" +SYSTEMD_AUTO_ENABLE:${PN}-client = "disable" INITSCRIPT_PACKAGES = "dhcp-server" -INITSCRIPT_NAME_dhcp-server = "dhcp-server" -INITSCRIPT_PARAMS_dhcp-server = "defaults" +INITSCRIPT_NAME:dhcp-server = "dhcp-server" +INITSCRIPT_PARAMS:dhcp-server = "defaults" CFLAGS += "-D_GNU_SOURCE" EXTRA_OECONF = "--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \ @@ -55,11 +55,11 @@ EXTRA_OECONF = "--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \ " #Enable shared libs per dhcp README -do_configure_prepend () { +do_configure:prepend () { cp configure.ac+lt configure.ac } -do_install_append () { +do_install:append () { install -d ${D}${sysconfdir}/init.d install -d ${D}${sysconfdir}/default install -d ${D}${sysconfdir}/dhcp @@ -99,38 +99,38 @@ do_install_append () { PACKAGES += "dhcp-libs dhcp-server dhcp-server-config dhcp-client dhcp-relay dhcp-omshell" -PACKAGES_remove = "${PN}" -RDEPENDS_${PN}-client += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'iproute2', '', d)}" -RDEPENDS_${PN}-dev = "" -RDEPENDS_${PN}-staticdev = "" -FILES_${PN}-libs = "${libdir}/libdhcpctl.so.0* ${libdir}/libomapi.so.0* ${libdir}/libdhcp.so.0*" +PACKAGES:remove = "${PN}" +RDEPENDS:${PN}-client += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'iproute2', '', d)}" +RDEPENDS:${PN}-dev = "" +RDEPENDS:${PN}-staticdev = "" +FILES:${PN}-libs = "${libdir}/libdhcpctl.so.0* ${libdir}/libomapi.so.0* ${libdir}/libdhcp.so.0*" -FILES_${PN}-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server" -RRECOMMENDS_${PN}-server = "dhcp-server-config" +FILES:${PN}-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server" +RRECOMMENDS:${PN}-server = "dhcp-server-config" -FILES_${PN}-server-config = "${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf" +FILES:${PN}-server-config = "${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf" -FILES_${PN}-relay = "${sbindir}/dhcrelay ${sysconfdir}/init.d/dhcp-relay ${sysconfdir}/default/dhcp-relay" +FILES:${PN}-relay = "${sbindir}/dhcrelay ${sysconfdir}/init.d/dhcp-relay ${sysconfdir}/default/dhcp-relay" -FILES_${PN}-client = "${base_sbindir}/dhclient \ +FILES:${PN}-client = "${base_sbindir}/dhclient \ ${base_sbindir}/dhclient-script \ ${sysconfdir}/dhcp/dhclient.conf \ ${base_sbindir}/dhclient-systemd-wrapper \ " -FILES_${PN}-omshell = "${bindir}/omshell" +FILES:${PN}-omshell = "${bindir}/omshell" -pkg_postinst_dhcp-server() { +pkg_postinst:dhcp-server() { mkdir -p $D/${localstatedir}/lib/dhcp touch $D/${localstatedir}/lib/dhcp/dhcpd.leases touch $D/${localstatedir}/lib/dhcp/dhcpd6.leases } -pkg_postinst_dhcp-client() { +pkg_postinst:dhcp-client() { mkdir -p $D/${localstatedir}/lib/dhcp } -pkg_postrm_dhcp-server() { +pkg_postrm:dhcp-server() { rm -f $D/${localstatedir}/lib/dhcp/dhcpd.leases rm -f $D/${localstatedir}/lib/dhcp/dhcpd6.leases @@ -139,7 +139,7 @@ pkg_postrm_dhcp-server() { fi } -pkg_postrm_dhcp-client() { +pkg_postrm:dhcp-client() { rm -f $D/${localstatedir}/lib/dhcp/dhclient.leases rm -f $D/${localstatedir}/lib/dhcp/dhclient6.leases diff --git a/meta-openeuler/recipes-connectivity/dhcp/dhcp_%.bbappend b/meta-openeuler/recipes-connectivity/dhcp/dhcp_%.bbappend index 44bf0c2b1d3c19f17c826d8db60fa551fb4ed4bb..c5fc4fa5249f375fe7bace00c3e5e13bdad46c94 100644 --- a/meta-openeuler/recipes-connectivity/dhcp/dhcp_%.bbappend +++ b/meta-openeuler/recipes-connectivity/dhcp/dhcp_%.bbappend @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=613211e713c4ffc489ec370e1cace # apply patches in openEuler # backport-0025-bind-Detect-system-time-changes.patch, backport-Fix-CVE-2021-25220.patch for bind -SRC_URI_prepend = "file://backport-0001-change-bug-url.patch \ +SRC_URI:prepend = "file://backport-0001-change-bug-url.patch \ file://backport-0002-additional-dhclient-options.patch \ file://backport-0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch \ file://backport-0004-Support-unicast-BOOTP-for-IBM-pSeries-systems-and-ma.patch \ @@ -58,11 +58,11 @@ SRC_URI[sha256sum] = "0e3ec6b4c2a05ec0148874bcd999a66d05518378d77421f607fb0bc9d0 # because backport-0007-Change-paths-to-conform-to-our-standards.patch # changed the path /sbin/dhclient-script to /usr/sbin/dhclient-script for dhclient finding dhclient-script # so re-install the dhclient-script to fix it. -do_install_append() { +do_install:append() { rm -f ${D}${base_sbindir}/dhclient-script install -m 0755 ${S}/client/scripts/linux ${D}${sbindir}/dhclient-script } -FILES_${PN}-client += "${sbindir}/dhclient-script " +FILES:${PN}-client += "${sbindir}/dhclient-script " -FILES_${PN}-client_remove = "${base_sbindir}/dhclient-script" +FILES:${PN}-client:remove = "${base_sbindir}/dhclient-script" diff --git a/meta-openeuler/recipes-connectivity/dhcp/dhcp_4.4.2-P1.bb b/meta-openeuler/recipes-connectivity/dhcp/dhcp_4.4.2-P1.bb index 9b9e73e7f5ed1e3071b2608243ab820897a9ff46..308a3eb511af7ff07107595dd814a04922b61d08 100644 --- a/meta-openeuler/recipes-connectivity/dhcp/dhcp_4.4.2-P1.bb +++ b/meta-openeuler/recipes-connectivity/dhcp/dhcp_4.4.2-P1.bb @@ -15,7 +15,7 @@ SRC_URI += "file://0001-define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.pat SRC_URI[md5sum] = "3089a1ebd20a802ec0870ae337d43907" SRC_URI[sha256sum] = "b05e04337539545a8faa0d6ac518defc61a07e5aec66a857f455e7f218c85a1a" -LDFLAGS_append = " -pthread" +LDFLAGS:append = " -pthread" PACKAGECONFIG ?= "" PACKAGECONFIG[bind-httpstats] = "--with-libxml2,--without-libxml2,libxml2" diff --git a/meta-openeuler/recipes-connectivity/iproute2/iproute2_%.bbappend b/meta-openeuler/recipes-connectivity/iproute2/iproute2_%.bbappend index 1957468fbee3ff1e1bb10e7bda750bd3da415cd7..ac5591ec15b7811251062e21ff799566f23451ce 100644 --- a/meta-openeuler/recipes-connectivity/iproute2/iproute2_%.bbappend +++ b/meta-openeuler/recipes-connectivity/iproute2/iproute2_%.bbappend @@ -1,8 +1,11 @@ +# the main bb file: yocto-poky/meta/recipes-connectivity/iproute2/iproute2_5.17.0.bb + PV = "6.1.0" OPENEULER_REPO_NAME = "iproute" OPENEULER_SRC_URI_REMOVE = "https git http" -SRC_URI += " \ + +SRC_URI:append = " \ file://${BPN}-${PV}.tar.xz \ file://bugfix-iproute2-3.10.0-fix-maddr-show.patch \ file://bugfix-iproute2-change-proc-to-ipnetnsproc-which-is-private.patch \ @@ -11,3 +14,7 @@ SRC_URI += " \ " SRC_URI[sha256sum] = "5ce12a0fec6b212725ef218735941b2dab76244db7e72646a76021b0537b43ab" + +EXTRA_OEMAKE:append = " CCOPTS='${CFLAGS}' \ +" +PACKAGECONFIG[selinux] = ",,libselinux" diff --git a/meta-openeuler/recipes-connectivity/libpcap/libpcap_%.bbappend b/meta-openeuler/recipes-connectivity/libpcap/libpcap_%.bbappend index a95c9a7991225412b3b4b71497be61fd19f7a52f..96b17bcbfecbf6a4172f83598645c196a3607e74 100644 --- a/meta-openeuler/recipes-connectivity/libpcap/libpcap_%.bbappend +++ b/meta-openeuler/recipes-connectivity/libpcap/libpcap_%.bbappend @@ -1,11 +1,17 @@ -# main bb file: yocto-poky/meta/recipes-connectivity/libpcap/libpcap_1.10.0.bb +# main bb file: yocto-poky/meta/recipes-connectivity/libpcap/libpcap_1.10.1.bb # version in openEuler PV = "1.10.3" -SRC_URI_prepend = "file://0003-pcap-linux-apparently-ctc-interfaces-on-s390-has-eth.patch \ - file://pcap-config-mitigate-multilib-conflict.patch \ - " +SRC_URI:remove = " \ +https://www.tcpdump.org/release/${BP}.tar.gz \ +" + +SRC_URI:prepend = " \ + file://libpcap-${PV}.tar.gz \ + file://0003-pcap-linux-apparently-ctc-interfaces-on-s390-has-eth.patch \ + file://pcap-config-mitigate-multilib-conflict.patch \ +" SRC_URI[md5sum] = "c42fde2eb75a5075f19116f8c9768573" SRC_URI[sha256sum] = "2a8885c403516cf7b0933ed4b14d6caa30e02052489ebd414dc75ac52e7559e6" diff --git a/meta-openeuler/recipes-connectivity/libuv/libuv_%.bbappend b/meta-openeuler/recipes-connectivity/libuv/libuv_%.bbappend index 7b9936fb9db3ab485b8642a3e4bdc5d10f9ab8c3..b2222e8471ed92545277dc46ffd46450751481e2 100644 --- a/meta-openeuler/recipes-connectivity/libuv/libuv_%.bbappend +++ b/meta-openeuler/recipes-connectivity/libuv/libuv_%.bbappend @@ -1,17 +1,16 @@ -# main bb file: yocto-poky/meta/recipes-connectivity/libuv/libuv_1.41.0.bb +# main bb file: yocto-poky/meta/recipes-connectivity/libuv/libuv_1.44.2.bb # version in openEuler PV = "1.42.0" -OPENEULER_BRANCH = "openEuler-23.03" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a68902a430e32200263d182d44924d47" -SRC_URI_remove = "git://github.com/libuv/libuv;branch=v1.x \ - git://github.com/libuv/libuv;branch=v1.x;protocol=https \ - " +SRC_URI:remove = "git://github.com/libuv/libuv.git;branch=v1.x;protocol=https \ +" # apply openEuler source package -SRC_URI_prepend = "file://${BPN}-v${PV}.tar.gz \ - file://backport-Skip-some-tests.patch \ +SRC_URI:prepend = "file://${BPN}-v${PV}.tar.gz \ + file://backport-Skip-some-tests.patch \ " S = "${WORKDIR}/${BPN}-v${PV}" diff --git a/meta-openeuler/recipes-connectivity/mosquitto/mosquitto_%.bbappend b/meta-openeuler/recipes-connectivity/mosquitto/mosquitto_%.bbappend index 60ca295c959c556b33db991bfbba83f0df28b291..003f697f9abc871912b2765ade449e211de02986 100644 --- a/meta-openeuler/recipes-connectivity/mosquitto/mosquitto_%.bbappend +++ b/meta-openeuler/recipes-connectivity/mosquitto/mosquitto_%.bbappend @@ -2,11 +2,11 @@ PV = "1.6.15" -SRC_URI_remove = " \ +SRC_URI:remove = " \ http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ " -SRC_URI_append = " \ +SRC_URI:append = " \ file://mosquitto-${PV}.tar.gz \ file://add-usage-output.patch \ file://fix-usage-exit-code.patch \ @@ -16,3 +16,5 @@ SRC_URI_append = " \ SRC_URI[md5sum] = "792bdd8fce3a8a1db102988ef6a9a02f" SRC_URI[sha256sum] = "5ff2271512f745bf1a451072cd3768a5daed71e90c5179fae12b049d6c02aa0f" + +BBCLASSEXTEND += "native nativesdk" diff --git a/meta-openeuler/recipes-connectivity/mosquitto/mosquitto_1.6.7.bb b/meta-openeuler/recipes-connectivity/mosquitto/mosquitto_1.6.7.bb index 340f643d4afbb0d9c0bc534ad9e3bd05b551765f..c73504cb5d971b30ce4da69ef053bbb8b0a165a4 100644 --- a/meta-openeuler/recipes-connectivity/mosquitto/mosquitto_1.6.7.bb +++ b/meta-openeuler/recipes-connectivity/mosquitto/mosquitto_1.6.7.bb @@ -68,31 +68,31 @@ PACKAGES += "libmosquitto1 libmosquittopp1 ${PN}-clients" PACKAGE_BEFORE_PN = "${PN}-examples" -FILES_${PN} = "${sbindir}/mosquitto \ +FILES:${PN} = "${sbindir}/mosquitto \ ${bindir}/mosquitto_passwd \ ${sysconfdir}/mosquitto \ ${sysconfdir}/init.d \ ${systemd_unitdir}/system/mosquitto.service \ " -CONFFILES_${PN} += "${sysconfdir}/mosquitto/mosquitto.conf" +CONFFILES:${PN} += "${sysconfdir}/mosquitto/mosquitto.conf" -FILES_libmosquitto1 = "${libdir}/libmosquitto.so.1" +FILES:libmosquitto1 = "${libdir}/libmosquitto.so.1" -FILES_libmosquittopp1 = "${libdir}/libmosquittopp.so.1" +FILES:libmosquittopp1 = "${libdir}/libmosquittopp.so.1" -FILES_${PN}-clients = "${bindir}/mosquitto_pub \ +FILES:${PN}-clients = "${bindir}/mosquitto_pub \ ${bindir}/mosquitto_sub \ ${bindir}/mosquitto_rr \ " -FILES_${PN}-examples = "${sysconfdir}/mosquitto/*.example" +FILES:${PN}-examples = "${sysconfdir}/mosquitto/*.example" -SYSTEMD_SERVICE_${PN} = "mosquitto.service" +SYSTEMD_SERVICE:${PN} = "mosquitto.service" INITSCRIPT_NAME = "mosquitto" INITSCRIPT_PARAMS = "defaults 30" USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --no-create-home --shell /bin/false \ +USERADD_PARAM:${PN} = "--system --no-create-home --shell /bin/false \ --user-group mosquitto" diff --git a/meta-openeuler/recipes-connectivity/nfs-utils/nfs-utils_%.bbappend b/meta-openeuler/recipes-connectivity/nfs-utils/nfs-utils_%.bbappend index 3aadf24e6f883f4d703c851aea292c3296f49c06..a1b84d0a37978a394c53af3e27ffe8fd27d56a80 100644 --- a/meta-openeuler/recipes-connectivity/nfs-utils/nfs-utils_%.bbappend +++ b/meta-openeuler/recipes-connectivity/nfs-utils/nfs-utils_%.bbappend @@ -1,7 +1,7 @@ PV = "2.6.2" # apply patches in openeuler -SRC_URI_prepend = "file://0000-systemd-idmapd-require-rpc-pipefs.patch \ +SRC_URI:prepend = "file://0000-systemd-idmapd-require-rpc-pipefs.patch \ file://0001-correct-the-statd-path-in-man.patch \ file://0002-nfs-utils-set-use-gss-proxy-1-to-enable-gss-proxy-by.patch \ file://0003-fix-coredump-in-bl_add_disk.patch \ @@ -11,7 +11,7 @@ SRC_URI_prepend = "file://0000-systemd-idmapd-require-rpc-pipefs.patch \ # fix nativesdk lib use error: /opt/buildtools/nativesdk/sysroots/x86_64-pokysdk-linux/usr/lib/libresolv.so: # file not recognized: file format not recognized -BUILD_LDFLAGS_remove = " -L${OPENEULER_NATIVESDK_SYSROOT}/usr/lib \ +BUILD_LDFLAGS:remove = " -L${OPENEULER_NATIVESDK_SYSROOT}/usr/lib \ -L${OPENEULER_NATIVESDK_SYSROOT}/lib \ -Wl,-rpath-link,${OPENEULER_NATIVESDK_SYSROOT}/usr/lib \ -Wl,-rpath-link,${OPENEULER_NATIVESDK_SYSROOT}/lib \ @@ -19,17 +19,17 @@ BUILD_LDFLAGS_remove = " -L${OPENEULER_NATIVESDK_SYSROOT}/usr/lib \ -Wl,-rpath,${OPENEULER_NATIVESDK_SYSROOT}/lib" # not support tcp-wrappers currently -PACKAGECONFIG_remove = "tcp-wrappers" +PACKAGECONFIG:remove = "tcp-wrappers" SRC_URI[sha256sum] = "5200873e81c4d610e2462fc262fe18135f2dbe78b7979f95accd159ae64d5011" -# For nfs-utils-2.6.2, the following files need to be added to FILES_${PN} -FILES_${PN} += "${nonarch_libdir}/modprobe.d" +# For nfs-utils-2.6.2, the following files need to be added to FILES:${PN} +FILES:${PN} += "${nonarch_libdir}/modprobe.d" # nfs-utils-stats has a collection of python scripts # remove the dependency of python3-core to simplify the build # when python3 support becomes mature, remove the following code -RDEPENDS_${PN}-stats = "" +RDEPENDS:${PN}-stats = "" # we current use rc5.d of rcS, in normal mode we don't want it autostart default for security INITSCRIPT_PARAMS = "start 20 2 3 4 . stop 20 0 1 6 ." diff --git a/meta-openeuler/recipes-connectivity/openssh/openssh_%.bbappend b/meta-openeuler/recipes-connectivity/openssh/openssh_%.bbappend index d9bdcddcd7123809b441d80d019a6f61214f86d1..4693aeeebfae8d8d4c1ced4f7ca5bc354ff6f271 100644 --- a/meta-openeuler/recipes-connectivity/openssh/openssh_%.bbappend +++ b/meta-openeuler/recipes-connectivity/openssh/openssh_%.bbappend @@ -8,7 +8,7 @@ PV = "9.1p1" # notice files in openssh is all from higher version of oe # ref: http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-connectivity/openssh/openssh?id=c80a3a7a4a9dc40cbb675777a1ba1481532ecb05 -FILESEXTRAPATHS_prepend := "${THISDIR}/openeuler-config/:" +FILESEXTRAPATHS:prepend := "${THISDIR}/openeuler-config/:" # confilct: other openeuler patches can't apply SRC_URI += " \ @@ -17,6 +17,6 @@ SRC_URI += " \ " # poky patches conflict with openeuler -SRC_URI_remove += " \ +SRC_URI:remove = " \ " diff --git a/meta-openeuler/recipes-connectivity/openssl/files/environment.d-openssl.sh b/meta-openeuler/recipes-connectivity/openssl/files/environment.d-openssl.sh deleted file mode 100644 index 6f23490c872fd11f0fb63b973277e1a77fc82d52..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-connectivity/openssl/files/environment.d-openssl.sh +++ /dev/null @@ -1,5 +0,0 @@ -export OPENSSL_CONF="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/openssl.cnf" -export SSL_CERT_DIR="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/certs" -export SSL_CERT_FILE="$OECORE_NATIVE_SYSROOT/usr/lib/ssl/certs/ca-certificates.crt" -export OPENSSL_MODULES="$OECORE_NATIVE_SYSROOT/usr/lib/ossl-modules/" -export OPENSSL_ENGINES="$OECORE_NATIVE_SYSROOT/usr/lib/engines-3" diff --git a/meta-openeuler/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch b/meta-openeuler/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch deleted file mode 100644 index 0b7abc3a112345be04487aa7441606f95ec40e3f..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 326909baf81a638d51fa8be1d8227518784f5cc4 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Tue, 14 Sep 2021 12:18:25 +0200 -Subject: [PATCH] Configure: do not tweak mips cflags - -This conflicts with mips machine definitons from yocto, -e.g. -| Error: -mips3 conflicts with the other architecture options, which imply -mips64r2 - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin ---- - Configure | 10 ---------- - 1 file changed, 10 deletions(-) - -Index: openssl-3.0.4/Configure -=================================================================== ---- openssl-3.0.4.orig/Configure -+++ openssl-3.0.4/Configure -@@ -1423,16 +1423,6 @@ if ($target =~ /^mingw/ && `$config{CC} - push @{$config{shared_ldflag}}, "-mno-cygwin"; - } - --if ($target =~ /linux.*-mips/ && !$disabled{asm} -- && !grep { $_ !~ /-m(ips|arch=)/ } (@{$config{CFLAGS}})) { -- # minimally required architecture flags for assembly modules -- my $value; -- $value = '-mips2' if ($target =~ /mips32/); -- $value = '-mips3' if ($target =~ /mips64/); -- unshift @{$config{cflags}}, $value; -- unshift @{$config{cxxflags}}, $value if $config{CXX}; --} -- - # If threads aren't disabled, check how possible they are - unless ($disabled{threads}) { - if ($auto_threads) { diff --git a/meta-openeuler/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch b/meta-openeuler/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch deleted file mode 100644 index bafdbaa46fc8ecbc27e0370f7f46917e4e86a6f9..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-connectivity/openssl/openssl/0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 5985253f2c9025d7c127443a3a9938946f80c2a1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= -Date: Tue, 6 Nov 2018 14:50:47 +0100 -Subject: [PATCH] buildinfo: strip sysroot and debug-prefix-map from compiler - info -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The openssl build system generates buildinf.h containing the full -compiler command line used to compile objects. This breaks -reproducibility, as the compile command is baked into libcrypto, where -it is used when running `openssl version -f`. - -Add stripped build variables for the compiler and cflags lines, and use -those when generating buildinfo.h. - -This is based on a similar patch for older openssl versions: -https://patchwork.openembedded.org/patch/147229/ - -Upstream-Status: Inappropriate [OE specific] -Signed-off-by: Martin Hundebøll - -Update to fix buildpaths qa issue for '-fmacro-prefix-map'. - -Signed-off-by: Kai Kang - -Update to fix buildpaths qa issue for '-ffile-prefix-map'. - -Signed-off-by: Khem Raj - ---- - Configurations/unix-Makefile.tmpl | 12 +++++++++++- - crypto/build.info | 2 +- - 2 files changed, 12 insertions(+), 2 deletions(-) - -Index: openssl-3.0.4/Configurations/unix-Makefile.tmpl -=================================================================== ---- openssl-3.0.4.orig/Configurations/unix-Makefile.tmpl -+++ openssl-3.0.4/Configurations/unix-Makefile.tmpl -@@ -472,13 +472,23 @@ BIN_LDFLAGS={- join(' ', $target{bin_lfl - '$(CNF_LDFLAGS)', '$(LDFLAGS)') -} - BIN_EX_LIBS=$(CNF_EX_LIBS) $(EX_LIBS) - --# CPPFLAGS_Q is used for one thing only: to build up buildinf.h -+# *_Q variables are used for one thing only: to build up buildinf.h - CPPFLAGS_Q={- $cppflags1 =~ s|([\\"])|\\$1|g; - $cppflags2 =~ s|([\\"])|\\$1|g; - $lib_cppflags =~ s|([\\"])|\\$1|g; - join(' ', $lib_cppflags || (), $cppflags2 || (), - $cppflags1 || ()) -} - -+CFLAGS_Q={- for (@{$config{CFLAGS}}) { -+ s|-fdebug-prefix-map=[^ ]+|-fdebug-prefix-map=|g; -+ s|-fmacro-prefix-map=[^ ]+|-fmacro-prefix-map=|g; -+ s|-ffile-prefix-map=[^ ]+|-ffile-prefix-map=|g; -+ } -+ join(' ', @{$config{CFLAGS}}) -} -+ -+CC_Q={- $config{CC} =~ s|--sysroot=[^ ]+|--sysroot=recipe-sysroot|g; -+ join(' ', $config{CC}) -} -+ - PERLASM_SCHEME= {- $target{perlasm_scheme} -} - - # For x86 assembler: Set PROCESSOR to 386 if you want to support -Index: openssl-3.0.4/crypto/build.info -=================================================================== ---- openssl-3.0.4.orig/crypto/build.info -+++ openssl-3.0.4/crypto/build.info -@@ -109,7 +109,7 @@ DEFINE[../libcrypto]=$UPLINKDEF - - DEPEND[info.o]=buildinf.h - DEPEND[cversion.o]=buildinf.h --GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC) $(LIB_CFLAGS) $(CPPFLAGS_Q)" "$(PLATFORM)" -+GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC_Q) $(CFLAGS_Q) $(CPPFLAGS_Q)" "$(PLATFORM)" - - GENERATE[uplink-x86.S]=../ms/uplink-x86.pl - GENERATE[uplink-x86_64.s]=../ms/uplink-x86_64.pl diff --git a/meta-openeuler/recipes-connectivity/openssl/openssl/afalg.patch b/meta-openeuler/recipes-connectivity/openssl/openssl/afalg.patch deleted file mode 100644 index cf77e873a2aa3887885adbb046bd3ad41460d688..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-connectivity/openssl/openssl/afalg.patch +++ /dev/null @@ -1,31 +0,0 @@ -Don't refuse to build afalgeng if cross-compiling or the host kernel is too old. - -Upstream-Status: Submitted [hhttps://github.com/openssl/openssl/pull/7688] -Signed-off-by: Ross Burton - -Index: openssl-3.0.4/Configure -=================================================================== ---- openssl-3.0.4.orig/Configure -+++ openssl-3.0.4/Configure -@@ -1681,20 +1681,7 @@ $config{CFLAGS} = [ map { $_ eq '--ossl- - unless ($disabled{afalgeng}) { - $config{afalgeng}=""; - if (grep { $_ eq 'afalgeng' } @{$target{enable}}) { -- my $minver = 4*10000 + 1*100 + 0; -- if ($config{CROSS_COMPILE} eq "") { -- my $verstr = `uname -r`; -- my ($ma, $mi1, $mi2) = split("\\.", $verstr); -- ($mi2) = $mi2 =~ /(\d+)/; -- my $ver = $ma*10000 + $mi1*100 + $mi2; -- if ($ver < $minver) { -- disable('too-old-kernel', 'afalgeng'); -- } else { -- push @{$config{engdirs}}, "afalg"; -- } -- } else { -- disable('cross-compiling', 'afalgeng'); -- } -+ push @{$config{engdirs}}, "afalg"; - } else { - disable('not-linux', 'afalgeng'); - } diff --git a/meta-openeuler/recipes-connectivity/openssl/openssl/run-ptest b/meta-openeuler/recipes-connectivity/openssl/openssl/run-ptest deleted file mode 100644 index 8dff79101faaf118c44182fbb8449d1775774d34..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-connectivity/openssl/openssl/run-ptest +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -set -e - -# Optional arguments are 'list' to lists all tests, or the test name (base name -# ie test_evp, not 03_test_evp.t). - -export TOP=. -# OPENSSL_ENGINES is relative from the test binaries -export OPENSSL_ENGINES=../engines - -perl ./test/run_tests.pl $* | sed -u -r -e '/(.*) \.*.ok/ s/^/PASS: /g' -r -e '/Dubious(.*)/ s/^/FAIL: /g' -e '/(.*) \.*.skipped: (.*)/ s/^/SKIP: /g' diff --git a/meta-openeuler/recipes-connectivity/openssl/openssl_%.bbappend b/meta-openeuler/recipes-connectivity/openssl/openssl_%.bbappend index 6714b3f5cc37d9efe0cc32f2a7005cca6bd88771..52e55c07e23764473045ce6f394560c574ce2d15 100644 --- a/meta-openeuler/recipes-connectivity/openssl/openssl_%.bbappend +++ b/meta-openeuler/recipes-connectivity/openssl/openssl_%.bbappend @@ -1,14 +1,36 @@ -# main bb file from: -# http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-connectivity/openssl/openssl_3.0.8.bb +# main bb file from: meta/recipes-connectivity/openssl/openssl_3.0.8.bb OPENEULER_SRC_URI_REMOVE = "https git http" # openEuler version PV = "3.0.8" -# patches in openEuler -SRC_URI += "\ - file://openssl-${PV}.tar.gz \ - file://openssl-3.0-build.patch \ -" +# conflict with openEuler patches +SRC_URI:remove = "file://CVE-2023-0464.patch \ + file://CVE-2023-0465.patch \ + file://CVE-2023-0466.patch \ + " +# patches in openEuler +SRC_URI:prepend = "file://${BP}.tar.gz \ + file://openssl-3.0-build.patch \ + file://Backport-aarch64-support-BTI-and-pointer-authentication-in-as.patch \ + file://Backport-SM3-acceleration-with-SM3-hardware-instruction-on-aa.patch \ + file://Backport-Fix-sm3ss1-translation-issue-in-sm3-armv8.pl.patch \ + file://Backport-providers-Add-SM4-GCM-implementation.patch \ + file://Backport-SM4-optimization-for-ARM-by-HW-instruction.patch \ + file://Backport-Further-acceleration-for-SM4-GCM-on-ARM.patch \ + file://Backport-SM4-optimization-for-ARM-by-ASIMD.patch \ + file://Backport-providers-Add-SM4-XTS-implementation.patch \ + file://Backport-Fix-SM4-CBC-regression-on-Armv8.patch \ + file://Backport-Fix-SM4-test-failures-on-big-endian-ARM-processors.patch \ + file://Backport-Apply-SM4-optimization-patch-to-Kunpeng-920.patch \ + file://Backport-SM4-AESE-optimization-for-ARMv8.patch \ + file://Backport-Fix-SM4-XTS-build-failure-on-Mac-mini-M1.patch \ + file://Backport-CVE-2023-0464-x509-excessive-resource-use-verifying-policy-constra.patch \ + file://Backport-test-add-test-cases-for-the-policy-resource-overuse.patch \ + file://backport-Add-a-Certificate-Policies-Test.patch \ + file://backport-Ensure-that-EXFLAG_INVALID_POLICY-is-checked-even-in.patch \ + file://backport-Generate-some-certificates-with-the-certificatePolic.patch \ + file://backport-Fix-documentation-of-X509_VERIFY_PARAM_add0_policy.patch \ + " diff --git a/meta-openeuler/recipes-connectivity/openssl/openssl_3.0.8.bb b/meta-openeuler/recipes-connectivity/openssl/openssl_3.0.8.bb deleted file mode 100644 index 8771884ddaeb186d3270e4a0b5623176a084ce99..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-connectivity/openssl/openssl_3.0.8.bb +++ /dev/null @@ -1,258 +0,0 @@ -SUMMARY = "Secure Socket Layer" -DESCRIPTION = "Secure Socket Layer (SSL) binary and related cryptographic tools." -HOMEPAGE = "http://www.openssl.org/" -BUGTRACKER = "http://www.openssl.org/news/vulnerabilities.html" -SECTION = "libs/network" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c75985e733726beaba57bc5253e96d04" - -SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ - file://run-ptest \ - file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ - file://afalg.patch \ - file://0001-Configure-do-not-tweak-mips-cflags.patch \ - " - -SRC_URI:append:class-nativesdk = " \ - file://environment.d-openssl.sh \ - " - -SRC_URI[sha256sum] = "6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e" - -inherit lib_package multilib_header multilib_script ptest perlnative -MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" - -PACKAGECONFIG ?= "" -PACKAGECONFIG:class-native = "" -PACKAGECONFIG:class-nativesdk = "" - -PACKAGECONFIG[cryptodev-linux] = "enable-devcryptoeng,disable-devcryptoeng,cryptodev-linux,,cryptodev-module" -PACKAGECONFIG[no-tls1] = "no-tls1" -PACKAGECONFIG[no-tls1_1] = "no-tls1_1" - -B = "${WORKDIR}/build" -do_configure[cleandirs] = "${B}" - -#| ./libcrypto.so: undefined reference to `getcontext' -#| ./libcrypto.so: undefined reference to `setcontext' -#| ./libcrypto.so: undefined reference to `makecontext' -EXTRA_OECONF:append:libc-musl = " no-async" -EXTRA_OECONF:append:libc-musl:powerpc64 = " no-asm" - -# adding devrandom prevents openssl from using getrandom() which is not available on older glibc versions -# (native versions can be built with newer glibc, but then relocated onto a system with older glibc) -EXTRA_OECONF:class-native = "--with-rand-seed=os,devrandom" -EXTRA_OECONF:class-nativesdk = "--with-rand-seed=os,devrandom" - -# Relying on hardcoded built-in paths causes openssl-native to not be relocateable from sstate. -CFLAGS:append:class-native = " -DOPENSSLDIR=/not/builtin -DENGINESDIR=/not/builtin" -CFLAGS:append:class-nativesdk = " -DOPENSSLDIR=/not/builtin -DENGINESDIR=/not/builtin" - -# This allows disabling deprecated or undesirable crypto algorithms. -# The default is to trust upstream choices. -DEPRECATED_CRYPTO_FLAGS ?= "" - -do_configure () { - # When we upgrade glibc but not uninative we see obtuse failures in openssl. Make - # the issue really clear that perl isn't functional due to symbol mismatch issues. - cat <<- EOF > ${WORKDIR}/perltest - #!/usr/bin/env perl - use POSIX; - EOF - chmod a+x ${WORKDIR}/perltest - ${WORKDIR}/perltest - - os=${HOST_OS} - case $os in - linux-gnueabi |\ - linux-gnuspe |\ - linux-musleabi |\ - linux-muslspe |\ - linux-musl ) - os=linux - ;; - *) - ;; - esac - target="$os-${HOST_ARCH}" - case $target in - linux-arc | linux-microblaze*) - target=linux-latomic - ;; - linux-arm*) - target=linux-armv4 - ;; - linux-aarch64*) - target=linux-aarch64 - ;; - linux-i?86 | linux-viac3) - target=linux-x86 - ;; - linux-gnux32-x86_64 | linux-muslx32-x86_64 ) - target=linux-x32 - ;; - linux-gnu64-x86_64) - target=linux-x86_64 - ;; - linux-mips | linux-mipsel) - # specifying TARGET_CC_ARCH prevents openssl from (incorrectly) adding target architecture flags - target="linux-mips32 ${TARGET_CC_ARCH}" - ;; - linux-gnun32-mips*) - target=linux-mips64 - ;; - linux-*-mips64 | linux-mips64 | linux-*-mips64el | linux-mips64el) - target=linux64-mips64 - ;; - linux-nios2* | linux-sh3 | linux-sh4 | linux-arc*) - target=linux-generic32 - ;; - linux-powerpc) - target=linux-ppc - ;; - linux-powerpc64) - target=linux-ppc64 - ;; - linux-powerpc64le) - target=linux-ppc64le - ;; - linux-riscv32) - target=linux-generic32 - ;; - linux-riscv64) - target=linux-generic64 - ;; - linux-sparc | linux-supersparc) - target=linux-sparcv9 - ;; - mingw32-x86_64) - target=mingw64 - ;; - esac - - useprefix=${prefix} - if [ "x$useprefix" = "x" ]; then - useprefix=/ - fi - # WARNING: do not set compiler/linker flags (-I/-D etc.) in EXTRA_OECONF, as they will fully replace the - # environment variables set by bitbake. Adjust the environment variables instead. - HASHBANGPERL="/usr/bin/env perl" PERL=perl PERL5LIB="${S}/external/perl/Text-Template-1.46/lib/" \ - perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} ${DEPRECATED_CRYPTO_FLAGS} --prefix=$useprefix --openssldir=${libdir}/ssl-3 --libdir=${libdir} $target - perl ${B}/configdata.pm --dump -} - -do_install () { - oe_runmake DESTDIR="${D}" MANDIR="${mandir}" MANSUFFIX=ssl install - - oe_multilib_header openssl/opensslconf.h - oe_multilib_header openssl/configuration.h - - # Create SSL structure for packages such as ca-certificates which - # contain hard-coded paths to /etc/ssl. Debian does the same. - install -d ${D}${sysconfdir}/ssl - mv ${D}${libdir}/ssl-3/certs \ - ${D}${libdir}/ssl-3/private \ - ${D}${libdir}/ssl-3/openssl.cnf \ - ${D}${sysconfdir}/ssl/ - - # Although absolute symlinks would be OK for the target, they become - # invalid if native or nativesdk are relocated from sstate. - ln -sf ${@oe.path.relative('${libdir}/ssl-3', '${sysconfdir}/ssl/certs')} ${D}${libdir}/ssl-3/certs - ln -sf ${@oe.path.relative('${libdir}/ssl-3', '${sysconfdir}/ssl/private')} ${D}${libdir}/ssl-3/private - ln -sf ${@oe.path.relative('${libdir}/ssl-3', '${sysconfdir}/ssl/openssl.cnf')} ${D}${libdir}/ssl-3/openssl.cnf -} - -do_install:append:class-native () { - create_wrapper ${D}${bindir}/openssl \ - OPENSSL_CONF=${libdir}/ssl-3/openssl.cnf \ - SSL_CERT_DIR=${libdir}/ssl-3/certs \ - SSL_CERT_FILE=${libdir}/ssl-3/cert.pem \ - OPENSSL_ENGINES=${libdir}/engines-3 \ - OPENSSL_MODULES=${libdir}/ossl-modules -} - -do_install:append:class-nativesdk () { - mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d - install -m 644 ${WORKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh - sed 's|/usr/lib/ssl/|/usr/lib/ssl-3/|g' -i ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh -} - -PTEST_BUILD_HOST_FILES += "configdata.pm" -PTEST_BUILD_HOST_PATTERN = "perl_version =" -do_install_ptest () { - install -d ${D}${PTEST_PATH}/test - install -m755 ${B}/test/p_test.so ${D}${PTEST_PATH}/test - install -m755 ${B}/test/provider_internal_test.cnf ${D}${PTEST_PATH}/test - - # Prune the build tree - rm -f ${B}/fuzz/*.* ${B}/test/*.* - - cp ${S}/Configure ${B}/configdata.pm ${D}${PTEST_PATH} - sed 's|${S}|${PTEST_PATH}|g' -i ${D}${PTEST_PATH}/configdata.pm - cp -r ${S}/external ${B}/test ${S}/test ${B}/fuzz ${S}/util ${B}/util ${D}${PTEST_PATH} - - # For test_shlibload - ln -s ${libdir}/libcrypto.so.1.1 ${D}${PTEST_PATH}/ - ln -s ${libdir}/libssl.so.1.1 ${D}${PTEST_PATH}/ - - install -d ${D}${PTEST_PATH}/apps - ln -s ${bindir}/openssl ${D}${PTEST_PATH}/apps - install -m644 ${S}/apps/*.pem ${S}/apps/*.srl ${S}/apps/openssl.cnf ${D}${PTEST_PATH}/apps - install -m755 ${B}/apps/CA.pl ${D}${PTEST_PATH}/apps - - install -d ${D}${PTEST_PATH}/engines - install -m755 ${B}/engines/dasync.so ${D}${PTEST_PATH}/engines - install -m755 ${B}/engines/loader_attic.so ${D}${PTEST_PATH}/engines - install -m755 ${B}/engines/ossltest.so ${D}${PTEST_PATH}/engines - - install -d ${D}${PTEST_PATH}/providers - install -m755 ${B}/providers/legacy.so ${D}${PTEST_PATH}/providers - - install -d ${D}${PTEST_PATH}/Configurations - cp -rf ${S}/Configurations/* ${D}${PTEST_PATH}/Configurations/ - - # seems to be needed with perl 5.32.1 - install -d ${D}${PTEST_PATH}/util/perl/recipes - cp ${D}${PTEST_PATH}/test/recipes/tconversion.pl ${D}${PTEST_PATH}/util/perl/recipes/ - - sed 's|${S}|${PTEST_PATH}|g' -i ${D}${PTEST_PATH}/util/wrap.pl -} - -# Add the openssl.cnf file to the openssl-conf package. Make the libcrypto -# package RRECOMMENDS on this package. This will enable the configuration -# file to be installed for both the openssl-bin package and the libcrypto -# package since the openssl-bin package depends on the libcrypto package. - -PACKAGES =+ "libcrypto libssl openssl-conf ${PN}-engines ${PN}-misc ${PN}-ossl-module-legacy" - -FILES:libcrypto = "${libdir}/libcrypto${SOLIBS}" -FILES:libssl = "${libdir}/libssl${SOLIBS}" -FILES:openssl-conf = "${sysconfdir}/ssl/openssl.cnf \ - ${libdir}/ssl-3/openssl.cnf* \ - " -FILES:${PN}-engines = "${libdir}/engines-3" -# ${prefix} comes from what we pass into --prefix at configure time (which is used for INSTALLTOP) -FILES:${PN}-engines:append:mingw32:class-nativesdk = " ${prefix}${libdir}/engines-3" -FILES:${PN}-misc = "${libdir}/ssl-3/misc ${bindir}/c_rehash" -FILES:${PN}-ossl-module-legacy = "${libdir}/ossl-modules/legacy.so" -FILES:${PN} =+ "${libdir}/ssl-3/* ${libdir}/ossl-modules/" -FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/openssl.sh" - -CONFFILES:openssl-conf = "${sysconfdir}/ssl/openssl.cnf" - -RRECOMMENDS:libcrypto += "openssl-conf ${PN}-ossl-module-legacy" -RDEPENDS:${PN}-misc = "perl" -RDEPENDS:${PN}-ptest += "openssl-bin perl perl-modules bash sed" - -RDEPENDS:${PN}-bin += "openssl-conf" - -BBCLASSEXTEND = "native nativesdk" - -CVE_PRODUCT = "openssl:openssl" - -CVE_VERSION_SUFFIX = "alphabetical" - -# Only affects OpenSSL >= 1.1.1 in combination with Apache < 2.4.37 -# Apache in meta-webserver is already recent enough -CVE_CHECK_IGNORE += "CVE-2019-0190" diff --git a/meta-openeuler/recipes-connectivity/ppp/ppp_%.bbappend b/meta-openeuler/recipes-connectivity/ppp/ppp_%.bbappend index 5f6fffe33671400adacfc847a2d2868e0b9a2413..4c1a46f2d3f2ca369d2c24826acd50a85884e696 100644 --- a/meta-openeuler/recipes-connectivity/ppp/ppp_%.bbappend +++ b/meta-openeuler/recipes-connectivity/ppp/ppp_%.bbappend @@ -5,7 +5,7 @@ PV = "2.4.9" # can't apply: backport-ppp-2.4.9-config.patch, no support new feature(pam,cbcp) here # this patch backport-0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch make a new path and will conflict with other package, not apply # failed to apply the patch： backport-0027-Set-LIBDIR-for-RISCV.patch (for riscv64) -SRC_URI_prepend = " \ +SRC_URI:prepend = " \ file://backport-0004-doc-add-configuration-samples.patch \ file://backport-ppp-2.4.9-build-sys-don-t-hardcode-LIBDIR-but-set-it-according.patch \ file://backport-0006-scritps-use-change_resolv_conf-function.patch \ diff --git a/meta-openeuler/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend b/meta-openeuler/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend index d414259bca6a916d12dc8d1fc458e2b3735ee91a..bc64eec03f30c0cf3d345ce57b178b0c3e53aa6c 100644 --- a/meta-openeuler/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend +++ b/meta-openeuler/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend @@ -4,7 +4,7 @@ OPENEULER_REPO_NAME = "wpa_supplicant" PV = "2.10" # apply source package in openeuler -SRC_URI_remove = "http://w1.fi/releases/wpa_supplicant-${PV}.tar.gz \ +SRC_URI:remove = "http://w1.fi/releases/wpa_supplicant-${PV}.tar.gz \ file://0001-replace-systemd-install-Alias-with-WantedBy.patch \ file://0001-AP-Silently-ignore-management-frame-from-unexpected-.patch \ file://0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch \ @@ -15,7 +15,7 @@ file://CVE-2021-27803.patch \ file://CVE-2021-30004.patch \ " -SRC_URI_prepend = "file://wpa_supplicant-${PV}.tar.gz \ +SRC_URI:prepend = "file://wpa_supplicant-${PV}.tar.gz \ " # checksum changed diff --git a/meta-openeuler/recipes-core/audit/audit_%.bbappend b/meta-openeuler/recipes-core/audit/audit_%.bbappend index 40f82135d7aec771cd2264eb784a4bf1b73b0054..42a1b4ca2e381af6ae517d5373d9e1477bafddf3 100644 --- a/meta-openeuler/recipes-core/audit/audit_%.bbappend +++ b/meta-openeuler/recipes-core/audit/audit_%.bbappend @@ -11,7 +11,7 @@ PV = "3.0.9" S = "${WORKDIR}/audit-${PV}" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = " \ +SRC_URI:remove = " \ " # files, patches that come from openeuler @@ -29,11 +29,11 @@ SRC_URI += " \ " # we don't want audit python3 runtime tool -DEPENDS:remove += " python3 " -EXTRA_OECONF:remove += " --with-python3=yes " +DEPENDS:remove = " python3 " +EXTRA_OECONF:remove = " --with-python3=yes " EXTRA_OECONF += " --with-python3=no " -PACKAGES:remove += " ${PN}-python " -FILES:${PN}-python:remove += " ${libdir}/python${PYTHON_BASEVERSION} " +PACKAGES:remove = " ${PN}-python " +FILES:${PN}-python:remove = " ${libdir}/python${PYTHON_BASEVERSION} " FILES:auditd += " ${libdir} " # use openeuler's config and rules diff --git a/meta-openeuler/recipes-core/base-files/base-files_%.bbappend b/meta-openeuler/recipes-core/base-files/base-files_%.bbappend index 74419e4472913eb505671c42878a63c80c8dd60e..1a7f71083936a0168edf25e56cae194ae777f1cb 100644 --- a/meta-openeuler/recipes-core/base-files/base-files_%.bbappend +++ b/meta-openeuler/recipes-core/base-files/base-files_%.bbappend @@ -2,10 +2,10 @@ # we create this file as a layer to use openeuler's configs files # config files use openeuler's, see base-files under this dir -FILESEXTRAPATHS_prepend := "${THISDIR}/base-files/:" +FILESEXTRAPATHS:prepend := "${THISDIR}/base-files/:" # add secure option for banner use -do_install_basefilesissue_append () { +do_install_basefilesissue:append () { BANNERSTR="Authorized uses only. All activity may be monitored and reported." echo "${BANNERSTR}" >> ${D}${sysconfdir}/issue.net echo >> ${D}${sysconfdir}/issue.net @@ -13,7 +13,7 @@ do_install_basefilesissue_append () { echo >> ${D}${sysconfdir}/issue } -do_install_append () { +do_install:append () { BANNERSTR="Authorized uses only. All activity may be monitored and reported." echo "${BANNERSTR}" >> ${D}${sysconfdir}/motd echo >> ${D}${sysconfdir}/motd diff --git a/meta-openeuler/recipes-core/base-passwd/base-passwd_%.bbappend b/meta-openeuler/recipes-core/base-passwd/base-passwd_%.bbappend index 6425639f3f3dd350208290b1e1f9ea607eb5581c..1d6defbef0689f84fc372801cf24680a470c187a 100644 --- a/meta-openeuler/recipes-core/base-passwd/base-passwd_%.bbappend +++ b/meta-openeuler/recipes-core/base-passwd/base-passwd_%.bbappend @@ -1,28 +1,31 @@ # get extra config files from openeuler -FILESEXTRAPATHS_prepend := "${THISDIR}/files/:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files/:" # remove nobash.patch, because we use /bin/bash as default SHELL -SRC_URI_remove = "https://launchpad.net/debian/+archive/primary/+files/${BPN}_${PV}.tar.gz \ +SRC_URI:remove = "https://launchpad.net/debian/+archive/primary/+files/${BPN}_${PV}.tar.gz \ file://nobash.patch \ + file://disable-shell.patch \ " # as it's small, base-passwd's tar.gz is integrated in openEuler Embedded # to avoid network download -SRC_URI_append = "file://${BPN}_${PV}.tar.gz \ - file://openeuler_secure_nologin.patch \ +SRC_URI:append = "file://${BPN}_${PV}.tar.gz \ " +# the follow patch apply failed +# file://openeuler_secure_nologin.patch + # a workaround to fix the error ”useradd: /var/run/passwd: No such file or directory“ # it's caused by shadow-native where the patch "0002-Allow-for-setting-password-in-clear-text" # cannot be applied， because openeuler's shadow version is 4.9, and the patch is suitable for # 4.8.1. In future, this issue can be fixed through upgrade of poky(3.3.2) -do_install_append() { - install -d -m 755 ${D}${localstatedir}/run -} +# do_install:append() { +# install -d -m 755 ${D}${localstatedir}/run +# } SYSROOT_DIRS += "${localstatedir}" PACKAGES =+ "${PN}-var" -FILES_${PN}-var = "/run ${localstatedir}/run" +# FILES:${PN}-var = "/run ${localstatedir}/run" diff --git a/meta-openeuler/recipes-core/busybox/busybox-inittab_%.bbappend b/meta-openeuler/recipes-core/busybox/busybox-inittab_%.bbappend index 272a04cdac143dc2524cce66cb46d6bfda008d22..44fbbe381634a43614d277ee940fe7c04697bc36 100644 --- a/meta-openeuler/recipes-core/busybox/busybox-inittab_%.bbappend +++ b/meta-openeuler/recipes-core/busybox/busybox-inittab_%.bbappend @@ -1,4 +1,4 @@ # main yocto-poky/meta/recipes-core/busybox/busybox-inittab_1.33.2.bb # we create this file as a layer to use openeuler's configs files -FILESEXTRAPATHS_prepend := "${THISDIR}/files/:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files/:" diff --git a/meta-openeuler/recipes-core/busybox/busybox_%.bbappend b/meta-openeuler/recipes-core/busybox/busybox_%.bbappend index 94a1af18047b0332a122cefb391132ae64439d96..ffd3585dbe2d591569bb2c4813551681710a3ac4 100644 --- a/meta-openeuler/recipes-core/busybox/busybox_%.bbappend +++ b/meta-openeuler/recipes-core/busybox/busybox_%.bbappend @@ -1,19 +1,26 @@ PV = "1.34.1" # use openEuler defconfig -FILESEXTRAPATHS_prepend := "${THISDIR}/files/:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files/:" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = " \ +SRC_URI:remove = " \ + file://0001-depmod-Ignore-.debug-directories.patch \ + file://longopts.cfg \ + file://0001-libbb-sockaddr2str-ensure-only-printable-characters-.patch \ + file://0002-nslookup-sanitize-all-printed-strings-with-printable.patch \ + file://CVE-2022-30065.patch \ + file://0001-devmem-add-128-bit-width.patch \ file://busybox-udhcpc-no_deconfig.patch \ file://0001-testsuite-check-uudecode-before-using-it.patch \ file://0001-gen_build_files-Use-C-locale-when-calling-sed-on-glo.patch \ file://0001-awk-fix-CVEs.patch \ file://0002-man-fix-segfault-in-man-1.patch \ + file://fail_on_no_media.patch \ " #we always want busybox with mdev\init packages to support multi init manager -SRC_URI_append = " \ +SRC_URI:append = " \ file://backport-CVE-2022-28391.patch \ file://backport-CVE-2022-30065.patch \ file://backport-fix-use-after-free-in-bc-module.patch \ @@ -27,7 +34,7 @@ SRC_URI_append = " \ DEPENDS += "libtirpc" CFLAGS += "${@bb.utils.contains('DEPENDS', 'libtirpc', '-I${STAGING_INCDIR}/tirpc', '', d)}" -do_prepare_config_append () { +do_prepare_config:append () { set +e grep -E '^CONFIG_FEATURE_MOUNT_NFS=y|^CONFIG_FEATURE_INETD_RPC=y' ${S}/.config ret=$? @@ -41,7 +48,7 @@ do_prepare_config_append () { set -e } -do_install_append () { +do_install:append () { if grep -q "CONFIG_INIT=y" ${B}/.config ; then install -D -m 0755 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d/rcS install -D -m 0755 ${WORKDIR}/rcK ${D}${sysconfdir}/init.d/rcK diff --git a/meta-openeuler/recipes-core/busybox/files/defconfig b/meta-openeuler/recipes-core/busybox/files/defconfig index e1b41f1507feddb44b8b75d451810df5e66e5730..9ae27dcdb35052e63f39047373a007ae61fd6e14 100644 --- a/meta-openeuler/recipes-core/busybox/files/defconfig +++ b/meta-openeuler/recipes-core/busybox/files/defconfig @@ -496,7 +496,7 @@ CONFIG_TELINIT_PATH="" CONFIG_INIT=y CONFIG_LINUXRC=y CONFIG_FEATURE_USE_INITTAB=y -CONFIG_FEATURE_KILL_REMOVED=y +CONFIG_FEATURE_KILL:removeD=y CONFIG_FEATURE_KILL_DELAY=0 CONFIG_FEATURE_INIT_SCTTY=y # CONFIG_FEATURE_INIT_SYSLOG is not set @@ -514,7 +514,7 @@ CONFIG_FEATURE_SHADOWPASSWDS=y # CONFIG_USE_BB_CRYPT is not set # CONFIG_USE_BB_CRYPT_SHA is not set # CONFIG_ADD_SHELL is not set -# CONFIG_REMOVE_SHELL is not set +# CONFIG:remove:SHELL is not set # CONFIG_ADDGROUP is not set # CONFIG_FEATURE_ADDUSER_TO_GROUP is not set # CONFIG_ADDUSER is not set diff --git a/meta-openeuler/recipes-core/coreutils/coreutils_%.bbappend b/meta-openeuler/recipes-core/coreutils/coreutils_%.bbappend index f45a0292df9ca983405db92d3c4127b411878f8e..e58cba53686dbf1ae97f4ec89c73dba0a0e7e04d 100644 --- a/meta-openeuler/recipes-core/coreutils/coreutils_%.bbappend +++ b/meta-openeuler/recipes-core/coreutils/coreutils_%.bbappend @@ -4,7 +4,7 @@ PV = "9.0" # solve lic check failed -LIC_FILES_CHKSUM_remove = " \ +LIC_FILES_CHKSUM:remove = " \ file://src/ls.c;beginline=1;endline=15;md5=b7d80abf5b279320fb0e4b1007ed108b \ " LIC_FILES_CHKSUM += " \ @@ -12,17 +12,18 @@ LIC_FILES_CHKSUM += " \ " # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = " \ +SRC_URI:remove = " \ ${GNU_MIRROR}/coreutils/${BP}.tar.xz \ file://remove-usr-local-lib-from-m4.patch \ file://fix-selinux-flask.patch \ file://0001-uname-report-processor-and-hardware-correctly.patch \ file://disable-ls-output-quoting.patch \ + file://e8b56ebd536e82b15542a00c888109471936bfda.patch \ file://0001-ls-restore-8.31-behavior-on-removed-directories.patch \ " # files, patches that come from openeuler -SRC_URI_prepend = " \ +SRC_URI:prepend = " \ file://${BP}.tar.xz \ file://0001-disable-test-of-rwlock.patch \ file://coreutils-8.2-uname-processortype.patch \ diff --git a/meta-openeuler/recipes-core/dbus/dbus_%.bbappend b/meta-openeuler/recipes-core/dbus/dbus_%.bbappend index 0a39e6b410186455c2e23d49f035128d6e07d8c2..42159d2b55509ec3281c66d581966795748bb37d 100644 --- a/meta-openeuler/recipes-core/dbus/dbus_%.bbappend +++ b/meta-openeuler/recipes-core/dbus/dbus_%.bbappend @@ -6,12 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ # apply openEuler source package -SRC_URI_remove = "https://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ +SRC_URI:remove = "https://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ " # apply src and patches from openEuler -SRC_URI_prepend = "file://dbus-${PV}.tar.xz \ +SRC_URI:prepend = "file://dbus-${PV}.tar.xz \ file://bugfix-let-systemd-restart-dbus-when-the-it-enters-failed.patch \ file://print-load-average-when-activate-service-timeout.patch \ file://backport-tools-Use-Python3-for-GetAllMatchRules.patch \ diff --git a/meta-openeuler/recipes-core/dsoftbus/dsoftbus_1.0.bb b/meta-openeuler/recipes-core/dsoftbus/dsoftbus_1.0.bb index 9fd65d7eeba5bb782f0805061fca8927ae6d925d..0495fb9b09e865482af4b8e13cbc289d3dc86827 100644 --- a/meta-openeuler/recipes-core/dsoftbus/dsoftbus_1.0.bb +++ b/meta-openeuler/recipes-core/dsoftbus/dsoftbus_1.0.bb @@ -52,23 +52,22 @@ SRC_URI = " \ " # fix libboundscheck.so not found -RDEPENDS_${PN} = "libboundscheck" +RDEPENDS:${PN} = "libboundscheck" # bluetooth only support for raspberrypi, qemu don't compile it -FILESEXTRAPATHS:prepend := "${THISDIR}/files/:" -DEPENDS:append:raspberrypi4-64 = " bluez5 " +DEPENDS:append:raspberrypi4-64 = " bluez5" SRC_URI:append:raspberrypi4-64 = " \ file://add-bluez-adapter-for-dsoftbus.patch;patchdir=${dsoftbus-depend} \ file://apply-ble-discovery-support.patch;patchdir=${dsoftbus-src}/dsoftbus \ " -FILES_${PN}-dev = "${includedir}" -FILES_${PN} = "${libdir} ${bindir} /data/" +FILES:${PN}-dev = "${includedir}" +FILES:${PN} = "${libdir} ${bindir} /data/" -INSANE_SKIP_${PN} += "already-stripped" -ALLOW_EMPTY_${PN} = "1" +INSANE_SKIP:${PN} += "already-stripped" +ALLOW_EMPTY:${PN} = "1" -python do_fetch_prepend() { +python do_fetch:prepend() { repoList = [{ "repo_name": "yocto-embedded-tools", "git_url": "https://gitee.com/openeuler", @@ -92,7 +91,7 @@ python do_fetch_prepend() { bb.build.exec_func("do_openeuler_fetchs", d) } -do_unpack_append() { +do_unpack:append() { bb.build.exec_func('do_copy_dsoftbus_source', d) } diff --git a/meta-openeuler/recipes-core/glib-2.0/files/0001-Do-not-write-bindir-into-pkg-config-files.patch b/meta-openeuler/recipes-core/glib-2.0/files/0001-Do-not-write-bindir-into-pkg-config-files.patch new file mode 100644 index 0000000000000000000000000000000000000000..9bdd99d8a21d59f053f6bd6a95e6f9ecae0b0998 --- /dev/null +++ b/meta-openeuler/recipes-core/glib-2.0/files/0001-Do-not-write-bindir-into-pkg-config-files.patch @@ -0,0 +1,61 @@ +From 4a41bf7b050168726cc4fad4c1c72fc7c18ab779 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 15 Feb 2019 11:17:27 +0100 +Subject: [PATCH] Do not write $bindir into pkg-config files + +This would otherwise break when using the files to build other target +components (we need to rely on PATH containing the paths to utilities, +rather than use target paths). + +Upstream-Status: Inappropriate [upstream wants the paths in .pc files] +Signed-off-by: Alexander Kanavin + +--- + gio/meson.build | 16 ++++++++-------- + glib/meson.build | 6 +++--- + 2 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/gio/meson.build b/gio/meson.build +index 36b5bad..137e75a 100644 +--- a/gio/meson.build ++++ b/gio/meson.build +@@ -862,14 +862,14 @@ pkg.generate(libgio, + 'schemasdir=' + join_paths('${datadir}', schemas_subdir), + 'bindir=' + join_paths('${prefix}', get_option('bindir')), + 'giomoduledir=' + pkgconfig_giomodulesdir, +- 'gio=' + join_paths('${bindir}', 'gio'), +- 'gio_querymodules=@0@'.format(pkgconfig_multiarch_bindir / 'gio-querymodules'), +- 'glib_compile_schemas=@0@'.format(pkgconfig_multiarch_bindir / 'glib-compile-schemas'), +- 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'), +- 'gdbus=' + join_paths('${bindir}', 'gdbus'), +- 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen'), +- 'gresource=' + join_paths('${bindir}', 'gresource'), +- 'gsettings=' + join_paths('${bindir}', 'gsettings')], ++ 'gio=gio', ++ 'gio_querymodules=gio-querymodules', ++ 'glib_compile_schemas=glib-compile-schemas', ++ 'glib_compile_resources=glib-compile-resources', ++ 'gdbus=gdbus', ++ 'gdbus_codegen=gdbus-codegen', ++ 'gresource=gresource', ++ 'gsettings=gsettings'], + version : glib_version, + install_dir : glib_pkgconfigreldir, + filebase : 'gio-2.0', +diff --git a/glib/meson.build b/glib/meson.build +index c365901..c3d6601 100644 +--- a/glib/meson.build ++++ b/glib/meson.build +@@ -397,9 +397,9 @@ pkg.generate(libglib, + subdirs : ['glib-2.0'], + extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, + variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), +- 'glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'), +- 'gobject_query=' + join_paths('${bindir}', 'gobject-query'), +- 'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')], ++ 'glib_genmarshal=glib-genmarshal', ++ 'gobject_query=gobject-query', ++ 'glib_mkenums=glib-mkenums'], + version : glib_version, + install_dir : glib_pkgconfigreldir, + filebase : 'glib-2.0', diff --git a/meta-openeuler/recipes-core/glib-2.0/files/0001-Set-host_machine-correctly-when-building-with-mingw3.patch b/meta-openeuler/recipes-core/glib-2.0/files/0001-Set-host_machine-correctly-when-building-with-mingw3.patch new file mode 100644 index 0000000000000000000000000000000000000000..2e1e2313e8b15c1cbb81db84d7ad48d553ba8402 --- /dev/null +++ b/meta-openeuler/recipes-core/glib-2.0/files/0001-Set-host_machine-correctly-when-building-with-mingw3.patch @@ -0,0 +1,81 @@ +From ba1728bc27c88597164957d000b70ec4be6edf28 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 13 Feb 2019 15:32:05 +0100 +Subject: [PATCH] Set host_machine correctly when building with mingw32 + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin + +--- + gio/tests/meson.build | 8 ++++---- + glib/tests/meson.build | 2 +- + meson.build | 3 +++ + 3 files changed, 8 insertions(+), 5 deletions(-) + +diff --git a/gio/tests/meson.build b/gio/tests/meson.build +index f644aa2..64a8684 100644 +--- a/gio/tests/meson.build ++++ b/gio/tests/meson.build +@@ -29,7 +29,7 @@ endif + + test_cpp_args = test_c_args + +-if host_machine.system() == 'windows' ++if host_system == 'windows' + common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] + endif + +@@ -210,7 +210,7 @@ if have_dbus_daemon + endif + + # Test programs buildable on UNIX only +-if host_machine.system() != 'windows' ++if host_system != 'windows' + gio_tests += { + 'file' : {}, + 'gdbus-peer-object-manager' : {}, +@@ -462,7 +462,7 @@ if host_machine.system() != 'windows' + endif # unix + + # Test programs buildable on Windows only +-if host_machine.system() == 'windows' ++if host_system == 'windows' + gio_tests += {'win32-streams' : {}} + endif + +@@ -532,7 +532,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' + } + endif + +-if host_machine.system() != 'windows' ++if host_system != 'windows' + test_extra_programs += { + 'gdbus-example-unix-fd-client' : { + 'install' : false, +diff --git a/glib/tests/meson.build b/glib/tests/meson.build +index db01b54..6950817 100644 +--- a/glib/tests/meson.build ++++ b/glib/tests/meson.build +@@ -188,7 +188,7 @@ if glib_conf.has('HAVE_EVENTFD') + } + endif + +-if host_machine.system() == 'windows' ++if host_system == 'windows' + if winsock2.found() + glib_tests += { + 'gpoll' : { +diff --git a/meson.build b/meson.build +index 43bb468..5f9b59c 100644 +--- a/meson.build ++++ b/meson.build +@@ -43,6 +43,9 @@ else + endif + + host_system = host_machine.system() ++if host_system == 'mingw32' ++ host_system = 'windows' ++endif + + if host_system == 'darwin' + ios_test_code = '''#include diff --git a/meta-openeuler/recipes-core/glib-2.0/files/Enable-more-tests-while-cross-compiling.patch b/meta-openeuler/recipes-core/glib-2.0/files/Enable-more-tests-while-cross-compiling.patch deleted file mode 100644 index f5c161fe047af8ba1d873c4ddc32a9dc27fbba52..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-core/glib-2.0/files/Enable-more-tests-while-cross-compiling.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 1f3c05529c0c9032ae0a289fb1f088b7541fc9b0 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -Date: Mon, 9 Nov 2015 11:07:27 +0200 -Subject: [PATCH] Enable more tests while cross-compiling - -Upstream disables a few tests while cross-compiling because their build requires -running other built binaries. This usually makes sense but in the cross-compile -case we can depend on glib-2.0-native. - -Upstream-Status: Inappropriate [OE specific] -Signed-off-by: Jussi Kukkonen - ---- - gio/tests/meson.build | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/gio/tests/meson.build b/gio/tests/meson.build -index 3ed23a5..5df932a 100644 ---- a/gio/tests/meson.build -+++ b/gio/tests/meson.build -@@ -253,7 +253,7 @@ if host_machine.system() != 'windows' - } - endif - -- if have_dbus_daemon -+ if true - annotate_args = [ - '--annotate', 'org.project.Bar', 'Key1', 'Value1', - '--annotate', 'org.project.Bar', 'org.gtk.GDBus.Internal', 'Value2', -@@ -603,14 +603,14 @@ if installed_tests_enabled - endforeach - endif - --if not meson.is_cross_build() or meson.has_exe_wrapper() -+if meson.is_cross_build() - - compiler_type = '--compiler=@0@'.format(cc.get_id()) - - plugin_resources_c = custom_target('plugin-resources.c', - input : 'test4.gresource.xml', - output : 'plugin-resources.c', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - compiler_type, - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), -@@ -636,7 +636,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() - test_gresource = custom_target('test.gresource', - input : 'test.gresource.xml', - output : 'test.gresource', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - compiler_type, - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), -@@ -649,7 +649,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() - test_resources2_c = custom_target('test_resources2.c', - input : 'test3.gresource.xml', - output : 'test_resources2.c', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - compiler_type, - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), -@@ -662,7 +662,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() - test_resources2_h = custom_target('test_resources2.h', - input : 'test3.gresource.xml', - output : 'test_resources2.h', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - compiler_type, - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), -@@ -676,7 +676,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() - input : 'test2.gresource.xml', - depends : big_test_resource, - output : 'test_resources.c', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - compiler_type, - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), -@@ -689,7 +689,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() - digit_test_resources_c = custom_target('digit_test_resources.c', - input : '111_digit_test.gresource.xml', - output : 'digit_test_resources.c', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - compiler_type, - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), -@@ -702,7 +702,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() - digit_test_resources_h = custom_target('digit_test_resources.h', - input : '111_digit_test.gresource.xml', - output : 'digit_test_resources.h', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - compiler_type, - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), -@@ -744,11 +744,11 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() - - ld = find_program('ld', required : false) - -- if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found() -+ if not meson.is_cross_build() - test_gresource_binary = custom_target('test5.gresource', - input : 'test5.gresource.xml', - output : 'test5.gresource', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - compiler_type, - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), -@@ -762,7 +762,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() - test_resources_binary_c = custom_target('test_resources_binary.c', - input : 'test5.gresource.xml', - output : 'test_resources_binary.c', -- command : [glib_compile_resources, -+ command : ['glib-compile-resources', - compiler_type, - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), diff --git a/meta-openeuler/recipes-core/glib-2.0/files/glib-2-glibc-2.34-close_range.patch b/meta-openeuler/recipes-core/glib-2.0/files/glib-2-glibc-2.34-close_range.patch deleted file mode 100644 index a84ccaaccbb9ff2d6bca708a2d5e17f5e0152996..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-core/glib-2.0/files/glib-2-glibc-2.34-close_range.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://bugs.gentoo.org/803632 -https://gitlab.gnome.org/GNOME/glib/-/commit/63e7864d1a0ddbead3c18872e95116e3843e81be.patch - -From 6e59d21b273f026e82adc56fecbec67d1ffa72a4 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 8 Jul 2021 17:26:43 -0700 -Subject: [PATCH] correctly use 3 parameters for close_range - -libc implementation has 3 parameter e.g. -https://www.freebsd.org/cgi/man.cgi?query=close_range&sektion=2&format=html - -Signed-off-by: Khem Raj ---- - glib/gspawn.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/glib/gspawn.c b/glib/gspawn.c -index 95f5b868e..a15fb1ca1 100644 ---- a/glib/gspawn.c -+++ b/glib/gspawn.c -@@ -1494,7 +1494,7 @@ safe_closefrom (int lowfd) - * - * Handle ENOSYS in case it’s supported in libc but not the kernel; if so, - * fall back to safe_fdwalk(). */ -- if (close_range (lowfd, G_MAXUINT) != 0 && errno == ENOSYS) -+ if (close_range (lowfd, G_MAXUINT, 0) != 0 && errno == ENOSYS) - #endif /* HAVE_CLOSE_RANGE */ - (void) safe_fdwalk (close_func, GINT_TO_POINTER (lowfd)); - #endif --- -GitLab - diff --git a/meta-openeuler/recipes-core/glib-2.0/files/relocate-modules.patch b/meta-openeuler/recipes-core/glib-2.0/files/relocate-modules.patch deleted file mode 100644 index 41e1c9989586f7f99dce107c0833ccabcf72a32e..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-core/glib-2.0/files/relocate-modules.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 011c9f024b6475d31e7d5432a38d00fb67eaea40 Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Fri, 11 Mar 2016 15:35:55 +0000 -Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds - -Instead of hard-coding GIO_MODULE_PATH when glib is built, use dladdr() to -determine where libglib.so is and use that path to calculate GIO_MODULES_DIR. - -This solves relocation problems with GIOModule for native builds of glib. - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton - -Port patch to 2.48 -Signed-off-by: Jussi Kukkonen - ---- - gio/giomodule.c | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/gio/giomodule.c b/gio/giomodule.c -index dc4d6d3..da46906 100644 ---- a/gio/giomodule.c -+++ b/gio/giomodule.c -@@ -50,7 +50,9 @@ - #include "gmemorymonitordbus.h" - #ifdef G_OS_WIN32 - #include "gregistrysettingsbackend.h" - #include "giowin32-priv.h" -+#else -+#include - #endif - #include - -@@ -1163,7 +1165,15 @@ get_gio_module_dir (void) - NULL); - g_free (install_dir); - #else -- module_dir = g_strdup (GIO_MODULE_DIR); -+ Dl_info info; -+ -+ if (dladdr (g_io_module_new, &info)) { -+ char *libdir = g_path_get_dirname (info.dli_fname); -+ module_dir = g_build_filename (libdir, "gio", "modules", NULL); -+ g_free (libdir); -+ } else { -+ module_dir = g_strdup (GIO_MODULE_DIR); -+ } - #endif - } - diff --git a/meta-openeuler/recipes-core/glib-2.0/glib-2.0_%.bbappend b/meta-openeuler/recipes-core/glib-2.0/glib-2.0_%.bbappend index f564c5dcedb44f1c54fc3e413e2d607d46299c47..5e82b5a7b4b595762eb40c6eadc563183e5eeca2 100644 --- a/meta-openeuler/recipes-core/glib-2.0/glib-2.0_%.bbappend +++ b/meta-openeuler/recipes-core/glib-2.0/glib-2.0_%.bbappend @@ -1,42 +1,42 @@ -PV = "2.74.4" OPENEULER_REPO_NAME = "glib2" -# use new relocate-modules.patch to fix build error of glib-2.0-native -FILESEXTRAPATHS_prepend := "${THISDIR}/files/:" - -# no such file, add dependency on libpcre -LIC_FILES_CHKSUM_remove = " file://glib/pcre/pcre.h;beginline=8;endline=36;md5=3e2977dae4ad05217f58c446237298fc \ -" +PV = "2.74.4" -LIC_FILES_CHKSUM = "file://COPYING;md5=41890f71f740302b785c27661123bff5" +# license update +LIC_FILES_CHKSUM = "file://COPYING;md5=41890f71f740302b785c27661123bff5 \ + file://glib/glib.h;beginline=4;endline=17;md5=72f7cc2847407f65d8981ef112e4e630 \ + file://LICENSES/LGPL-2.1-or-later.txt;md5=41890f71f740302b785c27661123bff5 \ + file://gmodule/gmodule.h;beginline=4;endline=17;md5=72f7cc2847407f65d8981ef112e4e630 \ + file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc" -DEPENDS += "libpcre2" +# use new relocate-modules.patch to fix build error of glib-2.0-native +FILESEXTRAPATHS:prepend := "${THISDIR}/files/:" -# source version differs greatly from poky, use SRC_URI of a later version -# from http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/glib-2.0/glib-2.0_2.72.3.bb -# mingw32 patch: 0001-Set-host_machine-correctly-when-building-with-mingw3.patch -SRC_URI = "file://glib-${PV}.tar.xz \ - file://0001-fix-compile-error-for-arm32.patch \ +# remove conflicting patches +SRC_URI:remove = "file://Enable-more-tests-while-cross-compiling.patch \ + file://0001-Do-not-ignore-return-value-of-write.patch \ " -EXTRA_OEMESON_remove = "-Dfam=false" + +# openeuler patch +SRC_URI:prepend = "file://backport-gdbusinterfaceskeleton-Fix-a-use-after-free-of-a-GDBusMethodInvocation.patch \ +" + +# fix arm build error: 'errno' undeclared (first use in this function) +SRC_URI:append = " file://0001-fix-compile-error-for-arm32.patch" SRC_URI[sha256sum] = "0e82da5ea129b4444227c7e4a9e598f7288d1994bf63f129c44b90cfd2432172" # delete depends to shared-mime-info -SHAREDMIMEDEP_remove += "shared-mime-info" +SHAREDMIMEDEP:remove = "shared-mime-info" # glib2-codegn is a collection of python scripts. # here, remove the runtime depends of python3, to simplify build # when python3 support becomes mature, remove the following codes -RDEPENDS_${PN}-codegen = "" +RDEPENDS:${PN}-codegen = "" + # glib needs meson, meson needs python3-native # here use nativesdk's meson-native and python3-native -DEPENDS_remove += "python3-native" - -# delete depends to util-linux-native -PACKAGECONFIG_remove_class-target += "libmount" -# no internal_pcre configuration option -PACKAGECONFIG[system-pcre] = "" +DEPENDS:remove = "python3-native" # glib-2.0 will inherit gio-module-cache.bbclass to update # gio module after glib-2.0 is installed. @@ -51,14 +51,8 @@ PACKAGECONFIG[system-pcre] = "" # following codes GIO_MODULE_PACKAGES = "" -# for ERROR: glib-2.0-1_2.74.4-r0 do_package: -# QA Issue: glib-2.0: Files/directories were installed but not shipped in any package: -# /usr/libexec -# /usr/libexec/gio-launch-desktop -FILES_${PN} += " ${libexecdir}/*gio-launch-desktop \" - # rpath may generate by meson and may not auto delete rpath, it is no secure, so let we do it as a workaround -do_install_append () { +do_install:append () { if [ -f ${D}${libexecdir}/gio-querymodules${EXEEXT} ]; then chrpath --delete ${D}${libexecdir}/gio-querymodules${EXEEXT} fi @@ -70,3 +64,28 @@ do_install_append () { chrpath --delete ${D}${libdir}/libgobject-2.0.so chrpath --delete ${D}${libdir}/libgmodule-2.0.so } + + +# keep same as later version bb below +do_install:append:class-target () { + # https://gitlab.gnome.org/GNOME/glib/-/issues/2810 + rm -f ${D}${datadir}/installed-tests/glib/thread-pool-slow.test +} + +DEPENDS:remove = "libpcre" +DEPENDS:append = " libpcre2" + +EXTRA_OEMESON:remove = "-Dfam=false" + +RDEPENDS:${PN}-ptest += "desktop-file-utils" + +# for ERROR: glib-2.0-1_2.74.4-r0 do_package: +# QA Issue: glib-2.0: Files/directories were installed but not shipped in any package: +# /usr/libexec +# /usr/libexec/gio-launch-desktop +FILES:${PN} += "${libexecdir}/*gio-launch-desktop" + +# this is a workaround: the use of qemu is immature now +# when using qemu-usermode in MACHINE_FEATURES, there will be a error: +# xxx-objcopy: Unable to recognise the format of the input file `gio/tests/test_resources.o' +MACHINE_FEATURES:remove = "qemu-usermode" diff --git a/meta-openeuler/recipes-core/images/openeuler-image-common.inc b/meta-openeuler/recipes-core/images/openeuler-image-common.inc index b9422bf861091b64d05ea70e1934d3be74ed877c..1203176f8539f981520b3f3056109d391af4203c 100644 --- a/meta-openeuler/recipes-core/images/openeuler-image-common.inc +++ b/meta-openeuler/recipes-core/images/openeuler-image-common.inc @@ -19,16 +19,16 @@ LICENSE = "MIT" inherit core-image # delete useless sdk depends -FEATURE_PACKAGES_tools-sdk_remove = " packagegroup-core-sdk packagegroup-core-standalone-sdk-target" -TOOLCHAIN_TARGET_TASK_remove = "${@multilib_pkg_extend(d, 'packagegroup-core-standalone-sdk-target')}" +FEATURE_PACKAGES:tools-sdk:remove = " packagegroup-core-sdk packagegroup-core-standalone-sdk-target" +TOOLCHAIN_TARGET_TASK:remove = "${@multilib_pkg_extend(d, 'packagegroup-core-standalone-sdk-target')}" # do_rootfs not depends to ldconfig-native as nativesdk has provided it # learn more about LDCONFIGDEPEND in image.bbclass LDCONFIGDEPEND = "" # no depends on some native tools: cross-localdef-native -DEPENDS_remove = "${@' '.join(["%s-qemuwrapper-cross" % m for m in d.getVar("MULTILIB_VARIANTS").split()])} cross-localedef-native" -SDK_DEPENDS_remove = "${@' '.join(["%s-qemuwrapper-cross" % m for m in d.getVar("MULTILIB_VARIANTS").split()])}" +DEPENDS:remove = "${@' '.join(["%s-qemuwrapper-cross" % m for m in d.getVar("MULTILIB_VARIANTS").split()])} cross-localedef-native" +SDK_DEPENDS:remove = "${@' '.join(["%s-qemuwrapper-cross" % m for m in d.getVar("MULTILIB_VARIANTS").split()])}" RPMROOTFSDEPENDS = "" diff --git a/meta-openeuler/recipes-core/images/openeuler-image-live.bb b/meta-openeuler/recipes-core/images/openeuler-image-live.bb index 73e0c5c813def2ebce0405262d50adb7d523425c..c7226d2a39072b98bcf6392d9f92462b4a36783b 100644 --- a/meta-openeuler/recipes-core/images/openeuler-image-live.bb +++ b/meta-openeuler/recipes-core/images/openeuler-image-live.bb @@ -26,7 +26,7 @@ IMAGE_FSTYPES_DEBUGFS = "cpio.gz" INITRAMFS_MAXSIZE = "262144" # make install or nologin when using busybox-inittab -set_permissions_from_rootfs_append() { +set_permissions_from_rootfs:append() { cd "${IMAGE_ROOTFS}" if [ -e ./etc/inittab ];then sed -i "s#respawn:/sbin/getty.*#respawn:-/bin/sh /init.d/install-efi.sh#g" ./etc/inittab diff --git a/meta-openeuler/recipes-core/images/openeuler-image-mcs.bb b/meta-openeuler/recipes-core/images/openeuler-image-mcs.bb index 56d6af661350bbba920e4d3874379923ef1ce7f2..cdc78a1ee689f6ad824a7ece05a3c69bff17d298 100644 --- a/meta-openeuler/recipes-core/images/openeuler-image-mcs.bb +++ b/meta-openeuler/recipes-core/images/openeuler-image-mcs.bb @@ -16,7 +16,7 @@ packagegroup-mcs \ " # make no login -set_permissions_from_rootfs_append() { +set_permissions_from_rootfs:append() { cd "${IMAGE_ROOTFS}" if [ -f ./etc/inittab ]; then sed -i "s#respawn:/sbin/getty.*#respawn:-/bin/sh#g" ./etc/inittab diff --git a/meta-openeuler/recipes-core/images/openeuler-image-sdk.inc b/meta-openeuler/recipes-core/images/openeuler-image-sdk.inc index 30222062678848fe80125b908b9a65bf35d0be3a..6cda8a59ec02853f6dc92a7b848915c1c409f84a 100644 --- a/meta-openeuler/recipes-core/images/openeuler-image-sdk.inc +++ b/meta-openeuler/recipes-core/images/openeuler-image-sdk.inc @@ -6,7 +6,7 @@ SDK_RELOCATE_AFTER_INSTALL = "0" export SDK_OS = "linux" -SDK_DEPENDS_remove += "${@' '.join(["%s-qemuwrapper-cross" % m for m in d.getVar("MULTILIB_VARIANTS").split()])}" +SDK_DEPENDS:remove = "${@' '.join(["%s-qemuwrapper-cross" % m for m in d.getVar("MULTILIB_VARIANTS").split()])}" copy_opeueuler_sdk() { test -d "${OUTPUT_DIR}" || mkdir -p "${OUTPUT_DIR}" diff --git a/meta-openeuler/recipes-core/images/openeuler-image-tiny.bb b/meta-openeuler/recipes-core/images/openeuler-image-tiny.bb index 03225512224b45d6acfd623db3cb74426f3cd7ef..2debb733179290b221417a012afe61c5d2c83dbd 100644 --- a/meta-openeuler/recipes-core/images/openeuler-image-tiny.bb +++ b/meta-openeuler/recipes-core/images/openeuler-image-tiny.bb @@ -11,7 +11,7 @@ packagegroup-core-boot \ " # make no login -set_permissions_from_rootfs_append() { +set_permissions_from_rootfs:append() { cd "${IMAGE_ROOTFS}" if [ -f ./etc/inittab ]; then sed -i "s#respawn:/sbin/getty.*#respawn:-/bin/sh#g" ./etc/inittab diff --git a/meta-openeuler/recipes-core/images/openeuler-image.bb b/meta-openeuler/recipes-core/images/openeuler-image.bb index 260d5348b2eda9c9b82884bfe756448416711722..ca6458716d8b84feb93f294c8fd944e0410c986e 100644 --- a/meta-openeuler/recipes-core/images/openeuler-image.bb +++ b/meta-openeuler/recipes-core/images/openeuler-image.bb @@ -2,9 +2,9 @@ # build an iso image, the live-os uses openeuler-image-live, it must be the same as itself(openeuler-image) # when LIVE_ROOTFS_TYPE defined, bug may come out in poky, so just use default value ext4 in image-live.bbclass. # notice we need MACHINE_FEATURES += "efi" in machine conf -IMAGE_FSTYPES_append_aarch64 = " iso" -IMAGE_FSTYPES_append_x86-64 = " iso" -IMAGE_FSTYPES_remove_raspberrypi4 = "iso" +IMAGE_FSTYPES:append:aarch64 = " iso" +IMAGE_FSTYPES:append:x86-64 = " iso" +IMAGE_FSTYPES:remove:raspberrypi4 = "iso" INITRD_IMAGE_LIVE = "openeuler-image-live" # notice: IMAGE_FEATURE configs such as IMAGE_FSTYPES should be defined before openeuler-image-common.inc(before core-image and image.bbclass) diff --git a/meta-openeuler/recipes-core/init-ifupdown/init-ifupdown_%.bbappend b/meta-openeuler/recipes-core/init-ifupdown/init-ifupdown_%.bbappend index 011a9af8cfe2f8262c7180daba7cd993e95e8e20..27f2425c0b9516e53e2e0560e669590cc3d48371 100644 --- a/meta-openeuler/recipes-core/init-ifupdown/init-ifupdown_%.bbappend +++ b/meta-openeuler/recipes-core/init-ifupdown/init-ifupdown_%.bbappend @@ -1,7 +1,7 @@ -RDEPENDS_${PN} = "os-base" -RCONFLICTS_${PN} = "" +RDEPENDS:${PN} = "os-base" +RCONFLICTS:${PN} = "" -do_install_append() { +do_install:append() { # Change the static IP address of eth0 to use by default sed -i 's/iface eth0 inet dhcp/iface eth0 inet static\n\taddress 192.168.10.8\n\tnetmask 255.255.255.0\n\tnetwork 192.168.10.0\n\tgateway 192.168.10.1\n/g' ${D}${sysconfdir}/network/interfaces } diff --git a/meta-openeuler/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bbappend b/meta-openeuler/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bbappend index bbee4c1c571f0160878252e1567881260b2d9280..a1d7310963b270522a85ba9825b336d64c125af2 100644 --- a/meta-openeuler/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bbappend +++ b/meta-openeuler/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bbappend @@ -1,11 +1,11 @@ # main bbfile: yocto-poky/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb -FILESEXTRAPATHS_prepend := "${THISDIR}/files/:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files/:" SRC_URI += "file://init-install-efi-openeuler.sh" -RDEPENDS_${PN}_remove = "initramfs-framework-base" +RDEPENDS:${PN}:remove = "initramfs-framework-base" -do_install_append() { +do_install:append() { install -m 0755 ${WORKDIR}/init-install-efi-openeuler.sh ${D}/init.d/install-efi.sh } diff --git a/meta-openeuler/recipes-core/initscripts/init-system-helpers_%.bbappend b/meta-openeuler/recipes-core/initscripts/init-system-helpers_%.bbappend index fb852f99ca592ab4a003c60347cc50772963111b..46d8b2271730d8795d094d3746df1e7a7e8bf27c 100644 --- a/meta-openeuler/recipes-core/initscripts/init-system-helpers_%.bbappend +++ b/meta-openeuler/recipes-core/initscripts/init-system-helpers_%.bbappend @@ -4,7 +4,7 @@ # to avoid network download. PV = "debian-1.64" -FILESEXTRAPATHS_append := "${THISDIR}/files/:" +FILESEXTRAPATHS:append := "${THISDIR}/files/:" LIC_FILES_CHKSUM = "file://debian/copyright;md5=c4ec20aa158fa9de26ee1accf78dcaae" diff --git a/meta-openeuler/recipes-core/initscripts/initscripts_%.bbappend b/meta-openeuler/recipes-core/initscripts/initscripts_%.bbappend index 45647feb2921e1c2b4c0fd628b08df5756a727a7..a1a8787f05073247ea2f4b4c85d9103358ca3d85 100644 --- a/meta-openeuler/recipes-core/initscripts/initscripts_%.bbappend +++ b/meta-openeuler/recipes-core/initscripts/initscripts_%.bbappend @@ -1,6 +1,6 @@ # we use openeuler's config files -FILESEXTRAPATHS_append := "${THISDIR}/files/:" +FILESEXTRAPATHS:append := "${THISDIR}/files/:" SRC_URI += " \ file://populate-openeuler-volatile.sh \ @@ -12,10 +12,10 @@ SRC_URI += " \ # do patch may fail. # A better solution is not using GPL2.patch. # This fix can be removed if the upstream poky fix this -SRC_URI_remove = "file://GPLv2.patch" +SRC_URI:remove = "file://GPLv2.patch" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/default/openeuler-volatiles install -m 0644 ${WORKDIR}/openeuler-security-volatiles ${D}${sysconfdir}/default/openeuler-volatiles/00_core install -m 0755 ${WORKDIR}/populate-openeuler-volatile.sh ${D}${sysconfdir}/init.d @@ -23,11 +23,11 @@ do_install_append() { update-rc.d -r ${D} populate-openeuler-volatile.sh start 99 S . } -MASKED_SCRIPTS_append += " \ +MASKED_SCRIPTS:append = " \ populate-openeuler-volatile \ " -pkg_postinst_${PN}_append () { +pkg_postinst:${PN}:append () { # Delete any old volatile cache script, as directories may have moved if [ -z "$D" ]; then rm -f "/etc/openeuler-volatile.cache" diff --git a/meta-openeuler/recipes-core/isulad/isulad_2.1.1.bb b/meta-openeuler/recipes-core/isulad/isulad_2.1.1.bb index 29eead6a552a89b7cd1946e63c8534479a31ac6c..62ee88c6e4bbd953afdeb51c61a611f7dccbefc3 100644 --- a/meta-openeuler/recipes-core/isulad/isulad_2.1.1.bb +++ b/meta-openeuler/recipes-core/isulad/isulad_2.1.1.bb @@ -55,7 +55,7 @@ SRC_URI = "file://v${PV}.tar.gz \ file://0043-bugfix-can-t-delete-layers-under-dir-overlay-layers.patch \ " -SRC_URI_append = "file://compile-error-fix.patch" +SRC_URI:append = "file://compile-error-fix.patch" S = "${WORKDIR}/iSulad-v${PV}" @@ -71,17 +71,17 @@ EXTRA_OECMAKE = "-DENABLE_GRPC=OFF -DENABLE_SYSTEMD_NOTIFY=OFF -DENABLE_SELINUX= INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -FILES_${PN} += "${libdir}/* " +FILES:${PN} += "${libdir}/* " #remove so from ${PN}-dev FILES_SOLIBSDEV = "" -do_configure_prepend() { +do_configure:prepend() { grep -q CMAKE_SYSROOT ${WORKDIR}/toolchain.cmake || cat >> ${WORKDIR}/toolchain.cmake <> ${WORKDIR}/toolchain.cmake <len + 1; keys = safe_malloc(len * sizeof(int)); vals = safe_malloc(len * sizeof(char *)); -@@ -886,11 +886,11 @@ int append_json_map_string_int(json_map_string_int *map, const char *key, int va +@@ -886,11 +886,11 @@ int append:json_map_string_int(json_map_string_int *map, const char *key, int va if (map == NULL) { return -1; } diff --git a/meta-openeuler/recipes-core/lxc/lxc_4.0.3.bb b/meta-openeuler/recipes-core/lxc/lxc_4.0.3.bb index 47a02a77d4f913c5947621a6ce07d0bdc2078a6f..4ae47254b838f5b23935f69cbd848935a077cc73 100644 --- a/meta-openeuler/recipes-core/lxc/lxc_4.0.3.bb +++ b/meta-openeuler/recipes-core/lxc/lxc_4.0.3.bb @@ -36,7 +36,7 @@ SRC_URI = "file://${BP}.tar.gz \ file://0026-meminfo-cri-1.25.patch \ " -SRC_URI_append = " \ +SRC_URI:append = " \ file://check_only_rootfs_as_filesystem_type.patch \ file://0027-fix-redeclaration.patch \ " @@ -49,4 +49,4 @@ inherit autotools BBCLASSEXTEND = "native nativesdk" -CFLAGS_append = "-Wno-error=stringop-overflow -Wno-error=strict-prototypes -Wno-error=old-style-definition" +CFLAGS:append = "-Wno-error=stringop-overflow -Wno-error=strict-prototypes -Wno-error=old-style-definition" diff --git a/meta-openeuler/recipes-core/meta/meta-environment.bbappend b/meta-openeuler/recipes-core/meta/meta-environment.bbappend index 732faf4d18736d9288ec8dda4740e068a6834021..ac8bf8eeb6327ab13a69b656d262c39b5d69464d 100644 --- a/meta-openeuler/recipes-core/meta/meta-environment.bbappend +++ b/meta-openeuler/recipes-core/meta/meta-environment.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_append := "${THISDIR}/files/:" +FILESEXTRAPATHS:append := "${THISDIR}/files/:" SRC_URI = " \ file://openeuler_target_env.sh \ file://toolchain.cmake \ @@ -9,7 +9,7 @@ LICENSE = "CLOSED" addtask do_fetch before do_install addtask do_unpack before do_install -do_install_append() { +do_install:append() { #add openeuler env to sdk local openeuler_env_path="${D}/${SDKPATHNATIVE}/environment-setup.d" install -d ${openeuler_env_path}/ diff --git a/meta-openeuler/recipes-core/ncurses/ncurses_%.bbappend b/meta-openeuler/recipes-core/ncurses/ncurses_%.bbappend index a8ea87689ae3605b60446c3e47d80d0661b84ec9..32e613d9397e4db1fe3979cbd818756fe25f88ee 100644 --- a/meta-openeuler/recipes-core/ncurses/ncurses_%.bbappend +++ b/meta-openeuler/recipes-core/ncurses/ncurses_%.bbappend @@ -4,7 +4,7 @@ PV = "6.4" # files, patches can't be applied in openeuler or conflict with openeuler # CVE-2021-39537.patch from poky is for 6.2 and no need for openeuler 6.3 version -SRC_URI_remove += " \ +SRC_URI:remove = " \ file://0002-configure-reproducible.patch \ file://0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch \ file://CVE-2021-39537.patch \ @@ -12,11 +12,11 @@ SRC_URI_remove += " \ S = "${WORKDIR}/${BPN}-${PV}" # files, patches that come from openeuler -SRC_URI += "file://ncurses/${BP}.tar.gz \ - file://ncurses/ncurses-config.patch \ - file://ncurses/ncurses-libs.patch \ - file://ncurses/ncurses-urxvt.patch \ - file://ncurses/ncurses-kbs.patch \ +SRC_URI += "file://${BP}.tar.gz \ + file://ncurses-config.patch \ + file://ncurses-libs.patch \ + file://ncurses-urxvt.patch \ + file://ncurses-kbs.patch \ " SRC_URI[md5sum] = "a2736befde5fee7d2b7eb45eb281cdbe" diff --git a/meta-openeuler/recipes-core/newlib/newlib_%.bb b/meta-openeuler/recipes-core/newlib/newlib_%.bb index f5ffe9d2cc93dca2233c030dd17fc753fcc0fbb0..50a4794e08d1b24eca216f3c07122b55693b73ea 100644 --- a/meta-openeuler/recipes-core/newlib/newlib_%.bb +++ b/meta-openeuler/recipes-core/newlib/newlib_%.bb @@ -38,7 +38,7 @@ S = "${WORKDIR}/newlib-${PV}" B = "${WORKDIR}/build" ## disable stdlib -TARGET_CC_ARCH_append = " -nostdlib" +TARGET_CC_ARCH:append = " -nostdlib" # when to use elf, when to use eabi # depends on toolchain and architecture @@ -87,7 +87,7 @@ do_install() { } # put the *.specs file and cpu-init into dev package -FILES_${PN}-dev += " ${libdir}/*.specs ${libdir}/cpu-init " +FILES:${PN}-dev += " ${libdir}/*.specs ${libdir}/cpu-init " # No rpm package is actually created but -dev depends on it, avoid dnf error -RDEPENDS_${PN}-dev = "" +RDEPENDS:${PN}-dev = "" diff --git a/meta-openeuler/recipes-core/os-base/os-base_1.0.bb b/meta-openeuler/recipes-core/os-base/os-base_1.0.bb index b9a58085fb7b9196e4fa4d81df6894b47600e5c0..65423d5771f02ec39351f9a0d1495bcac837cf63 100644 --- a/meta-openeuler/recipes-core/os-base/os-base_1.0.bb +++ b/meta-openeuler/recipes-core/os-base/os-base_1.0.bb @@ -10,7 +10,7 @@ INHIBIT_DEFAULT_DEPS = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" # we need update-rc.d to set up links between init.d and rcX.d -DEPENDS_append = " update-rc.d-native" +DEPENDS:append = " update-rc.d-native" SRC_URI = " \ file://rc.functions \ @@ -45,4 +45,4 @@ do_install() { install -m 0644 ${WORKDIR}/ethertypes ${D}${sysconfdir}/ethertypes } -FILES_${PN} = "/" +FILES:${PN} = "/" diff --git a/meta-openeuler/recipes-core/os-release/os-release.bbappend b/meta-openeuler/recipes-core/os-release/os-release.bbappend index 5c30d390ffde0102dce2a3fbb9ff693ba8638725..15fdeecb2391e18dfef36bc0979c8e5ce04a901b 100644 --- a/meta-openeuler/recipes-core/os-release/os-release.bbappend +++ b/meta-openeuler/recipes-core/os-release/os-release.bbappend @@ -1,7 +1,9 @@ BUILDTIME = "${DATETIME}" BUILDTIME[vardepsexclude] = "DATETIME" -do_install_append () { +do_install:append () { if [ "${BUILDTIME}" ]; then echo ${BUILDTIME} > ${D}${sysconfdir}/os-revision fi } + +FILES:${PN} += "${sysconfdir}/os-revision" diff --git a/meta-openeuler/recipes-core/packagegroups/packagegroup-base.bb b/meta-openeuler/recipes-core/packagegroups/packagegroup-base.bb index 78d53efd07a13a0f673aa2658ecc4233be8b9610..84ce365106dcc84341345fa1e696aac70f3aeac2 100644 --- a/meta-openeuler/recipes-core/packagegroups/packagegroup-base.bb +++ b/meta-openeuler/recipes-core/packagegroups/packagegroup-base.bb @@ -9,13 +9,13 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup # PACKAGES is "${PN}" by default -# if you want to add new groups by RDEPENDS_xx, you show add new group to PACKAGES +# if you want to add new groups by RDEPENDS:xx, you show add new group to PACKAGES # split packagegroup-base to packagegroup-base-utils and packagegroup-base-libs # packagegroup-base-utils means which package contains binary file for user using. # packagegroup-base-libs means which package contains library and conf files only. PACKAGES = "${PN} ${PN}-utils ${PN}-libs" -RDEPENDS_packagegroup-base-utils = " \ +RDEPENDS:packagegroup-base-utils = " \ acl \ attr \ cifs-utils \ @@ -60,7 +60,7 @@ sysfsutils \ elfutils \ " -RDEPENDS_packagegroup-base-libs = " \ +RDEPENDS:packagegroup-base-libs = " \ initscripts \ json-c \ libcap-bin \ @@ -84,11 +84,11 @@ glib-2.0 \ libbfd \ " -RDEPENDS_packagegroup-base = " \ +RDEPENDS:packagegroup-base = " \ packagegroup-base-utils \ packagegroup-base-libs \ " -RDEPENDS_packagegroup-base-utils_remove_riscv64 += " \ +RDEPENDS:packagegroup-base-utils:remove:riscv64 = " \ ethercat \ " diff --git a/meta-openeuler/recipes-core/packagegroups/packagegroup-core-base-utils.bb b/meta-openeuler/recipes-core/packagegroups/packagegroup-core-base-utils.bb index 7793c0d3a456e9faa5ba35f09c33d7689305bb50..9fe0e655d5ba90edabecd75a60ead7bbeb0e507d 100644 --- a/meta-openeuler/recipes-core/packagegroups/packagegroup-core-base-utils.bb +++ b/meta-openeuler/recipes-core/packagegroups/packagegroup-core-base-utils.bb @@ -9,7 +9,7 @@ inherit packagegroup PACKAGES = "${PN}" -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ audit \ auditd \ audispd-plugins \ diff --git a/meta-openeuler/recipes-core/packagegroups/packagegroup-core-boot-live.bb b/meta-openeuler/recipes-core/packagegroups/packagegroup-core-boot-live.bb index 90e815c43ec462fc3d0fd8df280a222cec84453a..d59bd4a4acef7f5865df4e993021e47cba54bfb6 100644 --- a/meta-openeuler/recipes-core/packagegroups/packagegroup-core-boot-live.bb +++ b/meta-openeuler/recipes-core/packagegroups/packagegroup-core-boot-live.bb @@ -6,7 +6,7 @@ inherit packagegroup # live should use this VIRTUAL-RUNTIME as we don't want systemd: # Notice: we need busybox-inittab to setup in RDEPENDS -DISTRO_FEATURES_BACKFILL_CONSIDERED_append := " systemd" +DISTRO_FEATURES_BACKFILL_CONSIDERED:append := " systemd" VIRTUAL-RUNTIME_dev_manager := "busybox-mdev" VIRTUAL-RUNTIME_init_manager := "busybox" VIRTUAL-RUNTIME_initscripts := "initscripts" @@ -21,7 +21,7 @@ SYSVINIT_SCRIPTS = "${@bb.utils.contains('MACHINE_FEATURES', 'rtc', '${VIRTUAL-R ${VIRTUAL-RUNTIME_initscripts} \ " -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ base-files \ base-passwd \ ${VIRTUAL-RUNTIME_base-utils} \ @@ -42,8 +42,8 @@ RDEPENDS_${PN} = "\ " # No rule to make target "Image" for x86-64, remove it -RDEPENDS_${PN}_remove_x86-64 += "kernel-img" +RDEPENDS:${PN}:remove:x86-64 = "kernel-img" -RRECOMMENDS_${PN} = "\ +RRECOMMENDS:${PN} = "\ ${VIRTUAL-RUNTIME_base-utils-syslog} \ ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" diff --git a/meta-openeuler/recipes-core/packagegroups/packagegroup-core-boot.bbappend b/meta-openeuler/recipes-core/packagegroups/packagegroup-core-boot.bbappend index 1805c28643ec0ed28309a0e316a24c8665f18fdb..7aa1a5c6540554e090b5c397886cf1e35d633b28 100644 --- a/meta-openeuler/recipes-core/packagegroups/packagegroup-core-boot.bbappend +++ b/meta-openeuler/recipes-core/packagegroups/packagegroup-core-boot.bbappend @@ -1,7 +1,7 @@ #main bbfile: yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-boot.bb # we add kernel-img and kernel-vmlinux -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ kernel \ kernel-img \ kernel-image \ @@ -10,12 +10,12 @@ RDEPENDS_${PN} += " \ os-release \ " # No rule to make target "Image" for x86-64, remove it -RDEPENDS_${PN}_remove_x86-64 += "kernel-img" +RDEPENDS:${PN}:remove:x86-64 = "kernel-img" # * netbase's configuration files are included in os-base # to avoid extra download # we don't need grub-efi in non-live image -RDEPENDS_${PN}_remove = " \ +RDEPENDS:${PN}:remove = " \ netbase \ ${@bb.utils.contains("MACHINE_FEATURES", "efi", "${EFI_PROVIDER} kernel", "", d)} \ " diff --git a/meta-openeuler/recipes-core/packagegroups/packagegroup-core-tools-debug.bbappend b/meta-openeuler/recipes-core/packagegroups/packagegroup-core-tools-debug.bbappend index 5d5b25d322afce1512bf7356f5c61665b58a53fb..02c267277aa4310be87db913cecc261ba20be2b3 100644 --- a/meta-openeuler/recipes-core/packagegroups/packagegroup-core-tools-debug.bbappend +++ b/meta-openeuler/recipes-core/packagegroups/packagegroup-core-tools-debug.bbappend @@ -1,6 +1,6 @@ #main bbfile: yocto-poky/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb # remove mtrace which openeuler not support current. -RDEPENDS_${PN}_remove = " \ +RDEPENDS:${PN}:remove = " \ ${MTRACE} \ " diff --git a/meta-openeuler/recipes-core/packagegroups/packagegroup-dsoftbus.bb b/meta-openeuler/recipes-core/packagegroups/packagegroup-dsoftbus.bb index 5386ae62e080395a5c0cfaa8335a84089259038e..8ce14e9940b63c86bca3ec0682a2634e673536d5 100644 --- a/meta-openeuler/recipes-core/packagegroups/packagegroup-dsoftbus.bb +++ b/meta-openeuler/recipes-core/packagegroups/packagegroup-dsoftbus.bb @@ -2,9 +2,9 @@ SUMMARY = "packagegroup of dsoftbus" PR = "r1" inherit packagegroup -RDEPENDS_packagegroup-dsoftbus = " \ +RDEPENDS:packagegroup-dsoftbus = " \ " -RDEPENDS_packagegroup-dsoftbus_append_aarch64 = " \ +RDEPENDS:packagegroup-dsoftbus:append:aarch64 = " \ dsoftbus \ " diff --git a/meta-openeuler/recipes-core/packagegroups/packagegroup-isulad.bb b/meta-openeuler/recipes-core/packagegroups/packagegroup-isulad.bb index f8a3f430d8fc462368feafd817e982b43e81eb2a..40e8b766f4b967c0f7879845db943cebb90e4973 100644 --- a/meta-openeuler/recipes-core/packagegroups/packagegroup-isulad.bb +++ b/meta-openeuler/recipes-core/packagegroups/packagegroup-isulad.bb @@ -1,11 +1,14 @@ SUMMARY = "packages for iSulad" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + inherit packagegroup PR = "r1" PACKAGES = "${PN}" -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ libseccomp \ libwebsockets \ yajl \ diff --git a/meta-openeuler/recipes-core/packagegroups/packagegroup-kernel-modules.bb b/meta-openeuler/recipes-core/packagegroups/packagegroup-kernel-modules.bb index b805e05ea3ec0c8b66d00cbe6f7e81b3fd09e796..20731427b90c508276d519b816458ad152f4e9a9 100644 --- a/meta-openeuler/recipes-core/packagegroups/packagegroup-kernel-modules.bb +++ b/meta-openeuler/recipes-core/packagegroups/packagegroup-kernel-modules.bb @@ -7,7 +7,7 @@ inherit packagegroup PACKAGES = "${PN}" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ modutils-initscripts \ " @@ -15,4 +15,4 @@ modutils-initscripts \ # You can use INSTALLMODULES which is defined in machine conf layer # like: meta-openeuler/conf/machine/kernel-modules-conf/common.inc INSTALLMODULES ?= "" -RDEPENDS_${PN} += "${INSTALLMODULES}" +RDEPENDS:${PN} += "${INSTALLMODULES}" diff --git a/meta-openeuler/recipes-core/packagegroups/packagegroup-mcs.bb b/meta-openeuler/recipes-core/packagegroups/packagegroup-mcs.bb index 757804e4f48cb36f94620199f53bc52ca99c53d1..e83ccba7f2d719d75bcfb848123a89762a3e4acc 100644 --- a/meta-openeuler/recipes-core/packagegroups/packagegroup-mcs.bb +++ b/meta-openeuler/recipes-core/packagegroups/packagegroup-mcs.bb @@ -11,7 +11,7 @@ PACKAGES = "${PN}" # According to MCS_FEATURES, select the implementation of bottom foundation and client os: # - if openamp is used, mcs-linux and mcs-km will be included # - if jailhouse is used, jailhouse will be included -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ screen \ ${@bb.utils.contains('MCS_FEATURES', 'openamp', 'mcs-linux mcs-km', '', d)} \ ${@bb.utils.contains('MCS_FEATURES', 'jailhouse', 'jailhouse', '', d)} \ diff --git a/meta-openeuler/recipes-core/packagegroups/packagegroup-network.bb b/meta-openeuler/recipes-core/packagegroups/packagegroup-network.bb index d61de4cc2772874c136797016e952db2a076037b..b98b15df71bf3b5f38b6d8c2360db45c9e16e920 100644 --- a/meta-openeuler/recipes-core/packagegroups/packagegroup-network.bb +++ b/meta-openeuler/recipes-core/packagegroups/packagegroup-network.bb @@ -5,17 +5,17 @@ inherit packagegroup PACKAGES = "${PN} packagegroup-network-nfs packagegroup-network-dhcp" -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ packagegroup-network-nfs \ packagegroup-network-dhcp \ " -RDEPENDS_${PN}-nfs = " \ +RDEPENDS:${PN}-nfs = " \ nfs-utils \ nfs-utils-client \ " -RDEPENDS_${PN}-dhcp = " \ +RDEPENDS:${PN}-dhcp = " \ bind-dhclient \ bind-dhclient-utils \ dhcp-client \ @@ -25,10 +25,10 @@ dhcp-omshell \ dhcp-relay \ " -RDEPENDS_${PN}-wifi = " \ +RDEPENDS:${PN}-wifi = " \ wpa-supplicant \ " -RDEPENDS_${PN}-bluetooth = " \ +RDEPENDS:${PN}-bluetooth = " \ bluez5 \ " diff --git a/meta-openeuler/recipes-core/packagegroups/packagegroup-openssh.bb b/meta-openeuler/recipes-core/packagegroups/packagegroup-openssh.bb index c2fd3b421febe393c1ec2b9445c6d69d21913374..65dff6c18de18bf73f9ad970224d160956400586 100644 --- a/meta-openeuler/recipes-core/packagegroups/packagegroup-openssh.bb +++ b/meta-openeuler/recipes-core/packagegroups/packagegroup-openssh.bb @@ -5,7 +5,7 @@ inherit packagegroup PACKAGES = "${PN}" -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ openssh-ssh \ openssh-sshd \ openssh-scp \ diff --git a/meta-openeuler/recipes-core/packagegroups/packagegroup-pam-plugins.bb b/meta-openeuler/recipes-core/packagegroups/packagegroup-pam-plugins.bb index 48f99610d3c83969655ba22c513d64ac62748810..98dae43004cea232b9c1a81ff3df8bbaac99c655 100644 --- a/meta-openeuler/recipes-core/packagegroups/packagegroup-pam-plugins.bb +++ b/meta-openeuler/recipes-core/packagegroups/packagegroup-pam-plugins.bb @@ -3,7 +3,7 @@ PR = "r1" inherit packagegroup -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ pam-plugin-access \ pam-plugin-debug \ pam-plugin-deny \ diff --git a/meta-openeuler/recipes-core/readline/readline_%.bbappend b/meta-openeuler/recipes-core/readline/readline_%.bbappend index b2b554104e7638be1aba02d3da421e51e166c62f..96505985034b4bb6c80d7b27f5089084e4135029 100644 --- a/meta-openeuler/recipes-core/readline/readline_%.bbappend +++ b/meta-openeuler/recipes-core/readline/readline_%.bbappend @@ -1,16 +1,16 @@ -# main bb file: yocto-poky/meta/recipes-core/readline/readline_8.1.bb +# main bb file: yocto-poky/meta/recipes-core/readline/readline_8.1.2.bb # OPENEULER_SRC_URI_REMOVE = "https git http" PV = "8.2" # the patch is out of date, use openeuler patch -SRC_URI_remove = " \ +SRC_URI:remove = " \ file://configure-fix.patch \ file://norpath.patch \ " -SRC_URI_prepend = " \ +SRC_URI:prepend = " \ file://readline-${PV}.tar.gz \ file://readline-8.0-shlib.patch \ " diff --git a/meta-openeuler/recipes-core/selinux/libselinux_%.bbappend b/meta-openeuler/recipes-core/selinux/libselinux_%.bbappend index e48602292da362fac085eb68db4ad4aa967fcc0e..3566a51097a7aeb395053912e8681fca2b6f9c8d 100644 --- a/meta-openeuler/recipes-core/selinux/libselinux_%.bbappend +++ b/meta-openeuler/recipes-core/selinux/libselinux_%.bbappend @@ -1,7 +1,7 @@ PV = "3.4" OPENEULER_SRC_URI_REMOVE = "https git http" -SRC_URI_prepend = "file://${BP}.tar.gz \ +SRC_URI:prepend = "file://${BP}.tar.gz \ file://backport-libselinux-restorecon-avoid-printing-NULL-pointer.patch \ file://do-malloc-trim-after-load-policy.patch \ " diff --git a/meta-openeuler/recipes-core/selinux/libsemanage/libsemanage-allow-to-disable-audit-support.patch b/meta-openeuler/recipes-core/selinux/libsemanage/libsemanage-allow-to-disable-audit-support.patch index 19263d8105517736b2844552d2f95911f222295c..6f2c760239ae3fb90f6b68ad2370d953e5099df2 100644 --- a/meta-openeuler/recipes-core/selinux/libsemanage/libsemanage-allow-to-disable-audit-support.patch +++ b/meta-openeuler/recipes-core/selinux/libsemanage/libsemanage-allow-to-disable-audit-support.patch @@ -90,7 +90,7 @@ index 6508ec0..1b26956 100644 semanage_seuser_query(handle, key, &seuser); + +#ifndef DISABLE_AUDIT - if (semanage_seuser_audit(handle, NULL, seuser, AUDIT_ROLE_REMOVE, rc == 0) < 0) + if (semanage_seuser_audit(handle, NULL, seuser, AUDIT_ROLE:remove, rc == 0) < 0) rc = -1; +#endif + diff --git a/meta-openeuler/recipes-core/selinux/libsemanage_%.bbappend b/meta-openeuler/recipes-core/selinux/libsemanage_%.bbappend index d77825bad5663fe834396e7c4d681b8545d766a9..dd4f57fba7fdf6a0d3c3d5cb95eda4de71f0fbb4 100644 --- a/meta-openeuler/recipes-core/selinux/libsemanage_%.bbappend +++ b/meta-openeuler/recipes-core/selinux/libsemanage_%.bbappend @@ -1,7 +1,10 @@ PV = "3.4" -OPENEULER_SRC_URI_REMOVE = "https git http" -SRC_URI_prepend = "file://${BP}.tar.gz \ +SRC_URI:remove = "git://github.com/SELinuxProject/selinux.git;branch=master;protocol=https \ + file://libsemanage-allow-to-disable-audit-support.patch \ +" + +SRC_URI:prepend = "file://${BP}.tar.gz \ file://fix-test-failure-with-secilc.patch \ " diff --git a/meta-openeuler/recipes-core/selinux/libsepol_%.bbappend b/meta-openeuler/recipes-core/selinux/libsepol_%.bbappend index 35c7ce0fc02c765a974306ea7f963af1f31dbd60..240ad5bc02f200ebe366ebe7eabeffc6fe21f5f4 100644 --- a/meta-openeuler/recipes-core/selinux/libsepol_%.bbappend +++ b/meta-openeuler/recipes-core/selinux/libsepol_%.bbappend @@ -1,7 +1,9 @@ +# the main bb file: yocto-meta-openeuler/meta-openeuler/recipes-core/selinux/libsepol_3.4.bb + PV = "3.4" OPENEULER_SRC_URI_REMOVE = "https git http" -SRC_URI_prepend = "file://${BP}.tar.gz \ +SRC_URI:prepend = "file://${BP}.tar.gz \ " SRC_URI[md5sum] = "55fef291fa5fa5b43bd98e1bc1c3d088" diff --git a/meta-openeuler/recipes-core/selinux/policycoreutils_%.bbappend b/meta-openeuler/recipes-core/selinux/policycoreutils_%.bbappend index 13016d418831cb51907452e44bc1c1668891648f..cc71e04601fe2de7416bd6b2b34aa276ae9dc6c0 100644 --- a/meta-openeuler/recipes-core/selinux/policycoreutils_%.bbappend +++ b/meta-openeuler/recipes-core/selinux/policycoreutils_%.bbappend @@ -1,7 +1,10 @@ PV = "3.4" -OPENEULER_SRC_URI_REMOVE = "https git http" -SRC_URI_prepend = "file://${BP}.tar.gz \ +SRC_URI:remove = "git://github.com/SELinuxProject/selinux.git;branch=master;protocol=https \ + file://libsemanage-allow-to-disable-audit-support.patch \ +" + +SRC_URI:prepend = "file://${BP}.tar.gz \ file://fix-fixfiles-N-date-function.patch;patchdir=.. \ file://fix-fixfiles-N-date-function-two.patch;patchdir=.. \ file://backport-python-Split-semanage-import-into-two-transactions.patch;patchdir=.. \ diff --git a/meta-openeuler/recipes-core/sysfsutils/sysfsutils_%.bbappend b/meta-openeuler/recipes-core/sysfsutils/sysfsutils_%.bbappend index 94998694a4bc23bd9f85200df80e877749753ab2..d0e5a26a79de246b8c066af09b6a21a19a535d80 100644 --- a/meta-openeuler/recipes-core/sysfsutils/sysfsutils_%.bbappend +++ b/meta-openeuler/recipes-core/sysfsutils/sysfsutils_%.bbappend @@ -2,13 +2,13 @@ PV = "2.1.1" # remove patches that can't apply in poky -SRC_URI_remove = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz \ +SRC_URI:remove = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz \ file://sysfsutils-2.0.0-class-dup.patch \ file://obsolete_automake_macros.patch \ file://separatebuild.patch \ " -SRC_URI_prepend += "file://sysfsutils/v${PV}.tar.gz \ +SRC_URI:prepend = "file://sysfsutils/v${PV}.tar.gz \ " SRC_URI += "file://0001-lib-Fixed-a-memory-leak-in-lib-sysfs_driver.patch \ diff --git a/meta-openeuler/recipes-core/systemd/systemd-boot_%.bbappend b/meta-openeuler/recipes-core/systemd/systemd-boot_%.bbappend index 98d4bc62f8001acb797b31c057a525ced7a65b57..89a4b5e4bbd4d24bf995b0e1a9553db519432751 100644 --- a/meta-openeuler/recipes-core/systemd/systemd-boot_%.bbappend +++ b/meta-openeuler/recipes-core/systemd/systemd-boot_%.bbappend @@ -10,7 +10,7 @@ require systemd-openeuler.inc # sync from poky honister # see: https://git.yoctoproject.org/poky/tree/meta/recipes-core/systemd/systemd-boot_249.7.bb?h=honister EFI_LD = "${HOST_PREFIX}ld.bfd" -EXTRA_OEMESON_remove += "-Defi-ld=${@ d.getVar('LD').split()[0]} " +EXTRA_OEMESON:remove = "-Defi-ld=${@ d.getVar('LD').split()[0]} " EXTRA_OEMESON += "-Defi-ld=${EFI_LD} " SRC_URI[tarball.md5sum] = "8e8adf909c255914dfc10709bd372e69" @@ -18,7 +18,7 @@ SRC_URI[tarball.sha256sum] = "174091ce5f2c02123f76d546622b14078097af105870086d18 # glib needs meson, meson needs python3-native # here use nativesdk's meson-native and python3-native -DEPENDS_remove += "python3-native" +DEPENDS:remove = "python3-native" #delete depends to util-linux-native -PACKAGECONFIG_remove_class-target += "libmount" +PACKAGECONFIG:remove:class-target += "libmount" diff --git a/meta-openeuler/recipes-core/systemd/systemd-openeuler.inc b/meta-openeuler/recipes-core/systemd/systemd-openeuler.inc index f8283ba336f57b1a617fe40e23a09ed20f3982b9..05e65c7521808419409fe2e273f37546e0b94fea 100644 --- a/meta-openeuler/recipes-core/systemd/systemd-openeuler.inc +++ b/meta-openeuler/recipes-core/systemd/systemd-openeuler.inc @@ -2,7 +2,7 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/systemd-${PV}/LICENSE.GPL2;md5=751419260aa file://${WORKDIR}/systemd-${PV}/LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = " \ +SRC_URI:remove = " \ git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \ file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ file://0003-implment-systemd-sysv-install-for-OE.patch \ @@ -44,7 +44,7 @@ SRC_URI =+ " \ file://backport-mkosi-openSUSE-update-bootable-no-dependencies.patch \ file://backport-mkosi-Fix-openSUSE-Jinja2-package-name.patch \ file://backport-sd-netlink-always-append-new-bridge-FDB-entries.patch \ - file://backport-core-cgroup-fix-error-handling-of-cg_remove_xattr.patch \ + file://backport-core-cgroup-fix-error-handling-of-cg:remove:xattr.patch \ file://backport-core-wrap-cgroup-path-with-empty_to_root-in-log-mess.patch \ file://backport-network-add-comments.patch \ file://backport-network-ignore-errors-on-setting-bridge-config.patch \ @@ -212,7 +212,7 @@ SRC_URI =+ " \ file://backport-virt-Fix-the-detection-for-Hyper-V-VMs.patch \ file://backport-homework-fix-a-bad-error-propagation.patch \ file://backport-journal-Remove-entry-seqnum-revert-logic.patch \ - file://backport-mmap-cache-LIST_REMOVE-after-w-unused_prev.patch \ + file://backport-mmap-cache-LIST:remove-after-w-unused_prev.patch \ file://backport-journal-Deduplicate-entry-items-before-they-are-stor.patch \ file://backport-test-journal-flush-allow-testing-against-specific-fi.patch \ file://backport-test-journal-flush-do-not-croak-on-corrupted-input-f.patch \ diff --git a/meta-openeuler/recipes-core/systemd/systemd_%.bbappend b/meta-openeuler/recipes-core/systemd/systemd_%.bbappend index b90f12734affb66dbc59d3cf6c0cb0db8c186ebd..53c2a79f58f996048dc2b49ae047a86f87e0a009 100644 --- a/meta-openeuler/recipes-core/systemd/systemd_%.bbappend +++ b/meta-openeuler/recipes-core/systemd/systemd_%.bbappend @@ -7,21 +7,21 @@ S = "${WORKDIR}/${BP}" require systemd-openeuler.inc OPENEULER_REPO_NAME = "systemd" -FILESEXTRAPATHS_prepend := "${THISDIR}/files/:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files/:" # feature sync with systemd_249.7.bb from poky honister # see https://git.yoctoproject.org/poky/tree/meta/recipes-core/systemd/systemd_249.7.bb?h=honister -PACKAGECONFIG_append += "wheel-group" +PACKAGECONFIG:append = "wheel-group" # we don't wan zstd PACKAGECONFIG += "zstd" -PACKAGECONFIG_remove += "xz" +PACKAGECONFIG:remove = "xz" PACKAGECONFIG[tpm2] = "-Dtpm2=true,-Dtpm2=false,tpm2-tss,tpm2-tss libtss2 libtss2-tcti-device" PACKAGECONFIG[repart] = "-Drepart=true,-Drepart=false" PACKAGECONFIG[homed] = "-Dhomed=true,-Dhomed=false" PACKAGECONFIG[wheel-group] = "-Dwheel-group=true, -Dwheel-group=false" PACKAGECONFIG[zstd] = "-Dzstd=true,-Dzstd=false,zstd" -FILES_${PN}-container += "${exec_prefix}/lib/tmpfiles.d/README " -FILES_${PN}-extra-utils += "${bindir}/systemd-sysext " -FILES_${PN} += "${rootlibexecdir}/modprobe.d/README ${datadir}/dbus-1/system.d/org.freedesktop.home1.conf " +FILES:${PN}-container += "${exec_prefix}/lib/tmpfiles.d/README " +FILES:${PN}-extra-utils += "${bindir}/systemd-sysext " +FILES:${PN} += "${rootlibexecdir}/modprobe.d/README ${datadir}/dbus-1/system.d/org.freedesktop.home1.conf " FILES_udev += "${rootlibexecdir}/udev/dmi_memory_id \ ${rootlibexecdir}/udev/rules.d/40-elevator.rules \ ${rootlibexecdir}/udev/rules.d/70-memory.rules \ @@ -47,11 +47,11 @@ FILES_udev += " \ # depmodwrapper is not valid to do depmod in buildtime, add a service to do it in runtime as a workaround. # as modutils.sh is not run under systemd -PACKAGE_BEFORE_PN_append = "${PN}-depmod " -SRC_URI_append += "file://systemd-depmod.service" -FILES_${PN}-depmod = "${systemd_unitdir}/system/systemd-depmod.service" -SYSTEMD_SERVICE_${PN}-depmod = "systemd-depmod.service" -do_install_append () { +PACKAGE_BEFORE_PN:append = "${PN}-depmod " +SRC_URI:append = "file://systemd-depmod.service" +FILES:${PN}-depmod = "${systemd_unitdir}/system/systemd-depmod.service" +SYSTEMD_SERVICE:${PN}-depmod = "systemd-depmod.service" +do_install:append () { install -m 0644 ${WORKDIR}/systemd-depmod.service ${D}${systemd_unitdir}/system/systemd-depmod.service ln -sf ../systemd-depmod.service ${D}${systemd_unitdir}/system/sysinit.target.wants/systemd-depmod.service } @@ -61,7 +61,7 @@ SRC_URI[tarball.sha256sum] = "174091ce5f2c02123f76d546622b14078097af105870086d18 # glib needs meson, meson needs python3-native # here use nativesdk's meson-native and python3-native -DEPENDS_remove += "python3-native" +DEPENDS:remove = "python3-native" pkg_postinst_udev-hwdb () { # current we don't support qemuwrapper to pre build the config for rootfs diff --git a/meta-openeuler/recipes-core/tzdata/timezone-append.inc b/meta-openeuler/recipes-core/tzdata/timezone-append.inc index 0d809852b12e5edc32b9092fc2c50911e79ab249..8f4d022c3c0dcff8f279afd5b4856ff61c7ea550 100644 --- a/meta-openeuler/recipes-core/tzdata/timezone-append.inc +++ b/meta-openeuler/recipes-core/tzdata/timezone-append.inc @@ -4,6 +4,10 @@ DL_DIR = "${OPENEULER_SP_DIR}/tzdata" OPENEULER_REPO_NAME = "tzdata" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba" + +S = "${WORKDIR}" + # files, patches that come from openeuler SRC_URI = " \ file://tzcode${PV}.tar.gz;name=tzcode \ diff --git a/meta-openeuler/recipes-core/tzdata/tzdata.bbappend b/meta-openeuler/recipes-core/tzdata/tzdata.bbappend index d130a3756324900b538f6544491457116d5387dc..89892216f76c8be3897ca9558c059304a63a33b7 100644 --- a/meta-openeuler/recipes-core/tzdata/tzdata.bbappend +++ b/meta-openeuler/recipes-core/tzdata/tzdata.bbappend @@ -1,10 +1,19 @@ include timezone-append.inc -FILES_tzdata-core_append += " \ +FILES:tzdata-core:append = " \ ${datadir}/zoneinfo/Asia/Beijing \ ${datadir}/zoneinfo/Asia/Shanghai \ " +SRC_URI:remove = "file://backport-Much-of-Greenland-still-uses-DST-from-2024-on.patch \ + file://bugfix-0001-add-Beijing-timezone.patch \ + file://remove-ROC-timezone.patch \ + file://rename-Macau-to-Macao.patch \ + file://remove-El_Aaiun-timezone.patch \ + file://remove-Israel-timezone.patch \ + file://skip-check_web-testcase.patch \ +" + # no need to depends on tzcode-native, as nativesdk-tzcode is included # zic is in HOSTTOOLS_NOFATAL DEPENDS = "" @@ -19,3 +28,32 @@ do_compile () { ${S}/${zone} ; \ done } + +do_install() { + install -d ${D}${datadir}/zoneinfo +# the init code is "cp -pPR ${B}/zoneinfo/* ${D}${datadir}/zoneinfo", but build directory +# is empty and zoneinfo is in "usr/share", so replace ${B}/zoneinfo to ${WORKDIR}/usr/share/zoneinfo +# as workaround + cp -pPR ${WORKDIR}/usr/share/zoneinfo/* ${D}${datadir}/zoneinfo + + # libc is removing zoneinfo files from package + cp -pP "${S}/zone.tab" ${D}${datadir}/zoneinfo + cp -pP "${S}/zone1970.tab" ${D}${datadir}/zoneinfo + cp -pP "${S}/iso3166.tab" ${D}${datadir}/zoneinfo + cp -pP "${S}/leapseconds" ${D}${datadir}/zoneinfo + cp -pP "${S}/leap-seconds.list" ${D}${datadir}/zoneinfo + + # Install default timezone + if [ -e ${D}${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ]; then + install -d ${D}${sysconfdir} + if [ "${INSTALL_TIMEZONE_FILE}" = "1" ]; then + echo ${DEFAULT_TIMEZONE} > ${D}${sysconfdir}/timezone + fi + ln -s ${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ${D}${sysconfdir}/localtime + else + bberror "DEFAULT_TIMEZONE is set to an invalid value." + exit 1 + fi + + chown -R root:root ${D} +} diff --git a/meta-openeuler/recipes-core/update-rc.d/update-rc.d_%.bbappend b/meta-openeuler/recipes-core/update-rc.d/update-rc.d_%.bbappend index 4f962d03373858689227a4a3dce86c037f85c347..fcd1492f003bb166b266bc6e8231d2579bb8bd5e 100644 --- a/meta-openeuler/recipes-core/update-rc.d/update-rc.d_%.bbappend +++ b/meta-openeuler/recipes-core/update-rc.d/update-rc.d_%.bbappend @@ -5,7 +5,7 @@ # and update-rc.d script file (with update-rc.d_0.8.bb ), OPENEULER_REPO_NAME = "update-rc.d_dummy" -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI = "file://update-rc.d" diff --git a/meta-openeuler/recipes-core/util-linux/util-linux_src.inc b/meta-openeuler/recipes-core/util-linux/util-linux_src.inc index 3b6e4a7d306a1aa0b1aea29b78edfa198d458258..e95543cc9d75c11b74a52019d49850fd50a3d096 100644 --- a/meta-openeuler/recipes-core/util-linux/util-linux_src.inc +++ b/meta-openeuler/recipes-core/util-linux/util-linux_src.inc @@ -3,7 +3,7 @@ PV = "2.37.2" # files, patches can't be applied in openeuler or conflict with openeuler # ptest.patch, patch-fuzz warning OPENEULER_SRC_URI_REMOVE = "https git http" -SRC_URI_remove += " \ +SRC_URI:remove = " \ file://ptest.patch \ file://avoid_parallel_tests.patch \ file://Automake-use-EXTRA_LTLIBRARIES-instead-of-noinst_LTL.patch \ @@ -11,7 +11,7 @@ SRC_URI_remove += " \ " # files, patches that come from openeuler -SRC_URI_prepend += " \ +SRC_URI:prepend = " \ file://util-linux-${PV}.tar.xz \ file://2.36-login-lastlog-create.patch \ file://backport-CVE-2021-3995.patch \ diff --git a/meta-openeuler/recipes-core/zlib/zlib_%.bbappend b/meta-openeuler/recipes-core/zlib/zlib_%.bbappend index 7c40baba9cf176397b1e6fc40b066bceca5138ca..bcdd935bb2b8922465c3b8446fbd93c6d81c66e7 100644 --- a/meta-openeuler/recipes-core/zlib/zlib_%.bbappend +++ b/meta-openeuler/recipes-core/zlib/zlib_%.bbappend @@ -3,22 +3,23 @@ #version in openEuler PV = "1.2.13" -OPENEULER_SRC_URI_REMOVE = "https git http" - # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = " \ +SRC_URI:remove = " \ + ${SOURCEFORGE_MIRROR}/libpng/${BPN}/${PV}/${BPN}-${PV}.tar.xz \ file://CVE-2018-25032.patch \ file://ldflags-tests.patch \ + file://CVE-2022-37434.patch \ " + # files, patches that come from openeuler -SRC_URI += " \ - file://${BP}.tar.xz \ +SRC_URI:append = " \ + file://zlib-${PV}.tar.xz \ file://backport-zlib-1.2.5-minizip-fixuncrypt.patch \ file://backport-fix-undefined-buffer-detected-by-oss-fuzz.patch \ " # files, patches that come from openeuler for aarch64, there are compile err in 0004-zlib-Optimize-CRC32.patch, not apply -SRC_URI_append_aarch64 += " \ +SRC_URI:append:aarch64 = " \ file://zlib-1.2.11-SIMD.patch \ " diff --git a/meta-openeuler/recipes-devtools/binutils/binutils_src.inc b/meta-openeuler/recipes-devtools/binutils/binutils_src.inc index 4075b94ec82dc24f098e7abe9ebf19d47d0c3713..a76c457c765923e22c9cfc706349e1db1cfcca99 100644 --- a/meta-openeuler/recipes-devtools/binutils/binutils_src.inc +++ b/meta-openeuler/recipes-devtools/binutils/binutils_src.inc @@ -1,5 +1,6 @@ PV = "2.37" S = "${WORKDIR}/${BPN}-${PV}" +FILESEXTRAPATHS:prepend := "${THISDIR}/files/:" # apply package source and patches from openeuler SRC_URI = " \ @@ -63,7 +64,7 @@ SRC_URI += " \ SRC_URI[sha256sum] = "820d9724f020a3e69cb337893a0b63c2db161dadcb0e06fc11dc29eb1e84a32c" -do_configure_prepend_class-target () { +do_configure:prepend:class-target () { # fix Can't locate Autom4te/ChannelDefs.pm in @INC (you may need to install the Autom4te::ChannelDefs module) (@INC contains: /build/tmp/work/*/binutils/2.37-r0/recipe-sysroot-native/usr/share/autoconf ... # autoconf is installed at buildtool-bar, not build autoconf-native, so need to set autom4te_perllibdir or modify default value in gnu-config if [ ! -z "${OPENEULER_NATIVESDK_SYSROOT}" ];then @@ -73,10 +74,10 @@ do_configure_prepend_class-target () { # bfd_stdint.h has been removed in favor of using stdint.h in new version # delete the two function below after upgrade to new poky -do_install_prepend () { +do_install:prepend () { mkdir -p ${D}${includedir} touch ${D}${includedir}/bfd_stdint.h } -do_install_append () { +do_install:append () { rm -f ${D}${includedir}/bfd_stdint.h } diff --git a/meta-openeuler/recipes-devtools/binutils/files/0005-Point-scripts-location-to-libdir.patch b/meta-openeuler/recipes-devtools/binutils/files/0005-Point-scripts-location-to-libdir.patch new file mode 100644 index 0000000000000000000000000000000000000000..dde0cb5d6d0c683269ba5c267a8fdcee4f2294ff --- /dev/null +++ b/meta-openeuler/recipes-devtools/binutils/files/0005-Point-scripts-location-to-libdir.patch @@ -0,0 +1,39 @@ +From 6a67d277941228d997b527990960413f8444fb81 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 2 Mar 2015 01:09:58 +0000 +Subject: [PATCH] Point scripts location to libdir + +Upstream-Status: Inappropriate [debian patch] + +Signed-off-by: Khem Raj +--- + ld/Makefile.am | 2 +- + ld/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ld/Makefile.am b/ld/Makefile.am +index 3b01357b651..b7a1f7491b0 100644 +--- a/ld/Makefile.am ++++ b/ld/Makefile.am +@@ -51,7 +51,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) + # We put the scripts in the directory $(scriptdir)/ldscripts. + # We can't put the scripts in $(datadir) because the SEARCH_DIR + # directives need to be different for native and cross linkers. +-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir) + + EMUL = @EMUL@ + EMULATION_OFILES = @EMULATION_OFILES@ +diff --git a/ld/Makefile.in b/ld/Makefile.in +index a6382bf2a45..5ee3a4971be 100644 +--- a/ld/Makefile.in ++++ b/ld/Makefile.in +@@ -562,7 +562,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) + # We put the scripts in the directory $(scriptdir)/ldscripts. + # We can't put the scripts in $(datadir) because the SEARCH_DIR + # directives need to be different for native and cross linkers. +-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir) + BASEDIR = $(srcdir)/.. + BFDDIR = $(BASEDIR)/bfd + INCDIR = $(BASEDIR)/include diff --git a/meta-openeuler/recipes-devtools/dnf/dnf_%.bbappend b/meta-openeuler/recipes-devtools/dnf/dnf_%.bbappend index 3b637e0c5276de50f43ffdf586d07d082fe6af13..ec1c1b4abc123422eec235973f47a8b67058b3f7 100644 --- a/meta-openeuler/recipes-devtools/dnf/dnf_%.bbappend +++ b/meta-openeuler/recipes-devtools/dnf/dnf_%.bbappend @@ -3,14 +3,14 @@ PV = "4.14.0" OPENEULER_BRANCH = "master" # find patches under openeuler at firse -FILESEXTRAPATHS_prepend := "${THISDIR}/files/:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files/:" # delete useless codes from poky -SRC_URI_remove = "git://github.com/rpm-software-management/dnf.git;branch=master;protocol=https \ +SRC_URI:remove = "git://github.com/rpm-software-management/dnf.git;branch=master;protocol=https \ " # apply patches from openeuler before poky -SRC_URI_prepend = " \ +SRC_URI:prepend = " \ https://github.com/rpm-software-management/dnf/archive/${PV}/${BPN}-${PV}.tar.gz \ file://unlock-pidfile-if-current-proccess-is-NOT-dnf.patch \ file://fix-pid-file-residue.patch \ @@ -29,11 +29,11 @@ S = "${WORKDIR}/${BP}" SRC_URI[sha256sum] = "7de4eb8e85c4d9a74db6f1f827d2dd3348e265631f8678a1dbf7e3346beaad53" -FILES_${PN} += " \ +FILES:${PN} += " \ /etc/yum.repos.d/openEuler.repo \ " -do_install_append() { +do_install:append() { mkdir -p ${D}/etc/yum.repos.d/ || echo "" local version_dir="openEuler-${DISTRO_VERSION}" sed -i "s/OPENEULER_VER/${version_dir}/g" ${WORKDIR}/openEuler.repo diff --git a/meta-openeuler/recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend b/meta-openeuler/recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend index f474cf95ee6603ac78134cff607155edc8a2d7e2..74bda0dfaf704887aeae8237583aed4817031ddd 100644 --- a/meta-openeuler/recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend +++ b/meta-openeuler/recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend @@ -2,9 +2,10 @@ PV = "1.46.5" S = "${WORKDIR}/${BPN}-${PV}" # delete package from poky -SRC_URI_remove += "git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git \ +SRC_URI:remove = "git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git \ git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git;branch=master \ file://0001-e2fsck-fix-last-mount-write-time-when-e2fsck-is-forc.patch \ + file://0010-libext2fs-add-sanity-check-to-extent-manipulation.patch \ " SRC_URI[sha256sum] = "b11042533c1b1dcf17512f0da48e05b0c573dada1dd8b762864d10f4dc399713" diff --git a/meta-openeuler/recipes-devtools/elfutils/elfutils_%.bbappend b/meta-openeuler/recipes-devtools/elfutils/elfutils_%.bbappend index 26fbf5bc00a11a405b836551b1c7ca6c5ec0e1e6..f6d6a2ad3dc11b5872f0b3088332414d41e365af 100644 --- a/meta-openeuler/recipes-devtools/elfutils/elfutils_%.bbappend +++ b/meta-openeuler/recipes-devtools/elfutils/elfutils_%.bbappend @@ -1,7 +1,16 @@ +# the main bb file: yocto-poky/meta/recipes-devtools/elfutils/elfutils_0.186.bb + PV = "0.187" +# the path removed in 0.187 +SRC_URI:remove = " \ + https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ + file://0001-debuginfod-fix-compilation-on-platforms-without-erro.patch \ + file://0001-debuginfod-debuginfod-client.c-use-long-for-cache-ti.patch \ +" + # add patches from openeuler -SRC_URI += " \ +SRC_URI:append = " \ file://elfutils-${PV}.tar.bz2 \ file://Fix-segfault-in-eu-ar-m.patch \ file://Fix-error-of-parsing-object-file-perms.patch \ @@ -14,9 +23,3 @@ SRC_URI[sha256sum] = "e70b0dfbe610f90c4d1fe0d71af142a4e25c3c4ef9ebab8d2d72b65159 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://debuginfod/debuginfod-client.c;endline=27;md5=7eb69ae4d5654e590c840538256a7bfe \ " - -# delete conflict patches from poky -SRC_URI_remove += " \ - file://0001-add-support-for-ipkg-to-debuginfod.cxx.patch \ - https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \ -" diff --git a/meta-openeuler/recipes-devtools/expect/expect_%.bbappend b/meta-openeuler/recipes-devtools/expect/expect_%.bbappend index b4a411e608213651ff5a11ad75dea5868e8e712d..f3c37726a9194e28fd07a5a0b5e9a91434173863 100644 --- a/meta-openeuler/recipes-devtools/expect/expect_%.bbappend +++ b/meta-openeuler/recipes-devtools/expect/expect_%.bbappend @@ -1,7 +1,7 @@ # source bb: meta/recipes-devtools/expect/expect_5.45.4.bb # expect-5.43.0-pkgpath.patch: build error, delete it from openeuler -SRC_URI_prepend = "file://expect-5.43.0-log_file.patch \ +SRC_URI:prepend = "file://expect-5.43.0-log_file.patch \ file://expect-5.45-man-page.patch \ file://expect-5.45-match-gt-numchars-segfault.patch \ file://expect-5.45-re-memleak.patch \ @@ -17,11 +17,11 @@ SRC_URI_prepend = "file://expect-5.43.0-log_file.patch \ # expect-5.45-format-security.patch and 0001-Resolve-string-formatting-issues.patch provide the same # 0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch conflict with expect-5.45-segfault-with-stubs.patch -SRC_URI_remove = "file://0001-Resolve-string-formatting-issues.patch \ +SRC_URI:remove = "file://0001-Resolve-string-formatting-issues.patch \ file://0001-expect-Fix-segfaults-if-Tcl-is-built-with-stubs-and-.patch \ " # we don't need .c file pack in rootfs -FILES_${PN}-dev_append += " \ +FILES:${PN}-dev:append = " \ ${libdir}/expect${PV}/*.c \ " diff --git a/meta-openeuler/recipes-devtools/flatbuffers/files/0001-flatbuffers_cross_build_fix.patch b/meta-openeuler/recipes-devtools/flatbuffers/files/0001-flatbuffers_cross_build_fix.patch index 48e2b17d93e5ccb9bb3bf44d5ad75c138e0801e8..d3b40f6ac07d4b0ac8862c96a2271721867707ac 100644 --- a/meta-openeuler/recipes-devtools/flatbuffers/files/0001-flatbuffers_cross_build_fix.patch +++ b/meta-openeuler/recipes-devtools/flatbuffers/files/0001-flatbuffers_cross_build_fix.patch @@ -16543,8 +16543,8 @@ diff -urN a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers. - memset(make_space(zero_pad_bytes), 0, zero_pad_bytes); - } - -- void pop(size_t bytes_to_remove) { cur_ += bytes_to_remove; } -- void scratch_pop(size_t bytes_to_remove) { scratch_ -= bytes_to_remove; } +- void pop(size_t bytes_to:remove) { cur_ += bytes_to:remove; } +- void scratch_pop(size_t bytes_to:remove) { scratch_ -= bytes_to:remove; } - - void swap(vector_downward &other) { - using std::swap; @@ -20465,7 +20465,7 @@ diff -urN a/include/flatbuffers/stl_emulation.h b/include/flatbuffers/stl_emulat + // TODO: upgrade to std::random_access_iterator_tag. + using iterator_category = std::forward_iterator_tag; + using difference_type = std::ptrdiff_t; -+ using value_type = typename std::remove_cv::type; ++ using value_type = typename std::remove:cv::type; + using reference = T&; + using pointer = T*; + @@ -21605,12 +21605,12 @@ diff -urN a/include/flatbuffers/vector_downward.h b/include/flatbuffers/vector_d + memset(make_space(zero_pad_bytes), 0, zero_pad_bytes); + } + -+ void pop(size_t bytes_to_remove) { -+ cur_ += bytes_to_remove; -+ size_ -= static_cast(bytes_to_remove); ++ void pop(size_t bytes_to:remove) { ++ cur_ += bytes_to:remove; ++ size_ -= static_cast(bytes_to:remove); + } + -+ void scratch_pop(size_t bytes_to_remove) { scratch_ -= bytes_to_remove; } ++ void scratch_pop(size_t bytes_to:remove) { scratch_ -= bytes_to:remove; } + + void swap(vector_downward &other) { + using std::swap; @@ -24924,8 +24924,8 @@ diff -urN a/samples/monster_generated.h b/samples/monster_generated.h -#ifndef FLATBUFFERS_CPP98_STL template void Set(T&& val) { -- using RT = typename std::remove_reference::type; -+ typedef typename std::remove_reference::type RT; +- using RT = typename std::remove:reference::type; ++ typedef typename std::remove:reference::type RT; Reset(); - type = EquipmentTraits::enum_value; + type = EquipmentUnionTraits::enum_value; @@ -29952,8 +29952,8 @@ diff -urN a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp - code_ += "#ifndef FLATBUFFERS_CPP98_STL"; code_ += " template "; code_ += " void Set(T&& val) {"; -- code_ += " using RT = typename std::remove_reference::type;"; -+ code_ += " typedef typename std::remove_reference::type RT;"; +- code_ += " using RT = typename std::remove:reference::type;"; ++ code_ += " typedef typename std::remove:reference::type RT;"; code_ += " Reset();"; - code_ += - " type = {{NAME}}Traits::enum_value;"; diff --git a/meta-openeuler/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bbappend b/meta-openeuler/recipes-devtools/flatbuffers/flatbuffers_%.bbappend similarity index 82% rename from meta-openeuler/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bbappend rename to meta-openeuler/recipes-devtools/flatbuffers/flatbuffers_%.bbappend index 7355cd610ca0d77b831acc3b022f861ebd3ce8e4..4d13eb279720a9900aef49e49b6a7f87a612ec6f 100644 --- a/meta-openeuler/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bbappend +++ b/meta-openeuler/recipes-devtools/flatbuffers/flatbuffers_%.bbappend @@ -3,7 +3,7 @@ PV = "2.0.0" OPENEULER_BRANCH = "master" # find patches under openeuler at firse -FILESEXTRAPATHS_prepend := "${THISDIR}/files/:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files/:" SRCREV = "3d79a88adb0eceb2ab5ff994c9b4c03b4b3c0daf" @@ -14,7 +14,7 @@ SRC_URI = " \ file://0001-flatbuffers_cross_build_fix.patch \ " -SRC_URI_remove_class-native = " \ +SRC_URI:remove:class-native = " \ file://0001-flatbuffers_cross_build_fix.patch \ " diff --git a/meta-openeuler/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb b/meta-openeuler/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb new file mode 100644 index 0000000000000000000000000000000000000000..9ccc9978c07e0b06f5c58501e37516008c9a2dca --- /dev/null +++ b/meta-openeuler/recipes-devtools/flatbuffers/flatbuffers_1.12.0.bb @@ -0,0 +1,45 @@ +SUMMARY = "Memory Efficient Serialization Library" +HOMEPAGE = "https://github.com/google/flatbuffers" +SECTION = "console/tools" +LICENSE = "Apache-2.0" + +inherit python3-dir + +PACKAGE_BEFORE_PN = "${PN}-compiler ${PN}-${PYTHON_PN}" + +RDEPENDS:${PN}-compiler = "${PN}" +RDEPENDS:${PN}-${PYTHON_PN} = "${PN}" +RDEPENDS:${PN}-dev += "${PN}-compiler" + +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRCREV = "6df40a2471737b27271bdd9b900ab5f3aec746c7" + +SRC_URI = "git://github.com/google/flatbuffers.git;branch=master;protocol=https" + +CVE_CHECK_IGNORE += "CVE-2020-35864" + +CXXFLAGS += "-fPIC" +BUILD_CXXFLAGS += "-fPIC" + +# BUILD_TYPE=Release is required, otherwise flatc is not installed +EXTRA_OECMAKE += "\ + -DCMAKE_BUILD_TYPE=Release \ + -DFLATBUFFERS_BUILD_TESTS=OFF \ + -DFLATBUFFERS_BUILD_SHAREDLIB=ON \ +" + +inherit cmake + +S = "${WORKDIR}/git" + +do_install:append() { + install -d ${D}${PYTHON_SITEPACKAGES_DIR} + cp -rf ${S}/python/flatbuffers ${D}${PYTHON_SITEPACKAGES_DIR} +} + +FILES:${PN}-compiler = "${bindir}" + +FILES:${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openeuler/recipes-devtools/flex/flex_%.bbappend b/meta-openeuler/recipes-devtools/flex/flex_%.bbappend index 4e4a6b9a10cce1e8b3f71134b56ffcc5828b0b96..6f27775b870c84fd008d11e30339dee02879b906 100644 --- a/meta-openeuler/recipes-devtools/flex/flex_%.bbappend +++ b/meta-openeuler/recipes-devtools/flex/flex_%.bbappend @@ -1,16 +1,17 @@ # main bb file: yocto-poky/meta/recipes-devtools/flex/flex_2.6.4.bb # apply patches in openEuler -SRC_URI_prepend = "file://build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch \ - file://filter-memory-leak-free-scanner-postprocessing.patch \ +# 0001-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch exists in poky +# +# m4:stdin:2816: ERROR: end of file in string +# mkskel.sh-fix-EOL-issue-for-CRLF-systems.patch +# 0001-scanner-fix-default-of-yy_top_state.patch +# 0002-scanner-fix-default-of-yy_top_state.patch +SRC_URI:prepend = "file://filter-memory-leak-free-scanner-postprocessing.patch \ file://scanner-c-i-j-should-preserve-case.patch \ file://filter-Output-correct-line-value-for-current-file.patch \ file://scanner-memory-leak-free-scanner-generator.patch \ file://scanner-Ignore-comment-lines-in-skeleton-files.patch \ file://scanner-temporarily-protect-against-ccl-overflow-ove.patch \ file://scanner-prevent-overflow-in-add_action.patch \ -" - -# remove this patch as it already exists in openEuler -SRC_URI_remove = "file://0001-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch \ -" + " diff --git a/meta-openeuler/recipes-devtools/gdb/gdb_%.bbappend b/meta-openeuler/recipes-devtools/gdb/gdb_%.bbappend index 855e27bbba4635a0a1164e07d61d63dec80fc63c..b02368f49686831d36fe98f1a7878f24f0132c96 100644 --- a/meta-openeuler/recipes-devtools/gdb/gdb_%.bbappend +++ b/meta-openeuler/recipes-devtools/gdb/gdb_%.bbappend @@ -7,7 +7,7 @@ OPENEULER_SRC_URI_REMOVE = "https git http" PV = "12.1" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = " \ +SRC_URI:remove = " \ ${GNU_MIRROR}/gdb/gdb-${PV}.tar.xz \ " @@ -93,4 +93,4 @@ SRC_URI += " \ #gdb-6.6-buildid-locate-rpm-librpm-workaround.patch #gdb-6.6-buildid-locate-rpm-scl.patch -FILES_${PN}-dev_riscv64 += "/usr/lib64" +FILES:${PN}-dev_riscv64 += "/usr/lib64" diff --git a/meta-openeuler/recipes-devtools/intltool/intltool_%.bbappend b/meta-openeuler/recipes-devtools/intltool/intltool_%.bbappend index 83892d8ba40b4861472573df91ef93e3ec0d5dc5..9442dc05e574f3176479ea9f2f19b5fdf216e4b2 100644 --- a/meta-openeuler/recipes-devtools/intltool/intltool_%.bbappend +++ b/meta-openeuler/recipes-devtools/intltool/intltool_%.bbappend @@ -3,11 +3,11 @@ PV = "0.51.0" # conflict with intltool-perl5.26-regex-fixes.patch -SRC_URI_remove = "file://perl-522-deprecations.patch \ +SRC_URI:remove = "file://perl-522-deprecations.patch \ " # apply openeuler patches -SRC_URI_prepend = "file://intltool-perl5.26-regex-fixes.patch \ +SRC_URI:prepend = "file://intltool-perl5.26-regex-fixes.patch \ file://intltool-merge-Create-cache-file-atomically.patch \ file://intltool_distcheck-fix.patch \ " diff --git a/meta-openeuler/recipes-devtools/json-c/json-c_%.bbappend b/meta-openeuler/recipes-devtools/json-c/json-c_%.bbappend index 67a2aa99a0624ca323445dd8aab5c1ff62cf965d..07d7af8aa6abaa795f1df974ed1e64ac2bb378cd 100644 --- a/meta-openeuler/recipes-devtools/json-c/json-c_%.bbappend +++ b/meta-openeuler/recipes-devtools/json-c/json-c_%.bbappend @@ -1,12 +1,10 @@ # main bbfile: yocto-poky/meta/recipes-devtools/json-c/json-c_0.15.bb -OPENEULER_SRC_URI_REMOVE = "https git http" - # json-c version in openEuler PV = "0.16-20220414" # apply patch -SRC_URI += " \ +SRC_URI = " \ file://json-c-${PV}.tar.gz \ file://backport-Add-test-to-check-for-the-memory-leak-mentioned-in-issue-781.patch \ file://backport-Fix-memory-leak-with-emtpy-strings-in-json_object_set_string.patch \ diff --git a/meta-openeuler/recipes-devtools/libcomps/libcomps_%.bbappend b/meta-openeuler/recipes-devtools/libcomps/libcomps_%.bbappend index 8a9ee4f46651956a8dccd67f9df7b7fb6038281c..3a8e1e6863ea88af02f79e6cbbd004510baa7bd3 100644 --- a/meta-openeuler/recipes-devtools/libcomps/libcomps_%.bbappend +++ b/meta-openeuler/recipes-devtools/libcomps/libcomps_%.bbappend @@ -7,7 +7,7 @@ SRC_URI = " \ " # patches from poky -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += " \ file://0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ " diff --git a/meta-openeuler/recipes-devtools/libdnf/libdnf_%.bbappend b/meta-openeuler/recipes-devtools/libdnf/libdnf_%.bbappend index 9d1397274959dbdc4470188a3644b8a045548f94..8d7025697a2b7e10257b69fa57a2e017a739fd4c 100644 --- a/meta-openeuler/recipes-devtools/libdnf/libdnf_%.bbappend +++ b/meta-openeuler/recipes-devtools/libdnf/libdnf_%.bbappend @@ -2,7 +2,7 @@ PV = "0.69.0" #export CONFIG_SHELL="/bin/bash" # fix rpm install error, depends to /bin/bash -RDEPENDS_${PN} += "busybox" +RDEPENDS:${PN} += "busybox" # add new patches from openeuler SRC_URI = " \ @@ -11,7 +11,7 @@ SRC_URI = " \ file://0001-libdnf-0.65.0-add-loongarch-support.patch \ " -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += " \ file://0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch \ file://0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch \ @@ -28,4 +28,4 @@ SRC_URI[sha256sum] = "b615a6f7e1d1d82c928d2c79b36242a29d04cd28e267a5e8a6996435d9 S = "${WORKDIR}/${BP}" # delete depends to prelink from gobject-introspection.bbclass -DEPENDS_remove_class-target = " prelink-native" +DEPENDS:remove:class-target = " prelink-native" diff --git a/meta-openeuler/recipes-devtools/libmodulemd/libmodulemd_%.bbappend b/meta-openeuler/recipes-devtools/libmodulemd/libmodulemd_%.bbappend index 636cccd740a80d53ca1fc03284e4994f0a67e94e..9d13dbbf602e6a079536bdf80e6d65c9dc66df02 100644 --- a/meta-openeuler/recipes-devtools/libmodulemd/libmodulemd_%.bbappend +++ b/meta-openeuler/recipes-devtools/libmodulemd/libmodulemd_%.bbappend @@ -9,4 +9,4 @@ S = "${WORKDIR}/modulemd-${PV}" SRC_URI[sha256sum] = "8087942cc290c0df486931233446fb4bce786cd9ff92eb72384731cd4d36f6ef" # delete depends to prelink from gobject-introspection.bbclass -DEPENDS_remove_class-target = " prelink-native" +DEPENDS:remove:class-target = " prelink-native" diff --git a/meta-openeuler/recipes-devtools/librepo/librepo_%.bbappend b/meta-openeuler/recipes-devtools/librepo/librepo_%.bbappend index 0e16d3fe9d036b31125a8f875acfe8e0f7d5de55..e9eaac088ae5425c085e84bd642bbe75d0ac8f9c 100644 --- a/meta-openeuler/recipes-devtools/librepo/librepo_%.bbappend +++ b/meta-openeuler/recipes-devtools/librepo/librepo_%.bbappend @@ -7,7 +7,7 @@ SRC_URI = " \ " # from poky -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += " \ file://0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch \ file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \ diff --git a/meta-openeuler/recipes-devtools/libtool/libtool-cross_%.bbappend b/meta-openeuler/recipes-devtools/libtool/libtool-cross_%.bbappend index be96ca34be93e272a2918ea31560d1f6d12eb527..314f1e6d4508e912ca7e260659ca278311530d54 100644 --- a/meta-openeuler/recipes-devtools/libtool/libtool-cross_%.bbappend +++ b/meta-openeuler/recipes-devtools/libtool/libtool-cross_%.bbappend @@ -2,16 +2,16 @@ OPENEULER_BRANCH = "master" -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" PV = "2.4.7" -SRC_URI_remove = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ +SRC_URI:remove = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ file://unwind-opt-parsing.patch \ " # apply openeuler source package and patches -SRC_URI_prepend = " \ +SRC_URI:prepend = " \ file://libtool-${PV}.tar.xz \ file://libtool-2.4.5-rpath.patch \ " diff --git a/meta-openeuler/recipes-devtools/libtool/libtool_%.bbappend b/meta-openeuler/recipes-devtools/libtool/libtool_%.bbappend index be96ca34be93e272a2918ea31560d1f6d12eb527..2d3f38091f13d5bc40def6fb0706a053e586d6e0 100644 --- a/meta-openeuler/recipes-devtools/libtool/libtool_%.bbappend +++ b/meta-openeuler/recipes-devtools/libtool/libtool_%.bbappend @@ -1,17 +1,13 @@ -# main bbfile: yocto-poky/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb +# main bbfile: yocto-poky/meta/recipes-devtools/libtool/libtool-cross_2.4.7.bb OPENEULER_BRANCH = "master" -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -PV = "2.4.7" - -SRC_URI_remove = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ - file://unwind-opt-parsing.patch \ +SRC_URI:remove = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ " # apply openeuler source package and patches -SRC_URI_prepend = " \ - file://libtool-${PV}.tar.xz \ - file://libtool-2.4.5-rpath.patch \ +SRC_URI:prepend = " \ + file://libtool-${PV}.tar.xz \ + file://libtool-2.4.5-rpath.patch \ + file://backport-tests-link-order.at-avoid-warning-and-test-failure.patch \ " diff --git a/meta-openeuler/recipes-devtools/m4/m4_%.bbappend b/meta-openeuler/recipes-devtools/m4/m4_%.bbappend index ece9546c5076c4395de729ad9636099b5d8dfae2..5c26cceed560e90a239051ca56f5109bcba467a5 100644 --- a/meta-openeuler/recipes-devtools/m4/m4_%.bbappend +++ b/meta-openeuler/recipes-devtools/m4/m4_%.bbappend @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464\ # remove tar.gz files and code patches from poky -SRC_URI_remove = " \ +SRC_URI:remove = " \ ${GNU_MIRROR}/m4/m4-${PV}.tar.gz \ file://ac_config_links.patch \ file://m4-1.4.18-glibc-change-work-around.patch \ @@ -22,7 +22,7 @@ SRC_URI_remove = " \ " # append files and patches from openeuler -SRC_URI_append = " \ - file://m4/m4-${PV}.tar.xz \ +SRC_URI:append = " \ + file://m4-${PV}.tar.xz \ file://0001-Delete-test-execute_sh.patch \ " diff --git a/meta-openeuler/recipes-devtools/makedevs/makedevs_%.bbappend b/meta-openeuler/recipes-devtools/makedevs/makedevs_%.bbappend index 782c476176a84ad5f6a663850f014eb5d4c86813..d9b826844300e067e9c1561ca3b787c07fe1632c 100644 --- a/meta-openeuler/recipes-devtools/makedevs/makedevs_%.bbappend +++ b/meta-openeuler/recipes-devtools/makedevs/makedevs_%.bbappend @@ -1,5 +1,5 @@ # COPYING.patch will create LICENSE file, but if WORKDIR dir is not a clean # dir, i.e., COPYING file is already there because of last build, # do patch may fail. -SRC_URI_remove = "file://COPYING.patch" +SRC_URI:remove = "file://COPYING.patch" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" diff --git a/meta-openeuler/recipes-devtools/meson/files/disable-rpath-handling.patch b/meta-openeuler/recipes-devtools/meson/files/disable-rpath-handling.patch index 7aaed8b4a3865aac75ab9fbfacf69e9ebba50e60..42ea8ae3b8ee56823492524944a68fbe4d509500 100644 --- a/meta-openeuler/recipes-devtools/meson/files/disable-rpath-handling.patch +++ b/meta-openeuler/recipes-devtools/meson/files/disable-rpath-handling.patch @@ -22,10 +22,10 @@ index 7d0da13..17d50db 100644 if file_copied: self.did_install_something = True try: -- self.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, +- self.fix_rpath(outname, t.rpath_dirs_to:remove, install_rpath, final_path, - install_name_mappings, verbose=False) + if install_rpath: -+ self.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path, ++ self.fix_rpath(outname, t.rpath_dirs_to:remove, install_rpath, final_path, + install_name_mappings, verbose=False) + else: + print("RPATH changes at install time disabled") diff --git a/meta-openeuler/recipes-devtools/meson/meson_%.bbappend b/meta-openeuler/recipes-devtools/meson/meson_%.bbappend index cf1de12610b9c10b53b2d80d5d879bb2e419c1d6..8f5f15e60666166d96b989b171ee59e8376dde86 100644 --- a/meta-openeuler/recipes-devtools/meson/meson_%.bbappend +++ b/meta-openeuler/recipes-devtools/meson/meson_%.bbappend @@ -3,6 +3,6 @@ PV = "0.63.2" SRC_URI[sha256sum] = "16222f17ef76be0542c91c07994f9676ae879f46fc21c0c786a21ef2cb518bbf" # add patches from new poky under meta-openeluer -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${PV}.tar.gz \ " diff --git a/meta-openeuler/recipes-devtools/mtd/mtd-utils_%.bbappend b/meta-openeuler/recipes-devtools/mtd/mtd-utils_%.bbappend index 3d30b6d1b334a78427e707b2eb32c37130737dfd..2d5853cf58e1e47bf24ba92cc1e32fd1ef1581fb 100644 --- a/meta-openeuler/recipes-devtools/mtd/mtd-utils_%.bbappend +++ b/meta-openeuler/recipes-devtools/mtd/mtd-utils_%.bbappend @@ -2,12 +2,12 @@ PV = "2.1.4" -SRC_URI_remove = "git://git.infradead.org/mtd-utils.git;branch=master" +SRC_URI:remove = "git://git.infradead.org/mtd-utils.git;branch=master" -SRC_URI_prepend = "file://${BP}.tar.bz2 \ +SRC_URI:prepend = "file://${BP}.tar.bz2 \ " OPENEULER_BRANCH = "openEuler-22.03-LTS" S = "${WORKDIR}/${BP}" -EXTRA_OECONF_remove = "--enable-install-tests" +EXTRA_OECONF:remove = "--enable-install-tests" diff --git a/meta-openeuler/recipes-devtools/nasm/nasm_%.bbappend b/meta-openeuler/recipes-devtools/nasm/nasm_%.bbappend index b23a044b9a4d105f65ac75e1c470565b494bb00a..ac5970ac87cefae80791a647f76ca82d0b702bd0 100644 --- a/meta-openeuler/recipes-devtools/nasm/nasm_%.bbappend +++ b/meta-openeuler/recipes-devtools/nasm/nasm_%.bbappend @@ -1,7 +1,7 @@ # main bbfile: yocto-poky/meta/recipes-devtools/nasm/nasm_2.15.05.bb # files, patches that come from openeuler -SRC_URI_prepend = " \ +SRC_URI:prepend = " \ file://enable-make-check.patch \ file://fix-help-info-error.patch \ " diff --git a/meta-openeuler/recipes-devtools/orc/orc_%.bbappend b/meta-openeuler/recipes-devtools/orc/orc_%.bbappend index a720f92030610262daf43b6b963635512909d40f..c6c9ad97dfea9655b2c020277fac0f1f48d36abd 100644 --- a/meta-openeuler/recipes-devtools/orc/orc_%.bbappend +++ b/meta-openeuler/recipes-devtools/orc/orc_%.bbappend @@ -1,3 +1,8 @@ +# the main bb file: yocto-poky/meta/recipes-devtools/orc/orc_0.4.32.bb + PV = "0.4.33" +SRC_URI = "file://orc-0.4.33.tar.xz \ +" + SRC_URI[sha256sum] = "844e6d7db8086f793f57618d3d4b68d29d99b16034e71430df3c21cfd3c3542a" diff --git a/meta-openeuler/recipes-devtools/perl-cross/files/0001-Makefile-check-the-file-if-patched-or-not.patch b/meta-openeuler/recipes-devtools/perl-cross/files/0001-Makefile-check-the-file-if-patched-or-not.patch deleted file mode 100644 index 8c8f3b717c87add9acc01bbbdc83847721a56a24..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-devtools/perl-cross/files/0001-Makefile-check-the-file-if-patched-or-not.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 24a3e0c48f9ebe473b5f1078663e275c27d0537f Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Fri, 2 Jul 2021 09:08:21 +0000 -Subject: [PATCH] Makefile: check the file if patched or not - -Check the file if patched or not to avoid patched more than -one time. - -Upstream-Status: Inappropriate (OE-specific) - -Signed-off-by: Mingli Yu ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index f4a26f5..7bc748e 100644 ---- a/Makefile -+++ b/Makefile -@@ -61,7 +61,7 @@ miniperlmain$O: $(CROSSPATCHED) - # Original versions are not saved anymore; patch generally takes care of this, - # and if that fails, reaching for the source tarball is the safest option. - $(CROSSPATCHED): %.applied: %.patch -- patch -p1 -i $< && touch $@ -+ test ! -f $@ && (patch -p1 -i $< && touch $@) || echo "$@ exist" - - # ---[ common ]----------------------------------------------------------------- - --- -2.29.2 - diff --git a/meta-openeuler/recipes-devtools/perl-cross/files/0001-Makefile-correctly-list-modules-when-cleaning-them.patch b/meta-openeuler/recipes-devtools/perl-cross/files/0001-Makefile-correctly-list-modules-when-cleaning-them.patch deleted file mode 100644 index 80388fa9b0f4dd7a585a9b23cdbe8655e9fc81ff..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-devtools/perl-cross/files/0001-Makefile-correctly-list-modules-when-cleaning-them.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 7b8d819e012c24df228a313beb86e1942611c904 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Sat, 4 Jun 2022 13:00:12 +0200 -Subject: [PATCH] Makefile: correctly list modules when cleaning them - -Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/133] -Signed-off-by: Alexander Kanavin ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 6b35fb0..9ef9324 100644 ---- a/Makefile -+++ b/Makefile -@@ -462,7 +462,7 @@ clean-subdirs: - - # assuming modules w/o Makefiles were never built and need no cleaning - clean-modules: config.h -- @for i in $(modules disabled); do \ -+ @for i in $(modules) $(disabled); do \ - test -f $$i/Makefile && \ - touch $$i/Makefile && \ - $(MAKE) -C $$i clean \ diff --git a/meta-openeuler/recipes-devtools/perl-cross/files/0001-Makefile-do-not-clean-config.h-xconfig.h.patch b/meta-openeuler/recipes-devtools/perl-cross/files/0001-Makefile-do-not-clean-config.h-xconfig.h.patch deleted file mode 100644 index cbb935c71b786ef4567af5ecf4c2fe74e433e39f..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-devtools/perl-cross/files/0001-Makefile-do-not-clean-config.h-xconfig.h.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ade4a70308d3b9d79cc3db841c0f60385780fe1a Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Sat, 4 Jun 2022 13:45:20 +0200 -Subject: [PATCH] Makefile: do not clean config.h/xconfig.h - -These are generated by ./configure and not by make. - -Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/134] -Signed-off-by: Alexander Kanavin ---- - Makefile | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 9ef9324..3de2c2e 100644 ---- a/Makefile -+++ b/Makefile -@@ -473,7 +473,6 @@ clean-generated-files: - -rm -f uudmap.h opmini.c generate_uudmap$X bitcount.h $(CONFIGPM) - -rm -f git_version.h lib/re.pm lib/Config_git.pl - -rm -f perlmini.c perlmain.c -- -rm -f config.h xconfig.h - -rm -f pod/perlmodlib.pod - -rm -f ext.libs static.list - -rm -f $(patsubst %,%/ppport.h,$(mkppport_lst)) --- -2.30.2 - diff --git a/meta-openeuler/recipes-devtools/perl-cross/files/0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch b/meta-openeuler/recipes-devtools/perl-cross/files/0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch deleted file mode 100644 index 6c3f08c4324ab6accb98ed14336727b5d8fa07f6..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-devtools/perl-cross/files/0001-perl-cross-add-LDFLAGS-when-linking-libperl.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f824cbec9ac8f113a4ae35d57bd18625d415a71b Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Tue, 27 Nov 2018 15:37:40 +0100 -Subject: [PATCH] perl-cross: add LDFLAGS when linking libperl - -Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/122] -Signed-off-by: Alexander Kanavin ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 01644cd..be811a7 100644 ---- a/Makefile -+++ b/Makefile -@@ -180,7 +180,7 @@ endif - - ifeq ($(useshrplib),true) - $(LIBPERL): -- $(CC) $(LDDLFLAGS) -o $@ $(filter %$o,$^) $(LIBS) -+ $(CC) $(LDFLAGS) $(LDDLFLAGS) -o $@ $(filter %$o,$^) $(LIBS) - else - $(LIBPERL): - $(AR) cru $@ $(filter %$o,$^) --- -2.17.1 - diff --git a/meta-openeuler/recipes-devtools/perl-cross/files/README.md b/meta-openeuler/recipes-devtools/perl-cross/files/README.md deleted file mode 100644 index 93217245c88ae9e8c027c2b0f1a3b54ddc139e0f..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-devtools/perl-cross/files/README.md +++ /dev/null @@ -1,29 +0,0 @@ -**perl-cross** provides configure script, top-level Makefile -and some auxiliary files for [perl](http://www.perl.org), -with the primary emphasis on cross-compiling the source. - - # Get perl and perl-cross sources - curl -L -O http://www.cpan.org/src/5.0/perl-5.24.1.tar.gz - curl -L -O https://github.com/arsv/perl-cross/releases/download/1.1.3/perl-cross-1.1.3.tar.gz - - # Unpack perl-cross over perl, overwriting Makefile - tar -zxf perl-5.24.1.tar.gz - cd perl-5.24.1 - tar --strip-components=1 -zxf ../perl-cross-1.1.3.tar.gz - - # Proceed as usual with most autoconfed packages - ./configure --target=arm-linux-gnueabi --prefix=/usr -Duseshrplib - make -j4 - make DESTDIR=/path/to/staging/dir install - -Unlike mainline Perl, this configure never runs any target executables, -relying solely on compile/link tests and pre-defined hints. -On the flip side, it is only meant to run on resonably sane modern unix systems. - -Check [project pages](http://arsv.github.io/perl-cross/) for more info. -In particular, [configure usage](http://arsv.github.io/perl-cross/usage.html) -lists available configure options. - -Perl-cross is a free software licensed under the same terms -as the original perl source. -See LICENSE, Copying and Artistic files. diff --git a/meta-openeuler/recipes-devtools/perl-cross/files/determinism.patch b/meta-openeuler/recipes-devtools/perl-cross/files/determinism.patch deleted file mode 100644 index e9bf752bcb64477c9efe9b8e7074569138940893..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-devtools/perl-cross/files/determinism.patch +++ /dev/null @@ -1,46 +0,0 @@ -Fixes to make the perl build reproducible: - -a) Remove the \n from configure_attr.sh since it gets quoted differently depending on - whether the shell is bash or dash which can cause the test result to be incorrect. - Reported upstream: https://github.com/arsv/perl-cross/issues/87 - -b) Sort the order of the module lists from configure_mods.sh since otherwise - the result isn't the same leading to makefile differences. - Reported upstream: https://github.com/arsv/perl-cross/issues/88 - -c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst - there for good measure) - This needs to go to upstream perl (not done) - -d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with bash - and "" with dash - Reported upstream: https://github.com/arsv/perl-cross/issues/87 - -RP 2020/2/7 - -Upstream-Status: Pending [75% submitted] -Signed-off-by: Richard Purdie +Date: Tue, 14 Jan 2020 01:37:22 -0800 +Subject: [PATCH] Add MIPS gnu hash support + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/arch-mips.c | 1 + + src/prelink.c | 1 + + src/prelink.h | 5 +++++ + 3 files changed, 7 insertions(+) + +--- a/src/arch-mips.c ++++ b/src/arch-mips.c +@@ -324,6 +324,7 @@ mips_adjust_dyn (DSO *dso, int n, GElf_D + case DT_MIPS_BASE_ADDRESS: + case DT_MIPS_RLD_MAP: + case DT_MIPS_OPTIONS: ++ case DT_MIPS_XHASH: + if (dyn->d_un.d_ptr >= start) + dyn->d_un.d_ptr += adjust; + return 1; +--- a/src/prelink.c ++++ b/src/prelink.c +@@ -425,6 +425,7 @@ prelink_prepare (DSO *dso) + { + case SHT_HASH: + case SHT_GNU_HASH: ++ case SHT_MIPS_XHASH: + case SHT_DYNSYM: + case SHT_REL: + case SHT_RELA: +--- a/src/prelink.h ++++ b/src/prelink.h +@@ -114,6 +114,11 @@ typedef uint8_t Elf64_Byte; + #define SHT_MIPS_ABIFLAGS 0x7000002a + #endif + ++#ifndef SHT_MIPS_XHASH ++#define DT_MIPS_XHASH 0x70000036 ++#define SHT_MIPS_XHASH 0x7000002b ++#endif ++ + #ifndef RSS_UNDEF + #define RSS_UNDEF 0 + #endif +--- a/src/dso.c ++++ b/src/dso.c +@@ -109,6 +109,11 @@ read_dynamic (DSO *dso) + dso->info_DT_GNU_HASH = dyn.d_un.d_val; + dso->info_set_mask |= (1ULL << DT_GNU_HASH_BIT); + } ++ else if (dyn.d_tag == DT_MIPS_XHASH) ++ { ++ dso->info_DT_GNU_HASH = dyn.d_un.d_val; ++ dso->info_set_mask |= (1ULL << DT_GNU_HASH_BIT); ++ } + else if (dyn.d_tag == DT_TLSDESC_PLT) + { + dso->info_DT_TLSDESC_PLT = dyn.d_un.d_val; +@@ -1463,6 +1468,7 @@ adjust_dso (DSO *dso, GElf_Addr start, G + break; + case SHT_HASH: + case SHT_GNU_HASH: ++ case SHT_MIPS_XHASH: + case SHT_NOBITS: + case SHT_STRTAB: + break; +--- a/src/space.c ++++ b/src/space.c +@@ -61,6 +61,7 @@ print_sections (DSO *dso, GElf_Ehdr *ehd + { SHT_GNU_versym, "VERSYM" }, + { SHT_GNU_LIBLIST, "LIBLIST" }, + { SHT_GNU_HASH, "GNU_HASH" }, ++ { SHT_MIPS_XHASH, "MIPS_XHASH" }, + { 0, NULL } + }; + +@@ -183,6 +184,7 @@ readonly_is_movable (DSO *dso, GElf_Ehdr + { + case SHT_HASH: + case SHT_GNU_HASH: ++ case SHT_MIPS_XHASH: + case SHT_DYNSYM: + case SHT_REL: + case SHT_RELA: +@@ -558,6 +560,7 @@ find_readonly_space (DSO *dso, GElf_Shdr + { + case SHT_HASH: + case SHT_GNU_HASH: ++ case SHT_MIPS_XHASH: + case SHT_DYNSYM: + case SHT_STRTAB: + case SHT_GNU_verdef: +--- a/src/exec.c ++++ b/src/exec.c +@@ -65,7 +65,11 @@ update_dynamic_tags (DSO *dso, GElf_Shdr + || (dynamic_info_is_set (dso, DT_GNU_HASH_BIT) + && dso->info_DT_GNU_HASH == old_shdr[j].sh_addr + && old_shdr[j].sh_type == SHT_GNU_HASH +- && set_dynamic (dso, DT_GNU_HASH, shdr[i].sh_addr, 1))) ++ && set_dynamic (dso, DT_GNU_HASH, shdr[i].sh_addr, 1)) ++ || (dynamic_info_is_set (dso, DT_GNU_HASH_BIT) ++ && dso->info_DT_GNU_HASH == old_shdr[j].sh_addr ++ && old_shdr[j].sh_type == SHT_MIPS_XHASH ++ && set_dynamic (dso, DT_MIPS_XHASH, shdr[i].sh_addr, 1))) + return 1; + } + diff --git a/meta-openeuler/recipes-devtools/prelink/prelink/macros.prelink b/meta-openeuler/recipes-devtools/prelink/prelink/macros.prelink new file mode 100644 index 0000000000000000000000000000000000000000..cb166958850d102023ce05e215ea210b0e946e12 --- /dev/null +++ b/meta-openeuler/recipes-devtools/prelink/prelink/macros.prelink @@ -0,0 +1,5 @@ +# rpm-4.1 verifies prelinked libraries using a prelink undo helper. +# Note: The 2nd token is used as argv[0] and "library" is a +# placeholder that will be deleted and replaced with the appropriate +# library file path. +%__prelink_undo_cmd /usr/sbin/prelink prelink -y library diff --git a/meta-openeuler/recipes-devtools/prelink/prelink/prelink.conf b/meta-openeuler/recipes-devtools/prelink/prelink/prelink.conf new file mode 100644 index 0000000000000000000000000000000000000000..562f23c59d21872a2339ec92ed00dda49317c213 --- /dev/null +++ b/meta-openeuler/recipes-devtools/prelink/prelink/prelink.conf @@ -0,0 +1,18 @@ +# This config file contains a list of directories both with binaries +# and libraries prelink should consider by default. +# If a directory name is prefixed with `-l ', the directory hierarchy +# will be walked as long as filesystem boundaries are not crossed. +# If a directory name is prefixed with `-h ', symbolic links in a +# directory hierarchy are followed. +-l /usr/local/sbin +-l /sbin +-l /usr/sbin +-l /usr/local/bin +-l /bin +-l /usr/bin +-l /usr/X11R6/bin +-l /usr/games +-l /usr/local/lib{,32,64,x32} +-l /lib{,32,64,x32} +-l /usr/lib{,32,64,x32} +-l /usr/X11R6/lib{,32,64,x32} diff --git a/meta-openeuler/recipes-devtools/prelink/prelink/prelink.cron.daily b/meta-openeuler/recipes-devtools/prelink/prelink/prelink.cron.daily new file mode 100644 index 0000000000000000000000000000000000000000..0b3c07322c79669dc31e37f5ceca7bde75c93eca --- /dev/null +++ b/meta-openeuler/recipes-devtools/prelink/prelink/prelink.cron.daily @@ -0,0 +1,40 @@ +#!/bin/sh + +. /etc/default/prelink + +renice +19 -p $$ >/dev/null 2>&1 + +if [ "$PRELINKING" != yes ]; then + if [ -f /etc/prelink.cache ]; then + echo /usr/sbin/prelink -uav > /var/log/prelink.log + /usr/sbin/prelink -uav >> /var/log/prelink.log 2>&1 + rm -f /etc/prelink.cache + # Restart init if needed + [ -n "$(find `ldd /sbin/init | awk '{ print $3 }'` /sbin/init -ctime -1 2>/dev/null )" ] && /sbin/telinit u + fi + exit 0 +fi + +if [ ! -f /etc/prelink.cache -o -f /var/lib/misc/prelink.force ] \ + || grep -q '^prelink-ELF0.[0-2]' /etc/prelink.cache; then + # If cache does not exist or is from older prelink versions or + # if we were asked to explicitely, force full prelinking + rm -f /etc/prelink.cache /var/lib/misc/prelink.force + PRELINK_OPTS="$PRELINK_OPTS -f" + date > /var/lib/misc/prelink.full +elif [ -n "$PRELINK_FULL_TIME_INTERVAL" \ + -a "`find /var/lib/misc/prelink.full -mtime -${PRELINK_FULL_TIME_INTERVAL} 2>/dev/null`" \ + = /var/lib/misc/prelink.full ]; then + # If prelink without -q has been run in the last + # PRELINK_FULL_TIME_INTERVAL days, just use quick mode + PRELINK_OPTS="$PRELINK_OPTS -q" +else + date > /var/lib/misc/prelink.full +fi + +echo /usr/sbin/prelink -av $PRELINK_OPTS > /var/log/prelink.log +/usr/sbin/prelink -av $PRELINK_OPTS >> /var/log/prelink.log 2>&1 +# Restart init if needed +[ -n "$(find `ldd /sbin/init | awk '{ print $3 }'` /sbin/init -ctime -1 2>/dev/null )" ] && /sbin/telinit u + +exit 0 diff --git a/meta-openeuler/recipes-devtools/prelink/prelink/prelink.default b/meta-openeuler/recipes-devtools/prelink/prelink/prelink.default new file mode 100644 index 0000000000000000000000000000000000000000..d8802f820ae0de5c01de356678637632b01b48de --- /dev/null +++ b/meta-openeuler/recipes-devtools/prelink/prelink/prelink.default @@ -0,0 +1,22 @@ +# Set this to no to disable prelinking altogether +# or to yes to enable it. +# (if you change this from yes to no prelink -ua +# will be run next night to undo prelinking) +PRELINKING=yes + +# Options to pass to prelink +# -m Try to conserve virtual memory by allowing overlapping +# assigned virtual memory slots for libraries which +# never appear together in one binary +# -R Randomize virtual memory slot assignments for libraries. +# This makes it slightly harder for various buffer overflow +# attacks, since library addresses will be different on each +# host using -R. +PRELINK_OPTS=-mR + +# How often should full prelink be run (in days) +# Normally, prelink will be run in quick mode, every +# $PRELINK_FULL_TIME_INTERVAL days it will be run +# in normal mode. Comment this line out if prelink +# should be run in normal mode always. +PRELINK_FULL_TIME_INTERVAL=14 diff --git a/meta-openeuler/recipes-devtools/prelink/prelink_%.bbappend b/meta-openeuler/recipes-devtools/prelink/prelink_%.bbappend index 15320715f921934aa8e80834e649e8ce1621d3c3..996851088c1a70ff52dfe90ac202e38adcf56844 100644 --- a/meta-openeuler/recipes-devtools/prelink/prelink_%.bbappend +++ b/meta-openeuler/recipes-devtools/prelink/prelink_%.bbappend @@ -1,12 +1,12 @@ # avoid download online -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" PV = "1.0" -SRC_URI_remove = "git://git.yoctoproject.org/prelink-cross.git;branch=cross_prelink_staging \ +SRC_URI:remove = "git://git.yoctoproject.org/prelink-cross.git;branch=cross_prelink_staging \ " -SRC_URI_prepend = "file://${BPN}-cross-${PV}.tar.gz \ +SRC_URI:prepend = "file://${BPN}-cross-${PV}.tar.gz \ " S = "${WORKDIR}/${BPN}-cross-${PV}" diff --git a/meta-openeuler/recipes-devtools/prelink/prelink_git.bb b/meta-openeuler/recipes-devtools/prelink/prelink_git.bb new file mode 100644 index 0000000000000000000000000000000000000000..8e614313ea3a9cd1eeedd1361159a0194fcc24cf --- /dev/null +++ b/meta-openeuler/recipes-devtools/prelink/prelink_git.bb @@ -0,0 +1,183 @@ +SECTION = "devel" +# Need binutils for libiberty.a +# Would need transfig-native for documentation if it wasn't disabled +DEPENDS = "elfutils binutils" +SUMMARY = "An ELF prelinking utility" +HOMEPAGE = "http://git.yoctoproject.org/cgit.cgi/prelink-cross/about/" +DESCRIPTION = "The prelink package contains a utility which modifies ELF shared libraries \ +and executables, so that far fewer relocations need to be resolved at \ +runtime and thus programs come up faster." +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" +SRCREV = "f9975537dbfd9ade0fc813bd5cf5fcbe41753a37" +PV = "1.0+git${SRCPV}" + +# +# The cron script attempts to re-prelink the system daily -- on +# systems where users are adding applications, this might be reasonable +# but for embedded, we should be re-running prelink -a after an update. +# +# Default is prelinking is enabled. +# +SUMMARY:${PN}-cron = "Cron scripts to control automatic prelinking" +DESCRIPTION:${PN}-cron = "Cron scripts to control automatic prelinking. \ +See: ${sysconfdir}/cron.daily/prelink for configuration information." + +FILES:${PN}-cron = "${sysconfdir}/cron.daily ${sysconfdir}/default" + +PACKAGES =+ "${PN}-cron" + +SRC_URI = "git://git.yoctoproject.org/prelink-cross.git;branch=cross_prelink_staging \ + file://0001-Add-MIPS-gnu-hash-support.patch \ + file://prelink.conf \ + file://prelink.cron.daily \ + file://prelink.default \ + file://macros.prelink \ + " +UPSTREAM_CHECK_COMMITS = "1" + +# error: error.h: No such file or directory +COMPATIBLE_HOST:libc-musl = 'null' + +TARGET_OS_ORIG := "${TARGET_OS}" +OVERRIDES:append = ":${TARGET_OS_ORIG}" + +S = "${WORKDIR}/git" + +inherit autotools + +BBCLASSEXTEND = "native" + +EXTRA_OECONF = "--disable-selinux --with-pkgversion=${PV}-${PR} \ + --with-bugurl=http://bugzilla.yoctoproject.org/" + + +# +# For target prelink we need to ensure paths match the lib path layout +# including for any configured multilibs +# +python do_linkerpaths () { + values = all_multilib_tune_list(["TUNE_ARCH", "baselib", "ABIEXTENSION"], d) + + arches = values["TUNE_ARCH"] + baselibs = values["baselib"] + abis = values["ABIEXTENSION"] + + def replace_lines(f, search, replacement, d, firstonly = False, secondonly = False): + f = d.expand(f) + if search == replacement: + return + bb.debug(2, "Replacing %s with %s in %s" % (search, replacement, f)) + with open(f, "r") as data: + lines = data.readlines() + with open(f, "w") as data: + for line in lines: + if not secondonly and not firstonly: + line = line.replace(search, replacement) + elif secondonly and search in line: + secondonly = False + elif firstonly and search and search in line: + line = line.replace(search, replacement) + search = None + data.write(line) + + def replace_lines_rtld(f, search, replacement, section, d): + f = d.expand(f) + bb.debug(2, "Replacing %s with %s in %s" % (search, replacement, f)) + with open(f, "r") as data: + lines = data.readlines() + found = False + found2 = False + with open(f, "w") as data: + for line in lines: + if section in line: + if section == "else" and "if" in line: + found = False + else: + found = True + if found and "dst_LIB =" in line: + found2 = True + elif "}" in line: + found = False + found2 = False + if found2: + line = line.replace(search, replacement) + data.write(line) + + for i, arch in enumerate(arches): + tune_baselib = baselibs[i] + abi = abis[i] + + bits = 32 + if arch == "powerpc": + replace_lines("${S}/src/arch-ppc.c", "/lib/ld.so.1", "/" + tune_baselib + "/ld.so.1", d) + elif arch == "powerpc64": + replace_lines("${S}/src/arch-ppc64.c", "/lib64/ld64.so.1", "/" + tune_baselib + "/ld64.so.1", d) + bits = 64 + elif arch == "x86_64": + if abi == "x32": + replace_lines("${S}/src/arch-x86_64.c", "/libx32/ld-linux-x32.so.2", "/" + tune_baselib + "/ld-linux-x32.so.2", d) + else: + replace_lines("${S}/src/arch-x86_64.c", "/lib64/ld-linux-x86-64.so.2", "/" + tune_baselib + "/ld-linux-x86-64.so.2", d) + bits = 64 + elif arch == "arm": + replace_lines("${S}/src/arch-arm.c", "/lib/ld-linux.so.3", "/" + tune_baselib + "/ld-linux.so.3", d) + replace_lines("${S}/src/arch-arm.c", "/lib/ld-linux-armhf.so.3", "/" + tune_baselib + "/ld-linux-armhf.so.3", d) + elif arch == "mips" or arch == "mipsel": + replace_lines("${S}/src/arch-mips.c", "/lib/ld.so.1", "/" + tune_baselib + "/ld.so.1", d, firstonly=True) + replace_lines("${S}/src/arch-mips.c", "/lib32/ld.so.1", "/" + tune_baselib + "/ld.so.1", d) + elif arch == "mips64" or arch == "mips64el": + replace_lines("${S}/src/arch-mips.c", "/lib/ld.so.1", "/" + tune_baselib + "/ld.so.1", d, secondonly=True) + replace_lines("${S}/src/arch-mips.c", "/lib64/ld.so.1", "/" + tune_baselib + "/ld.so.1", d) + bits = 64 + elif arch.endswith("86"): + replace_lines("${S}/src/arch-i386.c", "/lib/ld-linux.so.2", "/" + tune_baselib + "/ld-linux.so.2", d) + if bits == 32 and tune_baselib != "lib": + replace_lines_rtld("${S}/src/rtld/rtld.c", "lib", tune_baselib, "else", d) + if bits == 64 and tune_baselib != "lib64": + replace_lines_rtld("${S}/src/rtld/rtld.c", "lib64", tune_baselib, "use_64bit", d) +} + +python () { + overrides = d.getVar("OVERRIDES").split(":") + if "class-target" in overrides: + bb.build.addtask('do_linkerpaths', 'do_configure', 'do_patch', d) +} + +do_configure:prepend () { + # Disable documentation! + echo "all:" > ${S}/doc/Makefile.am +} + +do_install:append () { + install -d ${D}${sysconfdir}/cron.daily ${D}${sysconfdir}/default ${D}${sysconfdir}/rpm + install -m 0644 ${WORKDIR}/prelink.conf ${D}${sysconfdir}/prelink.conf + install -m 0644 ${WORKDIR}/prelink.cron.daily ${D}${sysconfdir}/cron.daily/prelink + install -m 0644 ${WORKDIR}/prelink.default ${D}${sysconfdir}/default/prelink + install -m 0644 ${WORKDIR}/macros.prelink ${D}${sysconfdir}/rpm/macros.prelink +} + +# If we ae doing a cross install, we want to avoid prelinking. +# Prelinking during a cross install should be handled by the image-prelink +# bbclass. If the user desires this to run on the target at first boot +# they will need to create a custom boot script. +pkg_postinst_prelink() { +#!/bin/sh + +if [ "x$D" != "x" ]; then + exit 0 +fi + +prelink -a +} + +pkg_prerm_prelink() { +#!/bin/sh + +if [ "x$D" != "x" ]; then + exit 1 +fi + +prelink -au +} + diff --git a/meta-openeuler/recipes-devtools/pseudo/pseudo_%.bbappend b/meta-openeuler/recipes-devtools/pseudo/pseudo_%.bbappend index 4f84e837bf4977f27f1562f5c444f49646960cf3..7e58861b9dbde589e9622d032c29454a07b5b567 100644 --- a/meta-openeuler/recipes-devtools/pseudo/pseudo_%.bbappend +++ b/meta-openeuler/recipes-devtools/pseudo/pseudo_%.bbappend @@ -1,22 +1,27 @@ # we can't move pseudo-native into native sdk currently because of deep couple of pseduo and yocto, # but we can use native sdk to build pseudo-native to remove the dependency of sqlite-native and attr-native -DEPENDS_remove_class-native += "sqlite3-native attr-native" +DEPENDS:remove:class-native = "sqlite3-native attr-native" OPENEULER_REPO_NAME = "yocto-pseudo" -SRC_URI_remove_class-native = " \ - git://git.yoctoproject.org/pseudo;branch=oe-core \ - http://downloads.yoctoproject.org/mirror/sources/pseudo-prebuilt-2.33.tar.xz;subdir=git/prebuilt;name=prebuilt \ +SRC_URI:remove:class-native = " \ + git://git.yoctoproject.org/pseudo;branch=oe-core \ + http://downloads.yoctoproject.org/mirror/sources/pseudo-prebuilt-2.33.tar.xz;subdir=git/prebuilt;name=prebuilt \ + file://0001-configure-Prune-PIE-flags.patch \ " -SRC_URI_prepend_class-native = "file://${BP}.tar.gz \ +SRC_URI:remove = " \ + file://older-glibc-symbols.patch \ +" + +SRC_URI:prepend:class-native = "file://${BP}.tar.gz \ " -PV_class-native = "df1d1321fb093283485c387e3c933d2d264e509c" -S_class-native = "${WORKDIR}/${BP}" +PV:class-native = "df1d1321fb093283485c387e3c933d2d264e509c" +S:class-native = "${WORKDIR}/${BP}" # fix nativesdk lib use error: Failed to spawn fakeroot worker to run xxx/yocto-meta-openeuler/ # meta-openeuler/recipes-external/glibc/glibc-external.bb:do_install: [Errno 32] Broken pipe -BUILD_LDFLAGS_remove = " -L${OPENEULER_NATIVESDK_SYSROOT}/usr/lib \ +BUILD_LDFLAGS:remove = " -L${OPENEULER_NATIVESDK_SYSROOT}/usr/lib \ -L${OPENEULER_NATIVESDK_SYSROOT}/lib \ -Wl,-rpath-link,${OPENEULER_NATIVESDK_SYSROOT}/usr/lib \ -Wl,-rpath-link,${OPENEULER_NATIVESDK_SYSROOT}/lib \ @@ -24,7 +29,7 @@ BUILD_LDFLAGS_remove = " -L${OPENEULER_NATIVESDK_SYSROOT}/usr/lib \ -Wl,-rpath,${OPENEULER_NATIVESDK_SYSROOT}/lib" # set --with-sqlite to native sdk path -do_compile_class-native () { +do_compile:class-native () { if [ "${SITEINFO_BITS}" = "64" ]; then ${S}/configure ${PSEUDO_EXTRA_OPTS} --prefix=${prefix} --libdir=${prefix}/lib/pseudo/lib${SITEINFO_BITS} --with-sqlite-lib=${OPENEULER_NATIVESDK_SYSROOT}/usr/lib --with-sqlite=${OPENEULER_NATIVESDK_SYSROOT}/usr --cflags="${CFLAGS}" --bits=${SITEINFO_BITS} --without-rpath else diff --git a/meta-openeuler/recipes-devtools/python/files/setup.py-find-libs-in-staging-dirs.patch b/meta-openeuler/recipes-devtools/python/files/setup.py-find-libs-in-staging-dirs.patch deleted file mode 100644 index 265152e242451e8c026312d628e3181db39b70c6..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-devtools/python/files/setup.py-find-libs-in-staging-dirs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index 07abcf6..a5747a7 100644 ---- a/setup.py -+++ b/setup.py -@@ -2456,6 +2456,8 @@ class PyBuildExt(build_ext): - libs = [] - library_dirs = [] - includes_dirs = [] -+ library_dirs.append(os.environ.get('STAGING_LIBDIR')) -+ includes_dirs.append(os.environ.get('STAGING_INCDIR')) - - # bpo-32521: glibc has deprecated Sun RPC for some time. Fedora 28 - # moved headers and libraries to libtirpc and libnsl. The headers diff --git a/meta-openeuler/recipes-devtools/python/pypi-src-openeuler.inc b/meta-openeuler/recipes-devtools/python/pypi-src-openeuler.inc index 8f835223ea41708e075b61157897cf7b15c0fb3b..53c7814a6a9cd8c17dda5f56a672dae6fd1ed95f 100644 --- a/meta-openeuler/recipes-devtools/python/pypi-src-openeuler.inc +++ b/meta-openeuler/recipes-devtools/python/pypi-src-openeuler.inc @@ -1,5 +1,5 @@ OPENEULER_REPO_NAME = "python-${PYPI_PACKAGE}" # use openeuler's pkg src -SRC_URI_remove += "${PYPI_SRC_URI} " -SRC_URI_prepend += "file://${PYPI_PACKAGE}-${PV}.tar.gz " +SRC_URI:remove = "${PYPI_SRC_URI} " +SRC_URI:prepend = "file://${PYPI_PACKAGE}-${PV}.tar.gz " diff --git a/meta-openeuler/recipes-devtools/python/python3-docopt_%.bbappend b/meta-openeuler/recipes-devtools/python/python3-docopt_%.bbappend deleted file mode 100644 index bd4a6cef9682725eba50391b1770bc743442250b..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-devtools/python/python3-docopt_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -PV = "0.6.2" -require pypi-src-openeuler.inc diff --git a/meta-openeuler/recipes-devtools/python/python3-importlib-metadata_%.bbappend b/meta-openeuler/recipes-devtools/python/python3-importlib-metadata_%.bbappend index 49d78da1dfd332cbed2c4e83152c610dc309894d..d598df4195840aa1fb9bdc15bc39a4e1cd8ceff8 100644 --- a/meta-openeuler/recipes-devtools/python/python3-importlib-metadata_%.bbappend +++ b/meta-openeuler/recipes-devtools/python/python3-importlib-metadata_%.bbappend @@ -1,6 +1,6 @@ -PV = "4.8.3" +PV = "4.12.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e88ae122f3925d8bde8319060f2ddb8e" -SRC_URI[md5sum] = "833c41fd427678c8b590c5a7818dd873" -SRC_URI[sha256sum] = "766abffff765960fcc18003801f7044eb6755ffae4521c8e8ce8e83b9c9b0668" +SRC_URI[md5sum] = "cfcf29185e13439c76d09c94bc8d81f4" +SRC_URI[sha256sum] = "637245b8bab2b6502fcbc752cc4b7a6f6243bb02b31c5c26156ad103d3d45670" require pypi-src-openeuler.inc OPENEULER_REPO_NAME = "python-importlib-metadata" diff --git a/meta-openeuler/recipes-devtools/python/python3-iniparse_%.bbappend b/meta-openeuler/recipes-devtools/python/python3-iniparse_%.bbappend index b622d44b0be7bca98a2a42c63edc4bb8a62ae962..3795e53167718097ed93d6b81af0a28d3b72ce7a 100644 --- a/meta-openeuler/recipes-devtools/python/python3-iniparse_%.bbappend +++ b/meta-openeuler/recipes-devtools/python/python3-iniparse_%.bbappend @@ -5,11 +5,11 @@ SRC_URI[md5sum] = "2054bab923df21107652d009f2373789" SRC_URI[sha256sum] = "932e5239d526e7acb504017bb707be67019ac428a6932368e6851691093aa842" # delete useless patch for version 0.4 -SRC_URI_remove = "file://0001-Add-python-3-compatibility.patch " +SRC_URI:remove = "file://0001-Add-python-3-compatibility.patch " # fix ModuleNotFoundError: No module named 'setuptools' inherit setuptools3 # fix _sysconfigdata not found error, after inherit setuptools3 -do_install_remove_class-target() { +do_install:remove:class-target() { export _PYTHON_SYSCONFIGDATA_NAME="_sysconfigdata" } diff --git a/meta-openeuler/recipes-devtools/python/python3-numpy_%.bbappend b/meta-openeuler/recipes-devtools/python/python3-numpy_%.bbappend index 609f87abb7c17accd559b140078563388c7a9c5f..9289aa307e7368fbeb902f6702d7f3e775761c29 100644 --- a/meta-openeuler/recipes-devtools/python/python3-numpy_%.bbappend +++ b/meta-openeuler/recipes-devtools/python/python3-numpy_%.bbappend @@ -1,26 +1,26 @@ PV = "1.21.4" -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b076ad374a7d311ba3126a22b2d52596" SRC_URI[md5sum] = "b3c4477a027d5b6fba5e1065064fd076" SRC_URI[sha256sum] = "e6c76a87633aa3fa16614b61ccedfae45b91df2767cf097aa9c933932a7ed1e0" OPENEULER_REPO_NAME = "numpy" -SRC_URI_prepend += "file://numpy-${PV}.zip " +SRC_URI:prepend = "file://numpy-${PV}.zip " S = "${WORKDIR}/numpy-${PV}" # remove poky conflict src -SRC_URI_remove += " \ +SRC_URI:remove = " \ https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${SRCNAME}-${PV}.tar.gz \ file://CVE-2021-41496.patch \ " # apply new patch for new version, see: # http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-devtools/python/python3-numpy_1.23.4.bb -SRC_URI_append += "file://0001-generate_umath.py-do-not-write-full-path-to-output-f.patch " +SRC_URI:append = "file://0001-generate_umath.py-do-not-write-full-path-to-output-f.patch " #apply openeuler patch -SRC_URI_append += " \ +SRC_URI:append = " \ file://backport-CVE-2021-41496.patch \ file://backport-CVE-2021-41495.patch \ file://backport-CVE-2021-34141.patch \ @@ -31,7 +31,7 @@ SRC_URI_append += " \ # have been optimized with logical issues, resulting in segmentation faults. # Therefore, we are implementing a contingency plan by changing the default # optimization configuration from O2 to O1 -CXXFLAGS_prepend_class-target = " -O1 " -CFLAGS_prepend_class-target = " -O1 " -CXXFLAGS_remove_class-target = "-O2" -CFLAGS_remove_class-target = "-O2" +CXXFLAGS:prepend_class-target = " -O1 " +CFLAGS:prepend_class-target = " -O1 " +CXXFLAGS:remove:class-target = "-O2" +CFLAGS:remove:class-target = "-O2" diff --git a/meta-openeuler/recipes-devtools/python/python3-pathlib2_%.bbappend b/meta-openeuler/recipes-devtools/python/python3-pathlib2_%.bbappend index 4a8494bbdfda5b410902f2760cece7817099ea33..10f3e9c131405b25d2f5d21fc1ffa3b4202b221a 100644 --- a/meta-openeuler/recipes-devtools/python/python3-pathlib2_%.bbappend +++ b/meta-openeuler/recipes-devtools/python/python3-pathlib2_%.bbappend @@ -1,5 +1,5 @@ -PV = "2.3.5" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=042856c23a3e903b33bf361ea1cbe29a" -SRC_URI[md5sum] = "f2bd0a363eb0f8fa0556f35c1d9e66fb" -SRC_URI[sha256sum] = "6cd9a47b597b37cc57de1c05e56fb1a1c9cc9fab04fe78c29acd090418529868" +PV = "2.3.7" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=2dc08586cce3ab91bfa091b655c0e440" +SRC_URI[md5sum] = "ff87562935872cf68f935f8a9e43f84f" +SRC_URI[sha256sum] = "7a4329d67beff9a712e1d3ae147e4e3e108b0bfd284ffdea03a635126c76b3c0" require pypi-src-openeuler.inc diff --git a/meta-openeuler/recipes-devtools/python/python3-pip_%.bbappend b/meta-openeuler/recipes-devtools/python/python3-pip_%.bbappend index 62adb15c9f09d37e6870f453893c77166f9b0ba5..93d71e0c0d15f0d258cb266e9702712d4085bcc8 100644 --- a/meta-openeuler/recipes-devtools/python/python3-pip_%.bbappend +++ b/meta-openeuler/recipes-devtools/python/python3-pip_%.bbappend @@ -5,13 +5,13 @@ SRC_URI[sha256sum] = "65fd48317359f3af8e593943e6ae1506b66325085ea64b706a998c6e83 require pypi-src-openeuler.inc # remove poky conflict patches -SRC_URI_remove += " \ +SRC_URI:remove = " \ file://0001-change-shebang-to-python3.patch \ file://0001-Don-t-split-git-references-on-unicode-separators.patch \ " # apply openeuler patches -SRC_URI_append +=" \ +SRC_URI:append =" \ file://remove-existing-dist-only-if-path-conflicts.patch \ file://dummy-certifi.patch \ " diff --git a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-psutil_%.bbappend b/meta-openeuler/recipes-devtools/python/python3-psutil_%.bbappend similarity index 93% rename from meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-psutil_%.bbappend rename to meta-openeuler/recipes-devtools/python/python3-psutil_%.bbappend index d52ea4756b319bbd8e3c49a655d70c86d5e09f92..a5f65e47c35186c054f7cb7782804a48f42963b5 100644 --- a/meta-openeuler/dynamic-layers/meta-python/recipes-devtools/python/python3-psutil_%.bbappend +++ b/meta-openeuler/recipes-devtools/python/python3-psutil_%.bbappend @@ -7,7 +7,7 @@ SRC_URI[md5sum] = "080d75a78be3ef1ce72c39a9b001197d" SRC_URI[sha256sum] = "ea4f431c10100079f46a494894582edb43e395324f200bd82ecf60b60b46a929" # add RDEPENDS for 5.9 -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ${PYTHON_PN}-ctypes \ ${PYTHON_PN}-resource \ " diff --git a/meta-openeuler/recipes-devtools/python/python3-pytest_%.bbappend b/meta-openeuler/recipes-devtools/python/python3-pytest_%.bbappend index b9fdcdcbf122454004c7f789d35763f188de7f38..5119a4bed9bb92de2b72a3cb94830f987f2660e3 100644 --- a/meta-openeuler/recipes-devtools/python/python3-pytest_%.bbappend +++ b/meta-openeuler/recipes-devtools/python/python3-pytest_%.bbappend @@ -6,7 +6,7 @@ require pypi-src-openeuler.inc OPENEULER_REPO_NAME = "${PYPI_PACKAGE}" # remove poky conflict patch, we have fit by 0002-patch -SRC_URI_remove += "file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch " +SRC_URI:remove = "file://0001-setup.py-remove-the-setup_requires-for-setuptools-scm.patch " FILESEXTRAPATHS:prepend := "${THISDIR}/python3-pytest/:" -SRC_URI_append += "file://0002-setup.py-remove-the-setup_requires-for-setuptools-scm.patch" +SRC_URI:append = "file://0002-setup.py-remove-the-setup_requires-for-setuptools-scm.patch" diff --git a/meta-openeuler/recipes-devtools/python/python3-pyyaml_%.bbappend b/meta-openeuler/recipes-devtools/python/python3-pyyaml_%.bbappend index f0b36784ce6068e12999e50dd29de1832d14a23b..cd8bddcd72fd07419d06a5d12d97dae37f613290 100644 --- a/meta-openeuler/recipes-devtools/python/python3-pyyaml_%.bbappend +++ b/meta-openeuler/recipes-devtools/python/python3-pyyaml_%.bbappend @@ -4,6 +4,6 @@ SRC_URI[md5sum] = "1d19c798f25e58e3e582f0f8c977dbb8" SRC_URI[sha256sum] = "68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2" OPENEULER_REPO_NAME = "${PYPI_PACKAGE}" OPENEULER_BRANCH = "openEuler-20.03-LTS" -SRC_URI_remove += "${PYPI_SRC_URI} " -SRC_URI_prepend += "file://${PV}.tar.gz " +SRC_URI:remove = "${PYPI_SRC_URI} " +SRC_URI:prepend = "file://${PV}.tar.gz " S = "${WORKDIR}/pyyaml-${PV}" diff --git a/meta-openeuler/recipes-devtools/python/python3-setuptools_%.bbappend b/meta-openeuler/recipes-devtools/python/python3-setuptools_%.bbappend index ad53dd9f117b896f9e03fecff6e83560d228b3b9..dfb519ec755819ad7e31ac56f104cac5bcd56d00 100644 --- a/meta-openeuler/recipes-devtools/python/python3-setuptools_%.bbappend +++ b/meta-openeuler/recipes-devtools/python/python3-setuptools_%.bbappend @@ -2,7 +2,6 @@ PV = "59.4.0" SRC_URI[md5sum] = "1cfee8bed453d447851114c0deca6ba1" SRC_URI[sha256sum] = "b4c634615a0cf5b02cf83c7bedffc8da0ca439f00e79452699454da6fbd4153d" require pypi-src-openeuler.inc -OPENEULER_BRANCH = "openEuler-22.03-LTS-Next" SRC_URI += " \ file://bugfix-eliminate-random-order-in-metadata.patch \ diff --git a/meta-openeuler/recipes-devtools/python/python3-toml_%.bbappend b/meta-openeuler/recipes-devtools/python/python3-toml_%.bbappend index 765417aa33f423e3974d8fc61f31c17ee9ccc19c..8b931534656acfaa0a8ac70d25f4175d2190c1fb 100644 --- a/meta-openeuler/recipes-devtools/python/python3-toml_%.bbappend +++ b/meta-openeuler/recipes-devtools/python/python3-toml_%.bbappend @@ -3,7 +3,7 @@ SRC_URI[md5sum] = "165f8d31000174760118dc9893ed9bb9" SRC_URI[sha256sum] = "71d4039bbdec91e3e7591ec5d6c943c58f9a2d17e5f6783acdc378f743fcdd2a" # use openeuler's pkg src -SRC_URI_remove += "${PYPI_SRC_URI} " +SRC_URI:remove = "${PYPI_SRC_URI} " OPENEULER_REPO_NAME = "python-${PYPI_PACKAGE}" OPENEULER_BRANCH = "master" -SRC_URI_prepend += "file://${PV}.tar.gz " +SRC_URI:prepend = "file://${PV}.tar.gz " diff --git a/meta-openeuler/recipes-devtools/python/python3-zipp_%.bbappend b/meta-openeuler/recipes-devtools/python/python3-zipp_%.bbappend index aa549b241daacf403a0d0decae339c566b4fffcf..babea5eac5da1a22300ea7c6191d8a7e3eeb3e0d 100644 --- a/meta-openeuler/recipes-devtools/python/python3-zipp_%.bbappend +++ b/meta-openeuler/recipes-devtools/python/python3-zipp_%.bbappend @@ -1,4 +1,4 @@ -PV = "3.7.0" -SRC_URI[md5sum] = "5a1fc692b57b348d1e259484b405ddf6" -SRC_URI[sha256sum] = "9f50f446828eb9d45b267433fd3e9da8d801f614129124863f9c51ebceafb87d" +PV = "3.11.0" +SRC_URI[md5sum] = "1fbff3bca7294a3a7f09fa3f0652c3da" +SRC_URI[sha256sum] = "a7a22e05929290a67401440b39690ae6563279bced5f314609d9d03798f56766" require pypi-src-openeuler.inc diff --git a/meta-openeuler/recipes-devtools/python/python3_%.bbappend b/meta-openeuler/recipes-devtools/python/python3_%.bbappend index 574a09deed7cb9725ee00c16d5063d6a7a76aa3a..586c10ff73f57040112e1d7bf08603950aade58b 100644 --- a/meta-openeuler/recipes-devtools/python/python3_%.bbappend +++ b/meta-openeuler/recipes-devtools/python/python3_%.bbappend @@ -1,38 +1,21 @@ -PV = "3.9.9" +PV = "3.10.9" -FILESEXTRAPATHS_append := "${THISDIR}/files/:" +# remove conflicting patch +SRC_URI:remove = "file://cve-2023-24329.patch" -SRC_URI[sha256sum] = "06828c04a573c073a4e51c4292a27c1be4ae26621c3edc7cf9318418ce3b6d27" - -SRC_URI_remove += " \ - file://0001-Makefile-fix-Issue36464-parallel-build-race-problem.patch \ -" - -OPENEULER_BRANCH = "openEuler-22.03-LTS" - -SRC_URI =+ " \ - file://00001-rpath.patch \ - file://00111-no-static-lib.patch \ - file://00251-change-user-install-location.patch \ - file://backport-Add--with-wheel-pkg-dir-configure-option.patch \ - file://backport-bpo-46811-Make-test-suite-support-Expat-2.4.5.patch \ - file://backport-bpo-20369-concurrent.futures.wait-now-deduplicates-f.patch \ - file://Make-mailcap-refuse-to-match-unsafe-filenam.patch \ - file://backport-CVE-2021-28861.patch \ - file://backport-CVE-2020-10735.patch \ - file://backport-bpo-35823-subprocess-Use-vfork-instead-of-fork-on-Li.patch \ - file://backport-bpo-35823-subprocess-Fix-handling-of-pthread_sigmask.patch \ - file://backport-bpo-35823-Allow-setsid-after-vfork-on-Linux.-GH-2294.patch \ - file://backport-bpo-42146-Unify-cleanup-in-subprocess_fork_exec-GH-2.patch \ - file://add-the-sm3-method-for-obtaining-the-salt-value.patch \ +SRC_URI:prepend = " file://00001-rpath.patch \ + file://00251-change-user-install-location.patch \ + file://backport-Make-urllib.parse.urlparse-enforce-that-a-scheme-mus.patch \ + file://add-the-sm3-method-for-obtaining-the-salt-value.patch \ + file://fix-CVE-2023-24329.patch \ " # meta-openeuler layer does not need to build python3-native dependency packages, # but gets them directly from the nativesdk tool # Find header from nativesdk -CPPFLAGS_append_class-native = " -I${OPENEULER_NATIVESDK_SYSROOT}/usr/include \ +CPPFLAGS:append:class-native = " -I${OPENEULER_NATIVESDK_SYSROOT}/usr/include \ -I${OPENEULER_NATIVESDK_SYSROOT}/usr/include/ncursesw -I${OPENEULER_NATIVESDK_SYSROOT}/usr/include/uuid \ " # Find library from nativesdk -LDFLAGS_append_class-native = " -L${OPENEULER_NATIVESDK_SYSROOT}/usr/lib" +LDFLAGS:append:class-native = " -L${OPENEULER_NATIVESDK_SYSROOT}/usr/lib" diff --git a/meta-openeuler/recipes-devtools/rpm/rpm_%.bbappend b/meta-openeuler/recipes-devtools/rpm/rpm_%.bbappend index 3a8288dcabaf2e82c1e23b9acd4f4de7421ea130..ce0252150fbf2be5f15cf865cdaf1f0308e65076 100644 --- a/meta-openeuler/recipes-devtools/rpm/rpm_%.bbappend +++ b/meta-openeuler/recipes-devtools/rpm/rpm_%.bbappend @@ -1,10 +1,10 @@ PV = "4.17.0" S = "${WORKDIR}/${BP}" -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" # delete useless patches form rpm_4.16.1.3.bb -SRC_URI_remove = " \ +SRC_URI:remove = " \ git://github.com/rpm-software-management/rpm;branch=rpm-4.16.x;protocol=https \ file://0001-Fix-build-with-musl-C-library.patch \ file://0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch \ @@ -14,12 +14,12 @@ SRC_URI_remove = " \ file://0003-CVE-2021-3521.patch \ " -SRC_URI_append = " \ +SRC_URI:append = " \ file://0001-docs-do-not-build-manpages-requires-pandoc.patch \ " # files, patches that come from openeuler -SRC_URI_prepend = " \ +SRC_URI:prepend = " \ http://ftp.rpm.org/releases/rpm-4.17.x/${BPN}-${PV}.tar.bz2 \ file://Unbundle-config-site-and-add-RPM-LD-FLAGS-macro.patch \ file://rpm-4.12.0-rpm2cpio-hack.patch \ @@ -96,17 +96,17 @@ SRC_URI_prepend = " \ SRC_URI[sha256sum] = "2e0d220b24749b17810ed181ac1ed005a56bbb6bc8ac429c21f314068dc65e6a" ##openeuler rpm not support --without-lua -EXTRA_OECONF_remove = " --without-lua" +EXTRA_OECONF:remove = " --without-lua" DEPENDS += "lua" -DEPENDS_remove = "db" +DEPENDS:remove = "db" -PACKAGECONFIG_append = "sqlite zstd ndb" +PACKAGECONFIG:append = "sqlite zstd ndb" PACKAGECONFIG[sqlite] = "--enable-sqlite=yes,--enable-sqlite=no,sqlite3" PACKAGECONFIG[ndb] = "--enable-ndb,--disable-ndb" PACKAGECONFIG[bdb-ro] = "--enable-bdb-ro,--disable-bdb-ro" PACKAGECONFIG[zstd] = "--enable-zstd=yes,--enable-zstd=no,zstd" -RRECOMMENDS_${PN}_remove = " rpm-build" +RRECOMMENDS:${PN}:remove = " rpm-build" SSTATE_HASHEQUIV_FILEMAP = " \ populate_sysroot:*/rpm/macros:${TMPDIR} \ populate_sysroot:*/rpm/macros:${COREBASE} \ @@ -114,11 +114,11 @@ SSTATE_HASHEQUIV_FILEMAP = " \ # remove the following actios for pythondistdeps.py after upgrade to new poky -do_install_prepend() { +do_install:prepend() { # no file in new rpm version, touch one before use mkdir -p ${D}${libdir}/rpm/ touch ${D}${libdir}/rpm/pythondistdeps.py } -do_install_append() { +do_install:append() { rm -f ${D}${libdir}/rpm/pythondistdeps.py } diff --git a/meta-openeuler/recipes-devtools/rust/cargo-bin-cross.inc b/meta-openeuler/recipes-devtools/rust/cargo-bin-cross.inc index dee434762dfd9d30d3b8318f8f964f53e45934d5..ae2bbb7ea1a4335f21b4eb85a851085c4535d248 100644 --- a/meta-openeuler/recipes-devtools/rust/cargo-bin-cross.inc +++ b/meta-openeuler/recipes-devtools/rust/cargo-bin-cross.inc @@ -20,14 +20,14 @@ SECTION = "devel" inherit cross cargo # prevent loop dependency -DEPENDS_remove = "cargo-bin-cross-${TARGET_ARCH}" +DEPENDS:remove = "cargo-bin-cross-${TARGET_ARCH}" PN = "cargo-bin-cross-${TARGET_ARCH}" CARGO_HOST_TARGET = "${@rust_target(d, 'HOST')}" SYSROOT_DIRS_NATIVE += "${prefix}" -SYSROOT_DIRS_BLACKLIST += "\ +SYSROOT_DIRS_IGNORE += "\ ${prefix}/share \ ${prefix}/etc \ " diff --git a/meta-openeuler/recipes-devtools/rust/rustc-bin-cross.inc b/meta-openeuler/recipes-devtools/rust/rustc-bin-cross.inc index 7a2b5f7a559749ded7c6c03cb3a677e62af4515b..74b46831150e3686cdc077afd3353ac10a9c8c89 100644 --- a/meta-openeuler/recipes-devtools/rust/rustc-bin-cross.inc +++ b/meta-openeuler/recipes-devtools/rust/rustc-bin-cross.inc @@ -20,7 +20,7 @@ SECTION = "devel" inherit cross cargo # prevent loop dependency -DEPENDS_remove = "cargo-bin-cross-${TARGET_ARCH}" +DEPENDS:remove = "cargo-bin-cross-${TARGET_ARCH}" # Required to link binaries DEPENDS += "gcc-cross-${TARGET_ARCH}" @@ -42,7 +42,7 @@ S = "${WORKDIR}/rustc-${PV}-${RUST_BUILD_TARGET}" S[vardepsexclude] += "WORKDIR" SYSROOT_DIRS_NATIVE += "${prefix}" -SYSROOT_DIRS_BLACKLIST += "\ +SYSROOT_DIRS_IGNORE += "\ ${prefix}/share \ ${prefix}/etc \ " diff --git a/meta-openeuler/recipes-devtools/squashfs-tools/squashfs-tools_%.bbappend b/meta-openeuler/recipes-devtools/squashfs-tools/squashfs-tools_%.bbappend index fcebeb36349a70be71ae9200b83e616d69e27cd1..ffc96400028964dd081224b961ac83b4879f9fff 100644 --- a/meta-openeuler/recipes-devtools/squashfs-tools/squashfs-tools_%.bbappend +++ b/meta-openeuler/recipes-devtools/squashfs-tools/squashfs-tools_%.bbappend @@ -3,7 +3,7 @@ # version in openEuler PV = "4.5.1" -FILESEXTRAPATHS_append := "${THISDIR}/files/:" +FILESEXTRAPATHS:append := "${THISDIR}/files/:" # files, patches can't be applied in openeuler or conflict with openeuler SRC_URI = "" diff --git a/meta-openeuler/recipes-devtools/strace/strace_%.bbappend b/meta-openeuler/recipes-devtools/strace/strace_%.bbappend index a26d36ba7cef3ff95a1ce37e461ea1afe3f981e4..db851836701cc9d8a525f4aeab62976b6eaab8c5 100644 --- a/meta-openeuler/recipes-devtools/strace/strace_%.bbappend +++ b/meta-openeuler/recipes-devtools/strace/strace_%.bbappend @@ -1,11 +1,18 @@ -# main bbfile: yocto-poky/meta/recipes-devtools/strace/strace_5.11.bb +# main bbfile: yocto-poky/meta/recipes-devtools/strace/strace_5.16.bb # strace version in openEuler, this version needs to match the kernel PV = "5.14" -OPENEULER_BRANCH = "openEuler-22.03-LTS-SP1" + +LIC_FILES_CHKSUM = "file://COPYING;md5=318cfc887fc8723f4e9d4709b55e065b" # remove conflict patch -SRC_URI_remove += "file://Makefile-ptest.patch" +SRC_URI:remove = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ + file://Makefile-ptest.patch \ +" + +SRC_URI:append = "file://${BP}.tar.xz \ + file://strace-5.14-solve-ilp32-strace-build-error.patch \ +" SRC_URI[md5sum] = "36c1c17f31855617b7898d2fd5abb9e2" SRC_URI[sha256sum] = "901bee6db5e17debad4530dd9ffb4dc9a96c4a656edbe1c3141b7cb307b11e73" diff --git a/meta-openeuler/recipes-devtools/swig/swig_%.bbappend b/meta-openeuler/recipes-devtools/swig/swig_%.bbappend index cd2619b040fc70274a15439df348465f5eece5c8..1128d60e2495128b46d6eb35b900cd30f80477d1 100644 --- a/meta-openeuler/recipes-devtools/swig/swig_%.bbappend +++ b/meta-openeuler/recipes-devtools/swig/swig_%.bbappend @@ -1,5 +1,5 @@ PV = "4.0.2" -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" # openeuler add patches to change pcre to pcre2, no apply SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" diff --git a/meta-openeuler/recipes-devtools/syslinux/syslinux_%.bbappend b/meta-openeuler/recipes-devtools/syslinux/syslinux_%.bbappend index 4b109491f8bffb836deb88ed02e6a3c4963ea264..d63cd4f67459095c34c9a3a8b0c89116ef820e06 100644 --- a/meta-openeuler/recipes-devtools/syslinux/syslinux_%.bbappend +++ b/meta-openeuler/recipes-devtools/syslinux/syslinux_%.bbappend @@ -5,13 +5,13 @@ PV = "6.04-pre1" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = " \ +SRC_URI:remove = " \ https://www.zytor.com/pub/syslinux/Testing/6.04/syslinux-${PV}.tar.xz \ file://determinism.patch \ " # files, patches that come from openeuler -SRC_URI_prepend = " \ +SRC_URI:prepend = " \ file://${BP}.tar.xz;name=tarball \ file://0001-Add-install-all-target-to-top-side-of-HAVE_FIRMWARE.patch \ file://0002-ext4-64bit-feature.patch \ @@ -24,7 +24,7 @@ SRC_URI_prepend = " \ SRC_URI[tarball.md5sum] = "f9c956fde0de29be297402ecbc8ff4d0" SRC_URI[tarball.sha256sum] = "3f6d50a57f3ed47d8234fd0ab4492634eb7c9aaf7dd902f33d3ac33564fd631d" -do_install_append() { +do_install:append() { install -d ${D}${datadir}/syslinux/ install -m 644 ${S}/bios/core/isolinux.bin ${D}${datadir}/syslinux/ install -m 644 ${S}/bios/com32/elflink/ldlinux/ldlinux.c32 ${D}${datadir}/syslinux/ diff --git a/meta-openeuler/recipes-devtools/tcltk/files/no_packages.patch b/meta-openeuler/recipes-devtools/tcltk/files/no_packages.patch deleted file mode 100644 index f47537fd16b3907b29ae7c80fd96723ded5bb529..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-devtools/tcltk/files/no_packages.patch +++ /dev/null @@ -1,52 +0,0 @@ -tcl 8.6.0 builds by default a number of packages that are not needed in Yocto. -This patch changes the makefile so that these packages are not built by default. - -Upstream-Status:Inappropriate [embedded specific] - -Signed-off-by: Bogdan Marinescu - ---- a/Makefile.in -+++ b/Makefile.in -@@ -709,7 +709,7 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $ - # Start of rules - #-------------------------------------------------------------------------- - --all: binaries libraries doc packages -+all: binaries libraries doc - - binaries: ${LIB_FILE} ${TCL_EXE} - -@@ -753,13 +753,13 @@ Makefile: $(UNIX_DIR)/Makefile.in $(DLTE - #tclConfig.h: $(UNIX_DIR)/tclConfig.h.in - # $(SHELL) config.status - --clean: clean-packages -+clean: - rm -rf *.a *.o libtcl* core errs *~ \#* TAGS *.E a.out \ - errors ${TCL_EXE} ${TCLTEST_EXE} lib.exp Tcl @DTRACE_HDR@ \ - *.zip *.vfs - (cd dltest ; $(MAKE) clean) - --distclean: distclean-packages clean -+distclean: clean - rm -rf Makefile config.status config.cache config.log tclConfig.sh \ - tclConfig.h *.plist Tcl.framework tcl.pc - (cd dltest ; $(MAKE) distclean) -@@ -807,7 +807,7 @@ tcltest-real: - # tcltest, ie: - # % make test TESTFLAGS="-verbose bps -file fileName.test" - --test: test-tcl test-packages -+test: test-tcl - - test-tcl: ${TCLTEST_EXE} - $(SHELL_ENV) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) -@@ -874,7 +874,7 @@ INSTALL_PACKAGE_TARGETS = install-packag - INSTALL_DEV_TARGETS = install-headers - INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@ - INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DOC_TARGETS) $(INSTALL_DEV_TARGETS) \ -- $(INSTALL_PACKAGE_TARGETS) $(INSTALL_EXTRA_TARGETS) -+ $(INSTALL_EXTRA_TARGETS) - - install: $(INSTALL_TARGETS) - diff --git a/meta-openeuler/recipes-devtools/tcltk/files/tcl-add-soname.patch b/meta-openeuler/recipes-devtools/tcltk/files/tcl-add-soname.patch deleted file mode 100644 index 5b71a934a76df2c9e81d1d508da3c86f6acfb811..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-devtools/tcltk/files/tcl-add-soname.patch +++ /dev/null @@ -1,46 +0,0 @@ -Upstream-Status: Pending - -Index: unix/configure -=================================================================== ---- unix.orig/configure 2013-09-19 13:17:13.000000000 -0700 -+++ unix/configure 2013-11-11 00:20:51.519490342 -0800 -@@ -7599,6 +7599,9 @@ - # get rid of the warnings. - #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" - -+ # following line added by CW for Debian GNU/Linux -+ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0" -+ - SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared' - DL_OBJS="tclLoadDl.o" - DL_LIBS="-ldl" -Index: unix/tcl.m4 -=================================================================== ---- unix.orig/tcl.m4 2013-09-19 13:17:13.000000000 -0700 -+++ unix/tcl.m4 2013-11-11 00:17:24.263485123 -0800 -@@ -1415,6 +1415,9 @@ - # get rid of the warnings. - #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" - -+ # following line added by CW for Debian GNU/Linux -+ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0" -+ - SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared' - DL_OBJS="tclLoadDl.o" - DL_LIBS="-ldl" -Index: unix/Makefile.in -=================================================================== ---- unix.orig/Makefile.in 2013-09-19 13:17:13.000000000 -0700 -+++ unix/Makefile.in 2013-11-11 00:20:32.423489861 -0800 -@@ -796,7 +796,10 @@ - done - @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" - @@INSTALL_LIB@ -- @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" -+ mv "$(DLL_INSTALL_DIR)"/$(LIB_FILE) "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0 -+ ln -sf $(LIB_FILE).0 "$(DLL_INSTALL_DIR)"/$(LIB_FILE) -+ ln -sf "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0 ./ -+ @chmod 555 "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0 - @echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}" - @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}" - @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/" diff --git a/meta-openeuler/recipes-devtools/tcltk/files/fix_non_native_build_issue.patch b/meta-openeuler/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch similarity index 74% rename from meta-openeuler/recipes-devtools/tcltk/files/fix_non_native_build_issue.patch rename to meta-openeuler/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch index d81555aad603b0fe85647f7f4e47228dfaff68f1..73de588de3e5c0d8fdcd5d26ce522d55a762e11a 100644 --- a/meta-openeuler/recipes-devtools/tcltk/files/fix_non_native_build_issue.patch +++ b/meta-openeuler/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch @@ -1,10 +1,19 @@ -Upstream-Status: Pending +From 8a6c77cdd265fe7ce35929f58f1ade0c6bc4025b Mon Sep 17 00:00:00 2001 +From: Nitin A Kamble +Date: Fri, 13 Aug 2010 12:24:00 -0700 +Subject: [PATCH] tcl: fix a build issue -Index: unix/Makefile.in -=================================================================== ---- unix.orig/Makefile.in 2013-11-10 23:37:34.243424934 -0800 -+++ unix/Makefile.in 2013-11-10 23:37:34.243424934 -0800 -@@ -709,23 +709,23 @@ +Upstream-Status: Inappropriate [upstream does not support installed tests] + +--- + unix/Makefile.in | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/unix/Makefile.in b/unix/Makefile.in +index b110fe9..d7b35a8 100644 +--- a/unix/Makefile.in ++++ b/unix/Makefile.in +@@ -814,23 +814,23 @@ tcltest-real: test: test-tcl test-packages test-tcl: ${TCLTEST_EXE} @@ -32,7 +41,8 @@ Index: unix/Makefile.in # The following target generates the shared libraries in dltest/ that are used # for testing; they are included as part of the "tcltest" target (via the -@@ -743,23 +743,23 @@ # This target can be used to run tclsh from the build directory +@@ -848,28 +848,28 @@ dltest.marker: ${STUB_LIB_FILE} + # This target can be used to run tclsh from the build directory # via `make shell SCRIPT=/tmp/foo.tcl` shell: ${TCL_EXE} - $(SHELL_ENV) ./${TCL_EXE} $(SCRIPT) @@ -43,11 +53,14 @@ Index: unix/Makefile.in - $(SHELL_ENV) $(GDB) ./${TCL_EXE} + $(SHELL_ENV) $(GDB) ${TCL_EXE} + lldb: ${TCL_EXE} + $(SHELL_ENV) $(LLDB) ./${TCL_EXE} + valgrind: ${TCL_EXE} ${TCLTEST_EXE} - $(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ./${TCLTEST_EXE} \ + $(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ${TCLTEST_EXE} \ - $(TOP_DIR)/tests/all.tcl -singleproc 1 -constraints valgrind \ - $(TESTFLAGS) + $(TOP_DIR)/tests/all.tcl -singleproc 1 -constraints valgrind \ + $(TESTFLAGS) valgrindshell: ${TCL_EXE} - $(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ./${TCL_EXE} $(SCRIPT) @@ -62,4 +75,4 @@ Index: unix/Makefile.in + $(SHELL_ENV) ${TRACE} $(TRACE_OPTS) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl -singleproc 1 $(TESTFLAGS) #-------------------------------------------------------------------------- - # Installation rules + # Installation rules \ No newline at end of file diff --git a/meta-openeuler/recipes-devtools/tcltk/tcl_%.bbappend b/meta-openeuler/recipes-devtools/tcltk/tcl_%.bbappend index 948ac22556e83e1a8d238656213b073f79371083..ff5c3141396817a6bb356bfa00b4af8310e9302d 100644 --- a/meta-openeuler/recipes-devtools/tcltk/tcl_%.bbappend +++ b/meta-openeuler/recipes-devtools/tcltk/tcl_%.bbappend @@ -1,37 +1,26 @@ # source bb: meta/recipes-devtools/tcltk/tcl_8.6.11.bb +OPENEULER_SRC_URI:remove = "http https git" PV = "8.6.13" -# modify fix_non_native_build_issue.patch for version 8.6.12 -FILESEXTRAPATHS_prepend := "${THISDIR}/files/:" - -BASE_SRC_URI_remove = "${SOURCEFORGE_MIRROR}/tcl/${BPN}${PV}-src.tar.gz \ +# remove upstream software +BASE_SRC_URI:remove = "${SOURCEFORGE_MIRROR}/tcl/tcl-core${PV}-src.tar.gz \ " -# source code package name has been changed -BASE_SRC_URI =+ "file://${BPN}-core${PV}-src.tar.gz \ -" -# the list patchs that src-openeuler offerd can not patch successful, the first patch is faild -# SRC_URI += "file://tcl-8.6.12-autopath.patch -# file://tcl-8.6.12-conf.patch -# file://tcl-8.6.10-hidden.patch -# file://tcl-8.6.10-tcltests-path-fix.patch -# file://stay-out-of-internals-when-nice-interfaces-are-avail.patch -# file://oops.patch -# file://File-not-found-should-be-ignored-silently.patch -# " +FILESEXTRAPATHS:prepend := "${THISDIR}/tcl/:" -# don't patch the openeuler patch that is incompatible with the current bb, -# otherwise it may cause build problems +# fix_issue_with_old_distro_glibc.patch only needs to be used when built on glibc older than 2.14 +# fix_non_native_build_issue.patch cannot be applied +SRC_URI:remove = "file://fix_issue_with_old_distro_glibc.patch \" -SRC_URI[sha256sum] = "c61f0d6699e2bc7691f119b41963aaa8dc980f23532c4e937739832a5f4a6642" - -# no such patch in later version -SRC_URI_remove = " \ - file://fix_issue_with_old_distro_glibc.patch \ - file://fix_non_native_build_issue.patch \ - file://no_packages.patch \ +# source code package name has been changed +# openEuler patches will not cause problem, they can be successfully patched +BASE_SRC_URI += "file://${BPN}-core${PV}-src.tar.gz \ +file://tcl-8.6.12-autopath.patch \ +file://tcl-8.6.12-conf.patch \ +file://stay-out-of-internals-when-nice-interfaces-are-avail.patch \ +file://oops.patch \ +file://File-not-found-should-be-ignored-silently.patch \ " -# we don't need .c file pack in rootfs -FILES_${PN}-dev_append += "${libdir}/tcl8.6/*.c" +SRC_URI[sha256sum] = "c61f0d6699e2bc7691f119b41963aaa8dc980f23532c4e937739832a5f4a6642" \ No newline at end of file diff --git a/meta-openeuler/recipes-extended/bash/bash_%.bbappend b/meta-openeuler/recipes-extended/bash/bash_%.bbappend index 5c0cf100aadfbf45653db8101556514369a47b15..5abf4f1d40356ff87ffcb2f9a7070a2f0f230fe7 100644 --- a/meta-openeuler/recipes-extended/bash/bash_%.bbappend +++ b/meta-openeuler/recipes-extended/bash/bash_%.bbappend @@ -4,7 +4,7 @@ PV = "5.1.8" # These patches have been merged in this version -SRC_URI_remove += " \ +SRC_URI:remove = " file://CVE-2022-3715.patch \ ${GNU_MIRROR}/bash/bash-${PV}-patches/bash51-001;apply=yes;striplevel=0;name=patch001 \ ${GNU_MIRROR}/bash/bash-${PV}-patches/bash51-002;apply=yes;striplevel=0;name=patch002 \ ${GNU_MIRROR}/bash/bash-${PV}-patches/bash51-003;apply=yes;striplevel=0;name=patch003 \ @@ -12,7 +12,7 @@ SRC_URI_remove += " \ " # patches in openeuler -SRC_URI_append += " \ +SRC_URI:prepend = " \ file://bash-2.05a-interpreter.patch \ file://bash-2.05b-pgrp_sync.patch \ file://bash-4.0-nobits.patch \ @@ -35,4 +35,4 @@ SRC_URI[tarball.sha256sum] = "0cfb5c9bb1a29f800a97bd242d19511c997a1013815b805e0f # When testing the performance of the shell using UnixBench, we found that the sh of busybox(ash) # outperformed bash, so we still make sh link to busybox instead of bash. -ALTERNATIVE_${PN}_remove += "sh" +ALTERNATIVE:${PN}:remove = "sh" diff --git a/meta-openeuler/recipes-extended/bzip2/bzip2_%.bbappend b/meta-openeuler/recipes-extended/bzip2/bzip2_%.bbappend index 4c11bb6736f4256132056ed948e5241fc31ef43b..ed1d5b07fc6ed16a732edbb57f60f45a343082e7 100644 --- a/meta-openeuler/recipes-extended/bzip2/bzip2_%.bbappend +++ b/meta-openeuler/recipes-extended/bzip2/bzip2_%.bbappend @@ -5,7 +5,7 @@ OPENEULER_SRC_URI_REMOVE = "https git http" PV = "1.0.8" # remove conflict files from poky -SRC_URI_remove = " \ +SRC_URI:remove = " \ " LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;endline=37;md5=600af43c50f1fcb82e32f19b32df4664 \ @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;endline=37;md5=600af43c50f1fcb82e " # patches in openeuler -SRC_URI_append = " \ +SRC_URI:append = " \ file://bzip2-${PV}.tar.gz \ file://0001-add-compile-option.patch \ file://0002-CVE-2019-12900.patch \ diff --git a/meta-openeuler/recipes-extended/cracklib/cracklib_%.bbappend b/meta-openeuler/recipes-extended/cracklib/cracklib_%.bbappend index 4d9329ecaf41a9cd164d8b7427053deafa46ea4d..8a39f5034f7123fa3a09d7b26227b828b6da8902 100644 --- a/meta-openeuler/recipes-extended/cracklib/cracklib_%.bbappend +++ b/meta-openeuler/recipes-extended/cracklib/cracklib_%.bbappend @@ -5,10 +5,10 @@ PV = "2.9.8" S = "${WORKDIR}/cracklib-${PV}" # get new 0001-packlib.c-support-dictionary-byte-order-dependent.patch from higher poky -FILESEXTRAPATHS_prepend := "${THISDIR}/files/:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files/:" # delete lower version patch from poky -SRC_URI_remove += " \ +SRC_URI:remove = " \ file://0001-Apply-patch-to-fix-CVE-2016-6318.patch \ " diff --git a/meta-openeuler/recipes-extended/ethtool/ethtool_%.bbappend b/meta-openeuler/recipes-extended/ethtool/ethtool_%.bbappend index 139b1c974890e6259d0173ecb9f6ed1caeef3f36..5832dedc56c912649352e9c589ca390f4972c61c 100644 --- a/meta-openeuler/recipes-extended/ethtool/ethtool_%.bbappend +++ b/meta-openeuler/recipes-extended/ethtool/ethtool_%.bbappend @@ -1,10 +1,9 @@ PV = "5.19" -SRC_URI:remove += " ${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz " +SRC_URI:remove = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz" # ptest patch: avoid_parallel_tests.patch -SRC_URI = "file://${BP}.tar.xz \ - " +SRC_URI:prepend = "file://${BP}.tar.xz \ + " SRC_URI[sha256sum] = "3b752a3329827907ac3812f2831dfecf51c8c41c55d2d69cfb9c53ca06449fc6" - diff --git a/meta-openeuler/recipes-extended/gawk/gawk_%.bbappend b/meta-openeuler/recipes-extended/gawk/gawk_%.bbappend index db7e84a2810766ff13d962673a8a348b70843129..85b7de30a5fd84e9c76ba1c0dfb00d1a9b95a47f 100644 --- a/meta-openeuler/recipes-extended/gawk/gawk_%.bbappend +++ b/meta-openeuler/recipes-extended/gawk/gawk_%.bbappend @@ -4,11 +4,12 @@ PV = "5.2.0" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \ +SRC_URI:remove = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \ + file://remove-sensitive-tests.patch \ " # files, patches that come from openeuler -SRC_URI_prepend = " \ +SRC_URI:prepend = " \ file://${BP}.tar.xz \ file://pma.patch \ file://Disable-pma-test.awk.patch \ diff --git a/meta-openeuler/recipes-extended/grep/grep_%.bbappend b/meta-openeuler/recipes-extended/grep/grep_%.bbappend index 6349f4725babd8f060d47d7f447dd9d4f2b93d99..cbb4c249ec635c18de214924ed7586a86ed4c081 100644 --- a/meta-openeuler/recipes-extended/grep/grep_%.bbappend +++ b/meta-openeuler/recipes-extended/grep/grep_%.bbappend @@ -3,11 +3,14 @@ OPENEULER_SRC_URI_REMOVE = "https git http" PV = "3.8" # sync openeuler's grep to use pcre2 -PACKAGECONFIG_append += "pcre2" -PACKAGECONFIG_remove += "pcre" +PACKAGECONFIG:append = " pcre2" +PACKAGECONFIG:remove = "pcre" PACKAGECONFIG[pcre2] = "--enable-perl-regexp,--disable-perl-regexp,libpcre2" -SRC_URI += " \ +# remove outdated patch +SRC_URI:remove = "file://0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch" + +SRC_URI:prepend = " \ file://grep-${PV}.tar.xz \ file://backport-grep-bug-backref-in-last-of-multiple-patter.patch \ " diff --git a/meta-openeuler/recipes-extended/gzip/files/wrong-path-fix_old.patch b/meta-openeuler/recipes-extended/gzip/files/wrong-path-fix_old.patch new file mode 100644 index 0000000000000000000000000000000000000000..7c37bc8d2d9269aaf86c70164aa0ad86c65cae12 --- /dev/null +++ b/meta-openeuler/recipes-extended/gzip/files/wrong-path-fix_old.patch @@ -0,0 +1,36 @@ +fix MakeMaker issues with using wrong SHELL/GREP + +A set of substitution is being processed to all target scripts with sed by +replacing some key words with the detected values at configure time, this +is exactly not compliant with cross compling, and will cause missing path +errors at run time like: +"/usr/bin/zgrep: line 230: /usr/bin/grep: No such file or directory" + +Fixed by removing unneeded substitution and using real runtime paths +instead. + +Signed-off-by: Ming Liu + +Upstream-Status: Pending + +--- + Makefile.am | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index d4ecc3f..e4657d2 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -82,8 +82,7 @@ SUFFIXES = .in + .in: + $(AM_V_GEN)rm -f $@-t $@ \ + && sed \ +- -e 's|/bin/sh|$(SHELL)|g' \ +- -e 's|[@]GREP@|$(GREP)|g' \ ++ -e 's|[@]GREP@|$(base_bindir)/grep|g' \ + -e 's|[@]VERSION@|$(VERSION)|g' \ + $(srcdir)/$@.in >$@-t \ + && chmod a=rx $@-t \ +-- +2.7.4 + diff --git a/meta-openeuler/recipes-extended/gzip/gzip_%.bbappend b/meta-openeuler/recipes-extended/gzip/gzip_%.bbappend index bc02f801a8cfd4a1b691ef6b745d6dfe8bc878b6..33ec05a442dad10f665731411ce2b388800576ab 100644 --- a/meta-openeuler/recipes-extended/gzip/gzip_%.bbappend +++ b/meta-openeuler/recipes-extended/gzip/gzip_%.bbappend @@ -6,15 +6,14 @@ OPENEULER_SRC_URI_REMOVE = "https git http" PV = "1.12" # Use the source packages from openEuler -SRC_URI_remove = "${GNU_MIRROR}/gzip/${BP}.tar.gz" -SRC_URI_prepend += "file://${BP}.tar.xz \ - file://fix-verbose-disable.patch \ - file://backport-gzip-detect-invalid-input.patch \ - file://backport-gzip-test-invalid-input-bug.patch \ - " +SRC_URI:remove = "${GNU_MIRROR}/gzip/${BP}.tar.gz" -# remove poky's conflicting patch -SRC_URI_remove_class-target = " file://wrong-path-fix.patch" +SRC_URI:remove:class-target = "file://wrong-patch-fix.patch" + +SRC_URI:prepend = "file://${BP}.tar.xz \ + file://backport-gzip-detect-invalid-input.patch \ + file://backport-gzip-test-invalid-input-bug.patch \ + file://fix-verbose-disable.patch \ + " -SRC_URI[md5sum] = "9608e4ac5f061b2a6479dc44e917a5db" SRC_URI[sha256sum] = "ce5e03e519f637e1f814011ace35c4f87b33c0bbabeec35baf5fbd3479e91956" diff --git a/meta-openeuler/recipes-extended/iptables/files/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch b/meta-openeuler/recipes-extended/iptables/files/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch new file mode 100644 index 0000000000000000000000000000000000000000..5b1597c77fd385112489526a60bb6916c01ec673 --- /dev/null +++ b/meta-openeuler/recipes-extended/iptables/files/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch @@ -0,0 +1,32 @@ +From d4699d2169fe2d91d0f1f4369d40d2e5f42b8877 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Tue, 17 May 2022 10:56:59 +0200 +Subject: [PATCH 2/4] iptables/xshared.h: add missing sys.types.h include + +This resolves the build error under musl: + +| ../../../../../../../workspace/sources/iptables/iptables/xshared.h:83:56: error: unknown type name 'u_int16_t'; did you mean 'uint16_t'? +| 83 | set_option(unsigned int *options, unsigned int option, u_int16_t *invflg, +| | ^~~~~~~~~ +| | uint16_t + +Upstream-Status: Submitted [via email to phil@nwl.cc] +Signed-off-by: Alexander Kanavin +--- + iptables/xshared.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/iptables/xshared.h b/iptables/xshared.h +index 0ed9f3c2..b1413834 100644 +--- a/iptables/xshared.h ++++ b/iptables/xshared.h +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.30.2 diff --git a/meta-openeuler/recipes-extended/iptables/files/0003-Makefile.am-do-not-install-etc-ethertypes.patch b/meta-openeuler/recipes-extended/iptables/files/0003-Makefile.am-do-not-install-etc-ethertypes.patch new file mode 100644 index 0000000000000000000000000000000000000000..0f5636af6a253bd514ae51e8ac7b4f5814daeb53 --- /dev/null +++ b/meta-openeuler/recipes-extended/iptables/files/0003-Makefile.am-do-not-install-etc-ethertypes.patch @@ -0,0 +1,40 @@ +From 28291b41bc3717f51e8d9d465f0100f1ca99dc26 Mon Sep 17 00:00:00 2001 +From: Trevor Gamblin +Date: Wed, 9 Mar 2022 12:50:39 -0500 +Subject: [PATCH 3/4] Makefile.am: do not install /etc/ethertypes + +The /etc/ethertypes is provided by netbase since 6.0[1]. +Do not instal the file in ebtables, otherwise there would be a conflict: +Error: Transaction test error: + file /etc/ethertypes conflicts between attempted installs of +netbase-1:6.2-r0.corei7_64 and iptables-1.8.7-r0.corei7_64 + +[1] +https://salsa.debian.org/md/netbase/-/commit/316680c6a2c3641b6abc76b3eebf88781f609d35) + +This patch is based off of the same change made for the ebtables recipe: + +http://cgit.openembedded.org/meta-openembedded/tree/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/0001-Makefile.am-do-not-install-etc-ethertypes.patch?h=master + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Trevor Gamblin +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 451c3cb2..5125238c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -20,7 +20,7 @@ EXTRA_DIST = autogen.sh iptables-test.py xlate-test.py + + if ENABLE_NFTABLES + confdir = $(sysconfdir) +-dist_conf_DATA = etc/ethertypes etc/xtables.conf ++dist_conf_DATA = etc/xtables.conf + endif + + .PHONY: tarball +-- +2.30.2 diff --git a/meta-openeuler/recipes-extended/iptables/files/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch b/meta-openeuler/recipes-extended/iptables/files/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch new file mode 100644 index 0000000000000000000000000000000000000000..441ae81fc2fce714d61125731a9c9ce0d617ea35 --- /dev/null +++ b/meta-openeuler/recipes-extended/iptables/files/0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch @@ -0,0 +1,50 @@ +From e7aa1dd2831f9bb5d0603c5e5027387ad7721b00 Mon Sep 17 00:00:00 2001 +From: "Maxin B. John" +Date: Tue, 21 Feb 2017 11:49:07 +0200 +Subject: [PATCH 4/4] configure.ac: + only-check-conntrack-when-libnfnetlink-enabled.patch + +Package libnetfilter-conntrack depends on package libnfnetlink. iptables +checks package libnetfilter-conntrack whatever its package config +libnfnetlink is enabled or not. When libnfnetlink is disabled but +package libnetfilter-conntrack exists, it fails randomly with: + +In file included from +.../iptables/1.4.21-r0/iptables-1.4.21/extensions/libxt_connlabel.c:8:0: + +.../tmp/sysroots/qemumips/usr/include/libnetfilter_conntrack/libnetfilter_conntrack.h:14:42: +fatal error: libnfnetlink/linux_nfnetlink.h: No such file or directory + +compilation terminated. +GNUmakefile:96: recipe for target 'libxt_connlabel.oo' failed +Only check libnetfilter-conntrack when libnfnetlink is enabled to fix it. + +Upstream-Status: Pending + +Signed-off-by: Kai Kang +Signed-off-by: Maxin B. John +--- + configure.ac | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index e27745e5..528f1bb5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -158,10 +158,12 @@ if test "$nftables" != 1; then + fi + + if test "x$enable_connlabel" = "xyes"; then +- PKG_CHECK_MODULES([libnetfilter_conntrack], ++ nfconntrack=0 ++ AS_IF([test "x$enable_libnfnetlink" = "xyes"], [ ++ PKG_CHECK_MODULES([libnetfilter_conntrack], + [libnetfilter_conntrack >= 1.0.6], + [nfconntrack=1], [nfconntrack=0]) +- ++ ]) + if test "$nfconntrack" -ne 1; then + blacklist_modules="$blacklist_modules connlabel"; + echo "WARNING: libnetfilter_conntrack not found, connlabel match will not be built"; +-- +2.30.2 diff --git a/meta-openeuler/recipes-extended/iptables/files/format-security.patch b/meta-openeuler/recipes-extended/iptables/files/format-security.patch new file mode 100644 index 0000000000000000000000000000000000000000..9f9c90d567060e4230c7aa57ae475887e32f71e8 --- /dev/null +++ b/meta-openeuler/recipes-extended/iptables/files/format-security.patch @@ -0,0 +1,30 @@ +From ed4082a7405a5838c205a34c1559e289949200cc Mon Sep 17 00:00:00 2001 +From: Phil Sutter +Date: Thu, 12 Jan 2023 14:38:44 +0100 +Subject: extensions: NAT: Fix for -Werror=format-security + +Have to pass either a string literal or format string to xt_xlate_add(). + +Fixes: f30c5edce0413 ("extensions: Merge SNAT, DNAT, REDIRECT and MASQUERADE") +Signed-off-by: Phil Sutter +Upstream-Status: Backport [https://git.netfilter.org/iptables/commit/?id=ed4082a7405a5838c205a34c1559e289949200cc] +Signed-off-by: Alexander Kanavin +--- + extensions/libxt_NAT.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/extensions/libxt_NAT.c b/extensions/libxt_NAT.c +index da9f2201..2a634398 100644 +--- a/extensions/libxt_NAT.c ++++ b/extensions/libxt_NAT.c +@@ -424,7 +424,7 @@ __NAT_xlate(struct xt_xlate *xl, const struct nf_nat_range2 *r, + if (r->flags & NF_NAT_RANGE_PROTO_OFFSET) + return 0; + +- xt_xlate_add(xl, tgt); ++ xt_xlate_add(xl, "%s", tgt); + if (strlen(range_str)) + xt_xlate_add(xl, " to %s", range_str); + if (r->flags & NF_NAT_RANGE_PROTO_RANDOM) { +-- +cgit v1.2.3 diff --git a/meta-openeuler/recipes-extended/iptables/iptables_%.bbappend b/meta-openeuler/recipes-extended/iptables/iptables_%.bbappend index 75966000184deffc7552557da6fc8c5e57d41d00..9835274655d04c2ee3754448800d59254ae1e213 100644 --- a/meta-openeuler/recipes-extended/iptables/iptables_%.bbappend +++ b/meta-openeuler/recipes-extended/iptables/iptables_%.bbappend @@ -1,11 +1,58 @@ +# the main bb file: yocto-poky/meta/recipes-connectivity/iproute2/iproute2_5.17.0.bb + +LICENSE = "GPL-2.0-or-later" + PV = "1.8.9" OPENEULER_SRC_URI_REMOVE = "https git http" -SRC_URI += "file://${BPN}-${PV}.tar.xz \ - file://0001-extensions-NAT-Fix-for-Werror-format-security.patch \ - " + +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" + +SRC_URI:remove = " \ + http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ + file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \ + file://0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch \ + file://0001-Makefile.am-do-not-install-etc-ethertypes.patch \ +" + +# sync 1.8.9 SRC_URI files +SRC_URI:append = " \ + file://0002-iptables-xshared.h-add-missing-sys.types.h-include.patch \ + file://0003-Makefile.am-do-not-install-etc-ethertypes.patch \ + file://0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch \ + file://format-security.patch \ +" + +SRC_URI:append = " \ + file://${BPN}-${PV}.tar.xz \ +" +# the openeuler patch apply failed +# file://0001-extensions-NAT-Fix-for-Werror-format-security.patch SRC_URI[sha256sum] = "ef6639a43be8325a4f8ea68123ffac236cb696e8c78501b64e8106afb008c87f" -# For iptables-1.8.9, the following files need to be added to FILES_${PN} -FILES_${PN}-module-xt-ct += "${libdir}/xtables/libxt_REDIRECT.so ${libdir}/xtables/libxt_MASQUERADE.so ${libdir}/xtables/libxt_DNAT.so ${libdir}/xtables/libxt_SNAT.so" +do_configure:prepend() { + # Remove some libtool m4 files + # Keep ax_check_linker_flags.m4 which belongs to autoconf-archive. + rm -f libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 + + # Copy a header to fix out of tree builds + cp -f ${S}/libiptc/linux_list.h ${S}/include/libiptc/ +} + +do_install:append() { + # if libnftnl is included, make the iptables symlink point to the nft-based binary by default + if ${@bb.utils.contains('PACKAGECONFIG', 'libnftnl', 'true', 'false', d)} ; then + ln -sf ${sbindir}/xtables-nft-multi ${D}${sbindir}/iptables + fi +} + +FILES:${PN}-module-xt-ct += " ${libdir}/xtables/libxt_REDIRECT.so" +FILES:${PN}-module-xt-nat += "${libdir}/xtables/libxt_SNAT.so ${libdir}/xtables/libxt_DNAT.so ${libdir}/xtables/libxt_MASQUERADE.so" + +INSANE_SKIP:${PN}-module-xt-nat = "dev-so" + +# the poky bb file about PACKAGECONFIG[libnfnetlink] is "--enable-libnfnetlink,--disable-libnfnetlink,libnfnetlink libnetfilter-conntrack" +# but it will be failed in do_configure about "configure was passed unrecognised options: --disable-libnfnetlink [unknown-configure-option]" +# so delete "--disable-libnfnetlink" +PACKAGECONFIG[libnfnetlink] = "--enable-libnfnetlink,libnfnetlink libnetfilter-conntrack" diff --git a/meta-openeuler/recipes-extended/less/less_%.bbappend b/meta-openeuler/recipes-extended/less/less_%.bbappend index b27058868077a7337da812c3252be09272ca9210..889be7bae04761536fe38d6ae2daf10f217a8c3f 100644 --- a/meta-openeuler/recipes-extended/less/less_%.bbappend +++ b/meta-openeuler/recipes-extended/less/less_%.bbappend @@ -9,9 +9,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ # Use the source packages and patches from openEuler # less-475-fsync.patch can't apply: cannot run test program while cross compiling -SRC_URI_remove = "file://less-475-fsync.patch" +SRC_URI:remove = " \ + file://less-475-fsync.patch \ + file://CVE-2022-46663.patch \ +" -SRC_URI_prepend = "file://less-394-time.patch \ +SRC_URI:prepend = "file://less-394-time.patch \ file://less-475-fsync.patch \ file://backport-End-OSC8-hyperlink-on-invalid-embedded-escape-sequen.patch \ " diff --git a/meta-openeuler/recipes-extended/libidn2/libidn2_%.bbappend b/meta-openeuler/recipes-extended/libidn2/libidn2_%.bbappend index 29b15d7cae612cd80165e40d271813e171ba2704..3b355980a6a2c050523b23a99a8b2934d25877cd 100644 --- a/meta-openeuler/recipes-extended/libidn2/libidn2_%.bbappend +++ b/meta-openeuler/recipes-extended/libidn2/libidn2_%.bbappend @@ -1,24 +1,23 @@ -# main bbfile: yocto-poky/meta/recipes-extended/libidn/libidn2_2.3.0.bb +# main bbfile: yocto-poky/meta/recipes-extended/libidn/libidn2_2.3.2.bb # version in openEuler PV = "2.3.3" # solve lic check failed -LIC_FILES_CHKSUM_remove = " \ - file://src/idn2.c;endline=16;md5=426b74d6deb620ab6d39c8a6efd4c13a \ - file://lib/idn2.h.in;endline=27;md5=c2cd28d3f87260f157f022eabb83714f \ +LIC_FILES_CHKSUM:remove = " \ + file://src/idn2.c;endline=16;md5=e4b6d628a84a55f1fd8ae4c76c5f6509 \ + file://lib/idn2.h.in;endline=27;md5=d0fc8ec628be130a1d5b889107e92477 \ " # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = " \ +SRC_URI:remove = " \ ${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \ " # files, patches that come from openeuler -SRC_URI += " \ - file://${BP}.tar.gz;name=tarball \ +SRC_URI:append = " \ + file://${BP}.tar.gz \ file://bugfix-libidn2-change-rpath.patch \ " -SRC_URI[tarball.md5sum] = "fb54962eb68cf22d47a4ae61f0aba993" -SRC_URI[tarball.sha256sum] = "76940cd4e778e8093579a9d195b25fff5e936e9dc6242068528b437a76764f91" +SRC_URI[sha256sum] = "f3ac987522c00d33d44b323cae424e2cffcb4c63c6aa6cd1376edacbf1c36eb0" diff --git a/meta-openeuler/recipes-extended/libmnl/libmnl_%.bbappend b/meta-openeuler/recipes-extended/libmnl/libmnl_%.bbappend index 6873c8ab1b84c37eae89e0ca91e7c21674d452aa..8a4099436e3e2c3c45b1bc6b5ff763ef6282a77f 100644 --- a/meta-openeuler/recipes-extended/libmnl/libmnl_%.bbappend +++ b/meta-openeuler/recipes-extended/libmnl/libmnl_%.bbappend @@ -2,5 +2,9 @@ PV = "1.0.5" +SRC_URI = " \ + file://libmnl-${PV}.tar.bz2;name=tar \ +" + SRC_URI[tar.md5sum] = "0bbb70573119ec5d49435114583e7a49" SRC_URI[tar.sha256sum] = "274b9b919ef3152bfb3da3a13c950dd60d6e2bcd54230ffeca298d03b40d0525" diff --git a/meta-openeuler/recipes-extended/libnsl/libnsl2_%.bbappend b/meta-openeuler/recipes-extended/libnsl/libnsl2_%.bbappend index 575d3c0a9e4cd636ecc693fd5fc69ba1c3e9f04b..7dbdc084c1cca1cb78b59d041319c1e621b02ea3 100644 --- a/meta-openeuler/recipes-extended/libnsl/libnsl2_%.bbappend +++ b/meta-openeuler/recipes-extended/libnsl/libnsl2_%.bbappend @@ -8,12 +8,13 @@ PV = "2.0.0" S = "${WORKDIR}/libnsl-${PV}" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = " \ - " +SRC_URI:remove = " \ + git://github.com/thkukuk/libnsl;branch=master;protocol=https \ +" # files, patches that come from openeuler -SRC_URI += " \ +SRC_URI:append = " \ file://v${PV}.tar.gz \ - " +" SRC_URI[tarball.md5sum] = "e1ee6772c2ee5ddc25ea465a33af3004" SRC_URI[tarball.sha256sum] = "eb37be57c1cf650b3a8a4fc7cd66c8b3dfc06215b41956a16325a9388171bc40" diff --git a/meta-openeuler/recipes-extended/libtirpc/libtirpc_%.bbappend b/meta-openeuler/recipes-extended/libtirpc/libtirpc_%.bbappend index eda44f6dfb8e3b1301d3b3e2c08e556cda770f72..3809e61b76271e09cd1dc17f556c520dbc6e165e 100644 --- a/meta-openeuler/recipes-extended/libtirpc/libtirpc_%.bbappend +++ b/meta-openeuler/recipes-extended/libtirpc/libtirpc_%.bbappend @@ -1,7 +1,9 @@ -PV = "1.3.3" +# the main bb file: yocto-poky/meta/recipes-extended/libtirpc/libtirpc_1.3.2.bb -SRC_URI[sha256sum] = "6474e98851d9f6f33871957ddee9714fdcd9d8a5ee9abb5a98d63ea2e60e12f3" +PV = "1.3.3" -SRC_URI += " \ +SRC_URI = " \ + file://${BP}.tar.bz2 \ file://0001-update-libtirpc-to-enable-tcp-port-listening.patch \ " +SRC_URI[sha256sum] = "6474e98851d9f6f33871957ddee9714fdcd9d8a5ee9abb5a98d63ea2e60e12f3" diff --git a/meta-openeuler/recipes-extended/logrotate/logrotate_%.bbappend b/meta-openeuler/recipes-extended/logrotate/logrotate_%.bbappend index a849fb69ac41b55d3a1634acef3260b8b7ba1d38..0cde6d927f8d8f5fc89ba7c958b030b81f9c5223 100644 --- a/meta-openeuler/recipes-extended/logrotate/logrotate_%.bbappend +++ b/meta-openeuler/recipes-extended/logrotate/logrotate_%.bbappend @@ -5,13 +5,13 @@ PV = "3.20.1" # files, patches can't be applied in openeuler or conflict with openeuler # disable-check-different-filesystems.patch apply to 3.20.1 version fail -SRC_URI_remove = " \ +SRC_URI:remove = " \ https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ file://disable-check-different-filesystems.patch \ " # files, patches that come from openeuler -SRC_URI_prepend = " \ +SRC_URI:prepend = " \ file://${BPN}/${BP}.tar.xz;name=tarball \ file://${BPN}/0001-logrotate-3.20.1-lock-state-msg.patch \ " diff --git a/meta-openeuler/recipes-extended/net-tools/net-tools_%.bbappend b/meta-openeuler/recipes-extended/net-tools/net-tools_%.bbappend index e5020336a772f3c1ea9cd6573dbea52399bd0555..3ee830887fafd83bf888295f3d17a273f10a9a08 100644 --- a/meta-openeuler/recipes-extended/net-tools/net-tools_%.bbappend +++ b/meta-openeuler/recipes-extended/net-tools/net-tools_%.bbappend @@ -4,8 +4,8 @@ PV = "2.10" S = "${WORKDIR}/${BPN}-${PV}" -SRC_URI_remove = "git://git.code.sf.net/p/net-tools/code;protocol=https;branch=master \" -SRC_URI_prepend = "file://${BPN}-${PV}.tar.xz \ +SRC_URI:remove = "git://git.code.sf.net/p/net-tools/code;protocol=https;branch=master \" +SRC_URI:prepend = "file://${BPN}-${PV}.tar.xz \ file://backport-net-tools-cycle.patch \ file://backport-net-tools-man.patch \ " diff --git a/meta-openeuler/recipes-extended/pam/libpam_%.bbappend b/meta-openeuler/recipes-extended/pam/libpam_%.bbappend index c964f40f0a275c55b4020fb1b03c99329394fe6e..15e9d1a9b2bcb88ff8d8383ddf0e82c008d14e76 100644 --- a/meta-openeuler/recipes-extended/pam/libpam_%.bbappend +++ b/meta-openeuler/recipes-extended/pam/libpam_%.bbappend @@ -4,7 +4,7 @@ PV = "1.5.2" OPENEULER_REPO_NAME = "pam" # delete useless patch from old version in poky bb -SRC_URI_remove += " \ +SRC_URI:remove = " \ file://0001-modules-pam_namespace-Makefile.am-correctly-install-.patch \ file://0001-Makefile.am-support-usrmage.patch \ " @@ -18,24 +18,24 @@ SRC_URI += " \ " SRC_URI[sha256sum] = "e4ec7131a91da44512574268f493c6d8ca105c87091691b8e9b56ca685d4f94d" -DEPENDS_remove += "flex" +DEPENDS:remove = "flex" # no coreutils in openeuler -RDEPENDS_${PN}-xtests_remove += " \ +RDEPENDS:${PN}-xtests:remove = " \ coreutils \ " PACKAGES += "${PN}-pkgconfig ${PN}-service" -FILES_${PN}-pkgconfig = "${base_libdir}/pkgconfig" -FILES_${PN}-service = "/usr/lib/systemd/system" +FILES:${PN}-pkgconfig = "${base_libdir}/pkgconfig" +FILES:${PN}-service = "/usr/lib/systemd/system" -RDEPENDS_${PN}-runtime += " \ +RDEPENDS:${PN}-runtime += " \ libpwquality \ ${MLPREFIX}pam-plugin-faillock-${libpam_suffix} \ ${MLPREFIX}pam-plugin-pwhistory-${libpam_suffix} \ " -do_install_append() { +do_install:append() { sed -i -e '0,/^$/s//\ # lock out any user after three unsuccessful attempts and unlock that user after 5 minutes\ auth required pam_faillock.so preauth audit deny=3 even_deny_root unlock_time=300\ diff --git a/meta-openeuler/recipes-extended/parted/parted_%.bbappend b/meta-openeuler/recipes-extended/parted/parted_%.bbappend index 0fa675cc53efc3193163d23e0f83ebc4678085e2..9448246ce22aa336df99a3003528387f5a204dcd 100644 --- a/meta-openeuler/recipes-extended/parted/parted_%.bbappend +++ b/meta-openeuler/recipes-extended/parted/parted_%.bbappend @@ -4,7 +4,7 @@ PV = "3.5" # Use the source packages from openEuler -SRC_URI_remove = " \ +SRC_URI:remove = " \ ${GNU_MIRROR}/parted/parted-${PV}.tar.xz \ " SRC_URI += "file://parted-${PV}.tar.xz \ @@ -20,7 +20,7 @@ SRC_URI += "file://parted-${PV}.tar.xz \ " # the patch check-vfat.patch will result in error -SRC_URI_remove = "file://check-vfat.patch \ +SRC_URI:remove = "file://check-vfat.patch \ " SRC_URI[md5sum] = "336fde60786d5855b3876ee49ef1e6b2" diff --git a/meta-openeuler/recipes-extended/procps/procps_%.bbappend b/meta-openeuler/recipes-extended/procps/procps_%.bbappend index 4a5c781e92b2391715b33667cf2f878205ec96c3..e7c1530969c87410fc5cb9f4468fbf820bd4c1b1 100644 --- a/meta-openeuler/recipes-extended/procps/procps_%.bbappend +++ b/meta-openeuler/recipes-extended/procps/procps_%.bbappend @@ -5,12 +5,12 @@ PV = "4.0.2" S = "${WORKDIR}/procps-ng-${PV}" -FILESEXTRAPATHS_append := "${THISDIR}/procps/:" +FILESEXTRAPATHS:append := "${THISDIR}/procps/:" OPENEULER_REPO_NAME = "procps-ng" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = " \ +SRC_URI:remove = " \ git://gitlab.com/procps-ng/procps.git;protocol=https \ git://gitlab.com/procps-ng/procps.git;protocol=https;branch=master \ file://0001-w.c-correct-musl-builds.patch \ @@ -28,7 +28,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ # file://procps-ng/openeuler-add-M-and-N-options-for-top.patch # file://procps-ng/openeuler-top-exit-with-error-when-pid-overflow.patch # file://procps-ng/skill-Restore-the-p-flag-functionality.patch -do_configure_prepend() { +do_configure:prepend() { # cannot run po/update-potfiles in new version if [ ! -f ${S}/po/update-potfiles ]; then touch ${S}/po/update-potfiles diff --git a/meta-openeuler/recipes-extended/psmisc/psmisc_%.bbappend b/meta-openeuler/recipes-extended/psmisc/psmisc_%.bbappend index b3d65b07e1ac82ed5d7c7c7d71047a714c0cd78f..c1d1a2450fd730fc0c41491ecf88a4337411dd19 100644 --- a/meta-openeuler/recipes-extended/psmisc/psmisc_%.bbappend +++ b/meta-openeuler/recipes-extended/psmisc/psmisc_%.bbappend @@ -1,3 +1,5 @@ +# the main bb file: yocto-poky/meta/recipes-extended/psmisc/psmisc_23.4.bb + # package and patches from openeuler PV = "23.6" @@ -12,7 +14,7 @@ SRC_URI += " \ S = "${WORKDIR}/${BPN}-${PV}" -do_configure_prepend() { +do_configure:prepend() { # cannot run po/update-potfiles in new version if [ ! -f ${S}/po/update-potfiles ]; then touch ${S}/po/update-potfiles diff --git a/meta-openeuler/recipes-extended/quota/quota_%.bbappend b/meta-openeuler/recipes-extended/quota/quota_%.bbappend index c865941dbe5dc2b79d9b7d45d3317071097ed639..0796e9a3ede3601e449bd828d1093918f2926fe5 100644 --- a/meta-openeuler/recipes-extended/quota/quota_%.bbappend +++ b/meta-openeuler/recipes-extended/quota/quota_%.bbappend @@ -5,11 +5,11 @@ PV = "4.06" S = "${WORKDIR}/${BPN}-${PV}" -DEPENDS_remove += "dbus" -PACKAGECONFIG_remove += "tcp-wrappers" +DEPENDS:remove = "dbus" +PACKAGECONFIG:remove = "tcp-wrappers" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = " \ +SRC_URI:remove = " \ ${SOURCEFORGE_MIRROR}/project/linuxquota/quota-tools/${PV}/quota-${PV}.tar.gz \ " # files, patches that come from openeuler diff --git a/meta-openeuler/recipes-extended/rpcbind/rpcbind_%.bbappend b/meta-openeuler/recipes-extended/rpcbind/rpcbind_%.bbappend index d873757046b407a4b867f1d0329066dd8977ada9..545176f519e50a1754f28b428b183ff29f19506e 100644 --- a/meta-openeuler/recipes-extended/rpcbind/rpcbind_%.bbappend +++ b/meta-openeuler/recipes-extended/rpcbind/rpcbind_%.bbappend @@ -5,16 +5,16 @@ PV = "1.2.6" S = "${WORKDIR}/${BPN}-${PV}" -FILESEXTRAPATHS_prepend := "${THISDIR}/files/:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files/:" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = " \ +SRC_URI:remove = " \ ${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \ " # files, patches that come from openeuler # all openeuler systemd patches can't apply, include rpcbind-0.2.4-runstatdir.patch # backport-debian-enable-rmt-calls-with-r.patch is conflict -SRC_URI_append += " \ +SRC_URI:append = " \ file://${BPN}-${PV}.tar.bz2 \ file://bugfix-rpcbind-GETADDR-return-client-ip.patch \ file://fix-CVE-2017-8779.patch \ @@ -22,7 +22,7 @@ SRC_URI_append += " \ file://bugfix-listen-tcp-port-111.patch \ " # safety: set init.d/rpcbind no permission for other users -do_install_append() { +do_install:append() { chmod 0750 ${D}${sysconfdir}/init.d/rpcbind } diff --git a/meta-openeuler/recipes-extended/screen/screen_%.bbappend b/meta-openeuler/recipes-extended/screen/screen_%.bbappend index bbd9cc0d7d8ba4d1e7e9d3cad0a7af9fd3f8e5cf..b0c78ec27a692c9082a9e38588e4067cab8aa18d 100644 --- a/meta-openeuler/recipes-extended/screen/screen_%.bbappend +++ b/meta-openeuler/recipes-extended/screen/screen_%.bbappend @@ -2,11 +2,11 @@ PV = "4.9.0" -SRC_URI_remove = "file://CVE-2021-26937.patch \ +SRC_URI:remove = "file://CVE-2021-26937.patch \ " # files, patches that come from openeuler -SRC_URI_prepend = "file://screen-4.3.1-screenrc.patch \ +SRC_URI:prepend = "file://screen-4.3.1-screenrc.patch \ file://screen-E3.patch \ file://screen-4.3.1-suppress_remap.patch \ file://screen-4.3.1-crypt.patch \ diff --git a/meta-openeuler/recipes-extended/sed/sed_%.bbappend b/meta-openeuler/recipes-extended/sed/sed_%.bbappend index 855427940430c02352f17c8ec156f2a763362a2c..e8fa101b97bbbb4f823ccaadb2341b7bafa109b5 100644 --- a/meta-openeuler/recipes-extended/sed/sed_%.bbappend +++ b/meta-openeuler/recipes-extended/sed/sed_%.bbappend @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ file://sed/sed.h;beginline=1;endline=15;md5=4e8e0f77bc4c1c2c02c2b90d3d24c670 \ " -SRC_URI:remove += " ${GNU_MIRROR}/sed/sed-${PV}.tar.xz " +SRC_URI:remove = " ${GNU_MIRROR}/sed/sed-${PV}.tar.xz " # patches in openeuler SRC_URI += " \ diff --git a/meta-openeuler/recipes-extended/shadow/files/413-0001-Disable-use-of-syslog-for-sysroot.patch b/meta-openeuler/recipes-extended/shadow/files/413-0001-Disable-use-of-syslog-for-sysroot.patch deleted file mode 100644 index fa1532c8317ef563f9bb926984aaee927e5f9782..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-extended/shadow/files/413-0001-Disable-use-of-syslog-for-sysroot.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 85d0444229ee3d14fefcf10d093f49c862826f82 Mon Sep 17 00:00:00 2001 -From: Richard Purdie -Date: Thu, 14 Apr 2022 23:11:53 +0000 -Subject: [PATCH] Disable use of syslog for shadow-native tools - -Disable use of syslog to prevent sysroot user and group additions from -writing entries to the host's syslog. This patch should only be used -with the shadow-native recipe. - -Upstream-Status: Inappropriate [OE specific configuration] -Signed-off-by: Richard Purdie -Signed-off-by: Peter Kjellerstedt - ---- - configure.ac | 2 +- - src/login_nopam.c | 3 ++- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 924254a..603af81 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -191,7 +191,7 @@ AC_DEFINE_UNQUOTED(PASSWD_PROGRAM, "$shadow_cv_passwd_dir/passwd", - [Path to passwd program.]) - - dnl XXX - quick hack, should disappear before anyone notices :). --AC_DEFINE(USE_SYSLOG, 1, [Define to use syslog().]) -+#AC_DEFINE(USE_SYSLOG, 1, [Define to use syslog().]) - if test "$ac_cv_func_ruserok" = "yes"; then - AC_DEFINE(RLOGIN, 1, [Define if login should support the -r flag for rlogind.]) - AC_DEFINE(RUSEROK, 0, [Define to the ruserok() "success" return value (0 or 1).]) -diff --git a/src/login_nopam.c b/src/login_nopam.c -index df6ba88..fc24e13 100644 ---- a/src/login_nopam.c -+++ b/src/login_nopam.c -@@ -29,7 +29,6 @@ - #ifndef USE_PAM - #ident "$Id$" - --#include "prototypes.h" - /* - * This module implements a simple but effective form of login access - * control based on login names and on host (or domain) names, internet -@@ -57,6 +56,8 @@ - #include - #include /* for inet_ntoa() */ - -+#include "prototypes.h" -+ - #if !defined(MAXHOSTNAMELEN) || (MAXHOSTNAMELEN < 64) - #undef MAXHOSTNAMELEN - #define MAXHOSTNAMELEN 256 diff --git a/meta-openeuler/recipes-extended/shadow/files/413-commonio.c-fix-unexpected-open-failure-in-chroot-env.patch b/meta-openeuler/recipes-extended/shadow/files/413-commonio.c-fix-unexpected-open-failure-in-chroot-env.patch deleted file mode 100644 index 85d9175105631cb240195e5da54032904b5e827c..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-extended/shadow/files/413-commonio.c-fix-unexpected-open-failure-in-chroot-env.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 21583da072aa66901d859ac00ce209bac87ddecc Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Thu, 17 Jul 2014 15:53:34 +0800 -Subject: [PATCH] commonio.c-fix-unexpected-open-failure-in-chroot-env - -Upstream-Status: Inappropriate [OE specific] - -commonio.c: fix unexpected open failure in chroot environment - -When using commands with '-R ' option in our pseudo environment, -we would usually get the 'Pemission Denied' error. This patch serves as -a workaround to this problem. - -Note that this patch doesn't change the logic in the code, it just expands -the codes. - -Signed-off-by: Chen Qi - ---- - lib/commonio.c | 16 ++++++++++++---- - 1 file changed, 12 insertions(+), 4 deletions(-) - -diff --git a/lib/commonio.c b/lib/commonio.c -index 9a02ce1..61384ec 100644 ---- a/lib/commonio.c -+++ b/lib/commonio.c -@@ -616,10 +616,18 @@ int commonio_open (struct commonio_db *db, int mode) - db->cursor = NULL; - db->changed = false; - -- fd = open (db->filename, -- (db->readonly ? O_RDONLY : O_RDWR) -- | O_NOCTTY | O_NONBLOCK | O_NOFOLLOW); -- saved_errno = errno; -+ if (db->readonly) { -+ fd = open (db->filename, -+ (true ? O_RDONLY : O_RDWR) -+ | O_NOCTTY | O_NONBLOCK | O_NOFOLLOW); -+ saved_errno = errno; -+ } else { -+ fd = open (db->filename, -+ (false ? O_RDONLY : O_RDWR) -+ | O_NOCTTY | O_NONBLOCK | O_NOFOLLOW); -+ saved_errno = errno; -+ } -+ - db->fp = NULL; - if (fd >= 0) { - #ifdef WITH_TCB diff --git a/meta-openeuler/recipes-extended/shadow/files/login.defs_shadow-sysroot b/meta-openeuler/recipes-extended/shadow/files/login.defs_shadow-sysroot deleted file mode 100644 index 8a68dd341a61cb1ed972db94e45c8555f6423491..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-extended/shadow/files/login.defs_shadow-sysroot +++ /dev/null @@ -1,386 +0,0 @@ -# -# /etc/login.defs - Configuration control definitions for the shadow package. -# -# $Id: login.defs 3038 2009-07-23 20:41:35Z nekral-guest $ -# - -# -# Delay in seconds before being allowed another attempt after a login failure -# Note: When PAM is used, some modules may enfore a minimal delay (e.g. -# pam_unix enforces a 2s delay) -# -FAIL_DELAY 3 - -# -# Enable logging and display of /var/log/faillog login failure info. -# -#FAILLOG_ENAB yes - -# -# Enable display of unknown usernames when login failures are recorded. -# -LOG_UNKFAIL_ENAB no - -# -# Enable logging of successful logins -# -LOG_OK_LOGINS no - -# -# Enable logging and display of /var/log/lastlog login time info. -# -#LASTLOG_ENAB yes - -# -# Enable checking and display of mailbox status upon login. -# -# Disable if the shell startup files already check for mail -# ("mailx -e" or equivalent). -# -##MAIL_CHECK_ENAB yes - -# -# Enable additional checks upon password changes. -# -#OBSCURE_CHECKS_ENAB yes - -# -# Enable checking of time restrictions specified in /etc/porttime. -# -#PORTTIME_CHECKS_ENAB yes - -# -# Enable setting of ulimit, umask, and niceness from passwd gecos field. -# -#QUOTAS_ENAB yes - -# -# Enable "syslog" logging of su activity - in addition to sulog file logging. -# SYSLOG_SG_ENAB does the same for newgrp and sg. -# -SYSLOG_SU_ENAB yes -SYSLOG_SG_ENAB yes - -# -# If defined, either full pathname of a file containing device names or -# a ":" delimited list of device names. Root logins will be allowed only -# upon these devices. -# -CONSOLE /etc/securetty -#CONSOLE console:tty01:tty02:tty03:tty04 - -# -# If defined, all su activity is logged to this file. -# -#SULOG_FILE /var/log/sulog - -# -# If defined, ":" delimited list of "message of the day" files to -# be displayed upon login. -# -#MOTD_FILE /etc/motd -#MOTD_FILE /etc/motd:/usr/lib/news/news-motd - -# -# If defined, this file will be output before each login prompt. -# -#ISSUE_FILE /etc/issue - -# -# If defined, file which maps tty line to TERM environment parameter. -# Each line of the file is in a format something like "vt100 tty01". -# -#TTYTYPE_FILE /etc/ttytype - -# -# If defined, login failures will be logged here in a utmp format. -# last, when invoked as lastb, will read /var/log/btmp, so... -# -#FTMP_FILE /var/log/btmp - -# -# If defined, name of file whose presence which will inhibit non-root -# logins. The contents of this file should be a message indicating -# why logins are inhibited. -# -#NOLOGINS_FILE /etc/nologin - -# -# If defined, the command name to display when running "su -". For -# example, if this is defined as "su" then a "ps" will display the -# command is "-su". If not defined, then "ps" would display the -# name of the shell actually being run, e.g. something like "-sh". -# -SU_NAME su - -# -# *REQUIRED* -# Directory where mailboxes reside, _or_ name of file, relative to the -# home directory. If you _do_ define both, #MAIL_DIR takes precedence. -# -#MAIL_DIR /var/spool/mail -MAIL_FILE .mail - -# -# If defined, file which inhibits all the usual chatter during the login -# sequence. If a full pathname, then hushed mode will be enabled if the -# user's name or shell are found in the file. If not a full pathname, then -# hushed mode will be enabled if the file exists in the user's home directory. -# -HUSHLOGIN_FILE .hushlogin -#HUSHLOGIN_FILE /etc/hushlogins - -# -# If defined, either a TZ environment parameter spec or the -# fully-rooted pathname of a file containing such a spec. -# -#ENV_TZ TZ=CST6CDT -#ENV_TZ /etc/tzname - -# -# If defined, an HZ environment parameter spec. -# -# for Linux/x86 -#ENV_HZ HZ=100 -# For Linux/Alpha... -#ENV_HZ HZ=1024 - -# -# *REQUIRED* The default PATH settings, for superuser and normal users. -# -# (they are minimal, add the rest in the shell startup files) -ENV_SUPATH PATH=/sbin:/bin:/usr/sbin:/usr/bin -ENV_PATH PATH=/bin:/usr/bin - -# -# Terminal permissions -# -# TTYGROUP Login tty will be assigned this group ownership. -# TTYPERM Login tty will be set to this permission. -# -# If you have a "write" program which is "setgid" to a special group -# which owns the terminals, define TTYGROUP to the group number and -# TTYPERM to 0620. Otherwise leave TTYGROUP commented out and assign -# TTYPERM to either 622 or 600. -# -TTYGROUP tty -TTYPERM 0600 - -# -# Login configuration initializations: -# -# ERASECHAR Terminal ERASE character ('\010' = backspace). -# KILLCHAR Terminal KILL character ('\025' = CTRL/U). -# ULIMIT Default "ulimit" value. -# -# The ERASECHAR and KILLCHAR are used only on System V machines. -# The ULIMIT is used only if the system supports it. -# (now it works with setrlimit too; ulimit is in 512-byte units) -# -# Prefix these values with "0" to get octal, "0x" to get hexadecimal. -# -ERASECHAR 0177 -KILLCHAR 025 -#ULIMIT 2097152 - -# Default initial "umask" value for non-PAM enabled systems. -# UMASK is also used by useradd and newusers to set the mode of new home -# directories. -# 022 is the default value, but 027, or even 077, could be considered -# better for privacy. There is no One True Answer here: each sysadmin -# must make up her mind. -UMASK 022 - -# -# Password aging controls: -# -# PASS_MAX_DAYS Maximum number of days a password may be used. -# PASS_MIN_DAYS Minimum number of days allowed between password changes. -# PASS_MIN_LEN Minimum acceptable password length. -# PASS_WARN_AGE Number of days warning given before a password expires. -# -PASS_MAX_DAYS 99999 -PASS_MIN_DAYS 0 -#PASS_MIN_LEN 5 -PASS_WARN_AGE 7 - -# -# If "yes", the user must be listed as a member of the first gid 0 group -# in /etc/group (called "root" on most Linux systems) to be able to "su" -# to uid 0 accounts. If the group doesn't exist or is empty, no one -# will be able to "su" to uid 0. -# -#SU_WHEEL_ONLY no - -# -# If compiled with cracklib support, where are the dictionaries -# -#CRACKLIB_DICTPATH /var/cache/cracklib/cracklib_dict - -# -# Min/max values for automatic uid selection in useradd -# -UID_MIN 1000 -UID_MAX 60000 -# System accounts -SYS_UID_MIN 101 -SYS_UID_MAX 999 - -# -# Min/max values for automatic gid selection in groupadd -# -GID_MIN 1000 -GID_MAX 60000 -# System accounts -SYS_GID_MIN 101 -SYS_GID_MAX 999 - -# -# Max number of login retries if password is bad -# -LOGIN_RETRIES 5 - -# -# Max time in seconds for login -# -LOGIN_TIMEOUT 60 - -# -# Maximum number of attempts to change password if rejected (too easy) -# -#PASS_CHANGE_TRIES 5 - -# -# Warn about weak passwords (but still allow them) if you are root. -# -#PASS_ALWAYS_WARN yes - -# -# Number of significant characters in the password for crypt(). -# Default is 8, don't change unless your crypt() is better. -# Ignored if MD5_CRYPT_ENAB set to "yes". -# -#PASS_MAX_LEN 8 - -# -# Require password before chfn/chsh can make any changes. -# -#CHFN_AUTH yes - -# -# Which fields may be changed by regular users using chfn - use -# any combination of letters "frwh" (full name, room number, work -# phone, home phone). If not defined, no changes are allowed. -# For backward compatibility, "yes" = "rwh" and "no" = "frwh". -# -CHFN_RESTRICT rwh - -# -# Password prompt (%s will be replaced by user name). -# -# XXX - it doesn't work correctly yet, for now leave it commented out -# to use the default which is just "Password: ". -#LOGIN_STRING "%s's Password: " - -# -# Only works if compiled with MD5_CRYPT defined: -# If set to "yes", new passwords will be encrypted using the MD5-based -# algorithm compatible with the one used by recent releases of FreeBSD. -# It supports passwords of unlimited length and longer salt strings. -# Set to "no" if you need to copy encrypted passwords to other systems -# which don't understand the new algorithm. Default is "no". -# -# Note: If you use PAM, it is recommended to use a value consistent with -# the PAM modules configuration. -# -# This variable is deprecated. You should use ENCRYPT_METHOD. -# -#MD5_CRYPT_ENAB no - -# -# Only works if compiled with ENCRYPTMETHOD_SELECT defined: -# If set to MD5 , MD5-based algorithm will be used for encrypting password -# If set to SHA256, SHA256-based algorithm will be used for encrypting password -# If set to SHA512, SHA512-based algorithm will be used for encrypting password -# If set to DES, DES-based algorithm will be used for encrypting password (default) -# Overrides the MD5_CRYPT_ENAB option -# -# Note: If you use PAM, it is recommended to use a value consistent with -# the PAM modules configuration. -# -#ENCRYPT_METHOD DES - -# -# Only works if ENCRYPT_METHOD is set to SHA256 or SHA512. -# -# Define the number of SHA rounds. -# With a lot of rounds, it is more difficult to brute forcing the password. -# But note also that it more CPU resources will be needed to authenticate -# users. -# -# If not specified, the libc will choose the default number of rounds (5000). -# The values must be inside the 1000-999999999 range. -# If only one of the MIN or MAX values is set, then this value will be used. -# If MIN > MAX, the highest value will be used. -# -# SHA_CRYPT_MIN_ROUNDS 5000 -# SHA_CRYPT_MAX_ROUNDS 5000 - -# -# List of groups to add to the user's supplementary group set -# when logging in on the console (as determined by the CONSOLE -# setting). Default is none. -# -# Use with caution - it is possible for users to gain permanent -# access to these groups, even when not logged in on the console. -# How to do it is left as an exercise for the reader... -# -#CONSOLE_GROUPS floppy:audio:cdrom - -# -# Should login be allowed if we can't cd to the home directory? -# Default in no. -# -DEFAULT_HOME yes - -# -# If this file exists and is readable, login environment will be -# read from it. Every line should be in the form name=value. -# -#ENVIRON_FILE /etc/environment - -# -# If defined, this command is run when removing a user. -# It should remove any at/cron/print jobs etc. owned by -# the user to be removed (passed as the first argument). -# -#USERDEL_CMD /usr/sbin/userdel_local - -# -# Enable setting of the umask group bits to be the same as owner bits -# (examples: 022 -> 002, 077 -> 007) for non-root users, if the uid is -# the same as gid, and username is the same as the primary group name. -# -# This also enables userdel to remove user groups if no members exist. -# -USERGROUPS_ENAB yes - -# -# If set to a non-nul number, the shadow utilities will make sure that -# groups never have more than this number of users on one line. -# This permit to support split groups (groups split into multiple lines, -# with the same group ID, to avoid limitation of the line length in the -# group file). -# -# 0 is the default value and disables this feature. -# -#MAX_MEMBERS_PER_GROUP 0 - -# -# If useradd should create home directories for users by default (non -# system users only) -# This option is overridden with the -M or -m flags on the useradd command -# line. -# -CREATE_HOME yes - diff --git a/meta-openeuler/recipes-extended/shadow/files/login_defs_pam.sed b/meta-openeuler/recipes-extended/shadow/files/login_defs_pam.sed deleted file mode 100644 index 0a1f3be4afcdadcc82dcff613a8d6f0250ebff6a..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-extended/shadow/files/login_defs_pam.sed +++ /dev/null @@ -1,32 +0,0 @@ -/^FAILLOG_ENAB/b comment -/^LASTLOG_ENAB/b comment -/^MAIL_CHECK_ENAB/b comment -/^OBSCURE_CHECKS_ENAB/b comment -/^PORTTIME_CHECKS_ENAB/b comment -/^QUOTAS_ENAB/b comment -/^MOTD_FILE/b comment -/^FTMP_FILE/b comment -/^NOLOGINS_FILE/b comment -/^ENV_HZ/b comment -/^ENV_TZ/b comment -/^PASS_MIN_LEN/b comment -/^SU_WHEEL_ONLY/b comment -/^CRACKLIB_DICTPATH/b comment -/^PASS_CHANGE_TRIES/b comment -/^PASS_ALWAYS_WARN/b comment -/^PASS_MAX_LEN/b comment -/^PASS_MIN_LEN/b comment -/^CHFN_AUTH/b comment -/^CHSH_AUTH/b comment -/^ISSUE_FILE/b comment -/^LOGIN_STRING/b comment -/^ULIMIT/b comment -/^ENVIRON_FILE/b comment - -b exit - -: comment - s:^:#: - -: exit - diff --git a/meta-openeuler/recipes-extended/shadow/files/securetty b/meta-openeuler/recipes-extended/shadow/files/securetty deleted file mode 100644 index 2be341a216bc8f346b7e7d88c4d1bc557bb66063..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-extended/shadow/files/securetty +++ /dev/null @@ -1,238 +0,0 @@ -# /etc/securetty: list of terminals on which root is allowed to login. -# See securetty(5) and login(1). -console - -# Standard serial ports -ttyS0 -ttyS1 -ttyS2 -ttyS3 - -# ARM AMBA SoCs -ttyAM0 -ttyAM1 -ttyAM2 -ttyAM3 -ttyAMA0 -ttyAMA1 -ttyAMA2 -ttyAMA3 - -# QCOM Socs -ttyHSL0 -ttyHSL1 -ttyHSL2 -ttyHSL3 -ttyMSM0 -ttyMSM1 -ttyMSM2 - -# Samsung ARM SoCs -ttySAC0 -ttySAC1 -ttySAC2 -ttySAC3 - -# STM SoCs -ttyAS0 -ttyAS1 -ttyAS2 -ttyAS3 - -# TI OMAP SoCs -ttyO0 -ttyO1 -ttyO2 -ttyO3 - -# Xilinx Zynq SoC -ttyPS0 -ttyPS1 - -# USB dongles -ttyUSB0 -ttyUSB1 -ttyUSB2 - -# USB serial gadget -ttyGS0 - -# PowerMac -ttyPZ0 -ttyPZ1 -ttyPZ2 -ttyPZ3 - -# Embedded MPC platforms -ttyPSC0 -ttyPSC1 -ttyPSC2 -ttyPSC3 -ttyPSC4 -ttyPSC5 - -# PA-RISC mux ports -ttyB0 -ttyB1 - -# Standard hypervisor virtual console -hvc0 - -# Oldstyle Xen console -xvc0 - -# Standard consoles -tty1 -tty2 -tty3 -tty4 -tty5 -tty6 -tty7 -tty8 -tty9 -tty10 -tty11 -tty12 -tty13 -tty14 -tty15 -tty16 -tty17 -tty18 -tty19 -tty20 -tty21 -tty22 -tty23 -tty24 -tty25 -tty26 -tty27 -tty28 -tty29 -tty30 -tty31 -tty32 -tty33 -tty34 -tty35 -tty36 -tty37 -tty38 -tty39 -tty40 -tty41 -tty42 -tty43 -tty44 -tty45 -tty46 -tty47 -tty48 -tty49 -tty50 -tty51 -tty52 -tty53 -tty54 -tty55 -tty56 -tty57 -tty58 -tty59 -tty60 -tty61 -tty62 -tty63 - -# Local X displays (allows empty passwords with pam_unix's nullok_secure) -pts/0 -pts/1 -pts/2 -pts/3 - -# Embedded Freescale i.MX ports -ttymxc0 -ttymxc1 -ttymxc2 -ttymxc3 -ttymxc4 -ttymxc5 - -# Freescale lpuart ports -ttyLP0 -ttyLP1 -ttyLP2 -ttyLP3 -ttyLP4 -ttyLP5 - -# Standard serial ports, with devfs -tts/0 -tts/1 - -# Standard consoles, with devfs -vc/1 -vc/2 -vc/3 -vc/4 -vc/5 -vc/6 -vc/7 -vc/8 -vc/9 -vc/10 -vc/11 -vc/12 -vc/13 -vc/14 -vc/15 -vc/16 -vc/17 -vc/18 -vc/19 -vc/20 -vc/21 -vc/22 -vc/23 -vc/24 -vc/25 -vc/26 -vc/27 -vc/28 -vc/29 -vc/30 -vc/31 -vc/32 -vc/33 -vc/34 -vc/35 -vc/36 -vc/37 -vc/38 -vc/39 -vc/40 -vc/41 -vc/42 -vc/43 -vc/44 -vc/45 -vc/46 -vc/47 -vc/48 -vc/49 -vc/50 -vc/51 -vc/52 -vc/53 -vc/54 -vc/55 -vc/56 -vc/57 -vc/58 -vc/59 -vc/60 -vc/61 -vc/62 -vc/63 diff --git a/meta-openeuler/recipes-extended/shadow/files/useradd b/meta-openeuler/recipes-extended/shadow/files/useradd deleted file mode 100644 index 782aeef41879e677ca8409fed499eaee17682916..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-extended/shadow/files/useradd +++ /dev/null @@ -1,8 +0,0 @@ -# useradd defaults file -GROUP=100 -HOME=/home -INACTIVE=-1 -EXPIRE= -SHELL=/bin/sh -SKEL=/etc/skel -CREATE_MAIL_SPOOL=no diff --git a/meta-openeuler/recipes-extended/shadow/shadow_%.bbappend b/meta-openeuler/recipes-extended/shadow/shadow_%.bbappend index 07eb5971c4e9244e44642dca9371e40771949fa8..3700266c1308a2cfa8af1de2e475d9de79b46de6 100644 --- a/meta-openeuler/recipes-extended/shadow/shadow_%.bbappend +++ b/meta-openeuler/recipes-extended/shadow/shadow_%.bbappend @@ -1,24 +1,32 @@ -#main bbfile: yocto-poky/meta/recipes-extended/shadow/shadow_4.8.1.bb -#ref: https://git.yoctoproject.org/poky/tree/meta/recipes-extended/shadow/shadow_4.13.bb +# main bbfile: yocto-poky/meta/recipes-extended/shadow/shadow_4.11.bb OPENEULER_SRC_URI_REMOVE = "https git http" PV = "4.13" -LIC_FILES_CHKSUM = "file://COPYING;md5=c9a450b7be84eac23e6353efecb60b5b \ - file://src/passwd.c;beginline=2;endline=30;md5=758c26751513b6795395275969dd3be1 \ - " +# get extra config files from openeuler(pam.d directory) +FILESEXTRAPATHS:prepend := "${THISDIR}/files/:" -# get extra config files from openeuler -FILESEXTRAPATHS_prepend := "${THISDIR}/files/:" +# outdated patch +SRC_URI:remove = " \ + file://shadow-4.1.3-dots-in-usernames.patch \ + file://shadow-relaxed-usernames.patch \ + " -SRC_URI = "file://${BP}.tar.xz \ - ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ +# delete native patches from poky, patch failed, as it's for 4.11 +SRC_URI:remove:class-native = "file://0001-Drop-nsswitch.conf-message-when-not-in-place-eg.-musl.patch" + +# use openeuler patches +SRC_URI:prepend = "file://${BP}.tar.xz \ file://usermod-unlock.patch \ file://backport-useradd-check-if-subid-range-exists-for-user.patch \ file://shadow-add-sm3-crypt-support.patch \ - file://useradd \ -" + file://backport-Fix-off-by-one-mistakes.patch \ + file://backport-Fix-typos-in-length-calculations.patch \ + file://backport-Correctly-handle-illegal-system-file-in-tz.patch \ + file://backport-Explicitly-override-only-newlines.patch \ + file://backport-Prevent-out-of-boundary-access.patch \ + " # add extra pam files for openeuler # poky shadow.inc have added: chfn chpasswd chsh login newusers passwd su @@ -27,35 +35,12 @@ PAM_SRC_URI += " \ file://login.defs \ " -# delete native patches from poky, patch failed, as it's for 4.8.1 -SRC_URI_remove_class-native = " \ - file://0001-Disable-use-of-syslog-for-sysroot.patch \ - file://0002-Allow-for-setting-password-in-clear-text.patch \ - file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ -" - -# apply 4.13 specific patches, remove these when poky's shadow upgrade to 4.13 -SRC_URI_append_class-native = " \ - file://413-0001-Disable-use-of-syslog-for-sysroot.patch \ - file://413-commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ - file://login.defs \ -" - SRC_URI[sha256sum] = "813057047499c7fe81108adcf0cffa3ad4ec75e19a80151f9cbaa458ff2e86cd" # no ${mandir} installed in openeuler -ALTERNATIVE_${PN}-doc = "" - -do_install_prepend () { - # we use a higher version useradd config from poky honister, these functions have applied: - # * Disable mail creation: "CREATE_MAIL_SPOOL=no" - # * Use users group by default: "GROUP=100" - # see: https://git.yoctoproject.org/poky/tree/meta/recipes-extended/shadow?h=honister - mkdir -p ${D}${sysconfdir}/default/ - install -m 0644 ${WORKDIR}/useradd ${D}${sysconfdir}/default -} +ALTERNATIVE:${PN}-doc = "" -do_install_append () { +do_install:append:class-target () { # use login.defs from openeuler, we have applied these functions as poky: # * Enable CREATE_HOME by default: "CREATE_HOME yes" # * Make the users mailbox in ~/ not /var/spool/mail by default on an embedded system: "MAIL_FILE .mail" and "#MAIL_DIR /var/spool/mail" @@ -95,3 +80,6 @@ do_install_append () { # use /bin/bash as default SHELL sed -i 's:/bin/sh:/bin/bash:g' ${D}${sysconfdir}/default/useradd } + +# keep as 4.13 recipe +PAM_PLUGINS:remove = "pam-plugin-lastlog" diff --git a/meta-openeuler/recipes-extended/sudo/sudo_%.bbappend b/meta-openeuler/recipes-extended/sudo/sudo_%.bbappend new file mode 100644 index 0000000000000000000000000000000000000000..326973eaa7f245997196d8ba20e95d30a6605c37 --- /dev/null +++ b/meta-openeuler/recipes-extended/sudo/sudo_%.bbappend @@ -0,0 +1,15 @@ +# the main bb file: yocto-poky/meta/recipes-extended/sudo/sudo_1.9.13p3.bb + +PV = "1.9.12p2" + +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=7aacba499777b719416b293d16f29c8c" + +SRC_URI:remove = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \ + file://0001-sudo.conf.in-fix-conflict-with-multilib.patch \ +" + +SRC_URI:prepend = "file://${BP}.tar.gz \ + file://backport-CVE-2023-27320.patch \ +" + +SRC_URI[sha256sum] = "b9a0b1ae0f1ddd9be7f3eafe70be05ee81f572f6f536632c44cd4101bb2a8539" diff --git a/meta-openeuler/recipes-extended/tar/tar_%.bbappend b/meta-openeuler/recipes-extended/tar/tar_%.bbappend index 8d7544f09838cdebc971439ff0097f51bbed5242..60e83b1b5077802785b2a1e8f1637da7d4e08e5c 100644 --- a/meta-openeuler/recipes-extended/tar/tar_%.bbappend +++ b/meta-openeuler/recipes-extended/tar/tar_%.bbappend @@ -2,8 +2,8 @@ PV="1.34" # Use the source packages from openEuler -SRC_URI_remove = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2" -SRC_URI_prepend = "file://tar-${PV}.tar.xz \ +SRC_URI:remove = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2" +SRC_URI:prepend = "file://tar-${PV}.tar.xz \ file://backport-CVE-2022-48303.patch \ file://tar-1.28-loneZeroWarning.patch \ file://tar-1.28-vfatTruncate.patch \ diff --git a/meta-openeuler/recipes-extended/wwan/wwan.bb b/meta-openeuler/recipes-extended/wwan/wwan.bb index 137e3b5cae00fbc38a2ceb15d5739f44986c87f6..97a03be28c82530bc5318baf371030ba83ec0f96 100644 --- a/meta-openeuler/recipes-extended/wwan/wwan.bb +++ b/meta-openeuler/recipes-extended/wwan/wwan.bb @@ -9,7 +9,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=801f80980d171dd6425610833a22dbe6" SECTION = "net/misc" -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/patches:${THISDIR}/${PN}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/patches:${THISDIR}/${PN}/files:" SRC_URI += "\ file://wwan.sh \ @@ -28,7 +28,7 @@ do_configure[noexec] = "1" do_compile[noexec] = "1" do_fetch[cleandirs] += "${WORKDIR}/data" -do_install_append() { +do_install:append() { install -dm 0755 ${D}/lib/netifd/proto install -m 0755 ${WORKDIR}/wwan.sh ${D}/lib/netifd/proto/wwan.sh @@ -54,4 +54,4 @@ do_install_append() { done } -FILES_${PN} += "${sysconfidir}/ /lib/" +FILES:${PN} += "${sysconfidir}/ /lib/" diff --git a/meta-openeuler/recipes-extended/xz/xz_%.bbappend b/meta-openeuler/recipes-extended/xz/xz_%.bbappend index 13e7261c32090ab9fb513aa61e9b965266ed90f9..5db32eedcb9b120f7f6fb8dc05928eca5f7509db 100644 --- a/meta-openeuler/recipes-extended/xz/xz_%.bbappend +++ b/meta-openeuler/recipes-extended/xz/xz_%.bbappend @@ -3,7 +3,7 @@ OPENEULER_SRC_URI_REMOVE = "https git http" # Use the source packages from openEuler -SRC_URI_remove = " \ +SRC_URI:remove = " \ " PV = "5.2.10" diff --git a/meta-openeuler/recipes-extended/zstd/zstd_%.bbappend b/meta-openeuler/recipes-extended/zstd/zstd_%.bbappend index 5ba6e194a9ae020f88d88bbdc1e0b5c328075d89..49c6da56287ab67ca58a91a59ca3f8a6cdc99e3c 100644 --- a/meta-openeuler/recipes-extended/zstd/zstd_%.bbappend +++ b/meta-openeuler/recipes-extended/zstd/zstd_%.bbappend @@ -8,10 +8,10 @@ SRC_URI = " \ S = "${WORKDIR}/${BP}" SRC_URI[sha256sum] = "0d9ade222c64e912d6957b11c923e214e2e010a18f39bec102f572e693ba2867" -do_compile_append () { +do_compile:append () { oe_runmake ${PACKAGECONFIG_CONFARGS} ZSTD_LEGACY_SUPPORT=${ZSTD_LEGACY_SUPPORT} -C contrib/pzstd } -do_install_append () { +do_install:append () { oe_runmake install 'DESTDIR=${D}' PREFIX=${prefix} -C contrib/pzstd } diff --git a/meta-openeuler/recipes-external/binutils/binutils-external-cross-canadian.bb b/meta-openeuler/recipes-external/binutils/binutils-external-cross-canadian.bb index 860710ba1990ccbe40f4cca5eb3293d766e19810..579bdf8cd23e2daa569355fb5976c0a4501fb463 100644 --- a/meta-openeuler/recipes-external/binutils/binutils-external-cross-canadian.bb +++ b/meta-openeuler/recipes-external/binutils/binutils-external-cross-canadian.bb @@ -3,13 +3,13 @@ inherit external-toolchain-cross-canadian PN .= "-${TRANSLATED_TARGET_ARCH}" -FILES_${PN} = "\ +FILES:${PN} = "\ ${@' '.join('${bindir}/${EXTERNAL_TARGET_SYS}-' + i for i in '${binutils_binaries}'.split())} \ ${@' '.join('${exec_prefix}/${EXTERNAL_TARGET_SYS}/bin/' + i for i in '${binutils_binaries}'.split())} \ ${exec_prefix}/lib/ldscripts \ " -do_install_append () { +do_install:append () { if [ ! -e ${D}${bindir}/${EXTERNAL_TARGET_SYS}-ld.bfd ]; then ln -s ${EXTERNAL_TARGET_SYS}-ld ${D}${bindir}/${EXTERNAL_TARGET_SYS}-ld.bfd fi diff --git a/meta-openeuler/recipes-external/binutils/binutils-external-cross.bb b/meta-openeuler/recipes-external/binutils/binutils-external-cross.bb index 4fe873d77648ac339392aabcb0bb329b147642e0..3c532a104c180cbfe7d4b1a9db1ef1c626a6f994 100644 --- a/meta-openeuler/recipes-external/binutils/binutils-external-cross.bb +++ b/meta-openeuler/recipes-external/binutils/binutils-external-cross.bb @@ -6,7 +6,7 @@ PROVIDES += "virtual/${TARGET_PREFIX}binutils" EXTERNAL_CROSS_BINARIES = "${binutils_binaries}" -do_install_append () { +do_install:append () { if [ ! -e ${D}${bindir}/${TARGET_PREFIX}ld.bfd ]; then ln -s ${TARGET_PREFIX}ld ${D}${bindir}/${TARGET_PREFIX}ld.bfd fi diff --git a/meta-openeuler/recipes-external/gcc/gcc-external-cross-canadian.bb b/meta-openeuler/recipes-external/gcc/gcc-external-cross-canadian.bb index 0f91aa1aa496d16ca108ebdacf46e410b5a6d969..99d0ac136b8eae1eebc1db18687319a65cc4ad28 100644 --- a/meta-openeuler/recipes-external/gcc/gcc-external-cross-canadian.bb +++ b/meta-openeuler/recipes-external/gcc/gcc-external-cross-canadian.bb @@ -5,8 +5,8 @@ PN .= "-${TRANSLATED_TARGET_ARCH}" BINV = "${GCC_VERSION}" -RDEPENDS_${PN} = "binutils-external-cross-canadian-${TRANSLATED_TARGET_ARCH}" -FILES_${PN} = "\ +RDEPENDS:${PN} = "binutils-external-cross-canadian-${TRANSLATED_TARGET_ARCH}" +FILES:${PN} = "\ ${libdir}/gcc/${EXTERNAL_TARGET_SYS}/${BINV} \ ${libexecdir}/gcc/${EXTERNAL_TARGET_SYS}/${BINV} \ ${libdir}/libcc1* \ @@ -15,7 +15,7 @@ FILES_${PN} = "\ " # no debug package -FILES_${PN}-dbg = "" +FILES:${PN}-dbg = "" # no need do autolibname(handle the dependency of .so libs) # auto_libname in debian.bbclass will call ${TARGET_PREFIX}objdump to get shlibs2 related info # for gcc-external-cross-canadian, can't find ${TARGET_PREFIX}objdump @@ -24,6 +24,6 @@ AUTO_LIBNAME_PKGS = "" external_libroot = "${@os.path.realpath('${EXTERNAL_TOOLCHAIN_LIBROOT}').replace(os.path.realpath('${EXTERNAL_TOOLCHAIN}') + '/', '/')}" FILES_MIRRORS =. "${libdir}/gcc/${EXTERNAL_TARGET_SYS}/${BINV}/|${external_libroot}/\n" -INSANE_SKIP_${PN} += "dev-so staticdev" +INSANE_SKIP:${PN} += "dev-so staticdev" INHIBIT_PACKAGE_STRIP = "1" INHIBIT_SYSROOT_STRIP = "1" diff --git a/meta-openeuler/recipes-external/gcc/gcc-runtime-external.bb b/meta-openeuler/recipes-external/gcc/gcc-runtime-external.bb index d4e0b96be9d7b70314812d189e3c5e79f627cd1b..d75abae07850c23255c9f19bdd50ccd57e163419 100644 --- a/meta-openeuler/recipes-external/gcc/gcc-runtime-external.bb +++ b/meta-openeuler/recipes-external/gcc/gcc-runtime-external.bb @@ -14,6 +14,8 @@ python () { d.setVarFlag('do_populate_lic', 'depends', lic_deps.replace('gcc-source-${PV}:do_unpack', '')) cfg_deps = d.getVarFlag('do_configure', 'depends', False) d.setVarFlag('do_configure', 'depends', cfg_deps.replace('gcc-source-${PV}:do_preconfigure', '')) + epoch_deps = d.getVarFlag('do_deploy_source_date_epoch', 'depends', False) + d.setVarFlag('do_deploy_source_date_epoch', 'depends', epoch_deps.replace('gcc-source-${PV}:do_deploy_source_date_epoch', '')) } target_libdir = "${libdir}" @@ -26,19 +28,19 @@ FILES_MIRRORS =. "\ ${includedir}/c\+\+/${GCC_VERSION}/${TARGET_SYS}/|${includedir}/c++/${GCC_VERSION}/${EXTERNAL_TARGET_SYS}/\n \ " -# The do_install_append in gcc-runtime.inc doesn't do well if the links +# The do_install_added in gcc-runtime.inc doesn't do well if the links # already exist, as it causes a recursion that breaks traversal. python () { - adjusted = d.getVar('do_install_appended').replace('ln -s', 'link_if_no_dest') + adjusted = d.getVar('do_install_added').replace('ln -s', 'link_if_no_dest') adjusted = adjusted.replace('mkdir', 'mkdir_if_no_dest') - d.setVar('do_install_appended', adjusted) + d.setVar('do_install_added', adjusted) } # Because the replace function is called in above anonymous function, -# resulting in that the checksum of do_install_appended will change with the change -# of the build directory and cannot be ignored through do_install_appended[vardepsexclude] += "D" -# Ignore how do_install_appended is computed as a workaround -do_install[vardepsexclude] += "do_install_appended" +# resulting in that the checksum of do_install_added will change with the change +# of the build directory and cannot be ignored through do_install_added[vardepsexclude] += "D" +# Ignore how do_install_added is computed as a workaround +do_install[vardepsexclude] += "do_install_added" link_if_no_dest () { if ! [ -e "$2" ] && ! [ -L "$2" ]; then @@ -75,14 +77,14 @@ do_install_extra () { fi } -FILES_${PN}-dbg += "${datadir}/gdb/python/libstdcxx" -FILES_libstdc++-dev = "\ +FILES:${PN}-dbg += "${datadir}/gdb/python/libstdcxx" +FILES:libstdc++-dev = "\ ${includedir}/c++ \ ${libdir}/libstdc++.so \ ${libdir}/libstdc++.la \ ${libdir}/libsupc++.la \ " -FILES_libgomp-dev += "\ +FILES:libgomp-dev += "\ ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/openacc.h \ " BBCLASSEXTEND = "" @@ -91,13 +93,23 @@ BBCLASSEXTEND = "" # short-circuit the interdependency here by manually specifying it rather than # depending on the libc packagedata. libc_rdep = "${@'${PREFERRED_PROVIDER_virtual/libc}' if '${PREFERRED_PROVIDER_virtual/libc}' else '${TCLIBC}'}" -RDEPENDS_libgomp += "${libc_rdep}" -RDEPENDS_libssp += "${libc_rdep}" -RDEPENDS_libstdc++ += "${libc_rdep}" -RDEPENDS_libatomic += "${libc_rdep}" -RDEPENDS_libquadmath += "${libc_rdep}" -RDEPENDS_libmpx += "${libc_rdep}" +RDEPENDS:libgomp += "${libc_rdep}" +RDEPENDS:libssp += "${libc_rdep}" +RDEPENDS:libstdc++ += "${libc_rdep}" +RDEPENDS:libatomic += "${libc_rdep}" +RDEPENDS:libquadmath += "${libc_rdep}" +RDEPENDS:libmpx += "${libc_rdep}" do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_packagedata" do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_packagedata" do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_packagedata" + +do_deploy_source_date_epoch () { + mkdir -p ${SDE_DEPLOYDIR} + if [ -e ${SDE_FILE} ]; then + echo "Deploying SDE from ${SDE_FILE} -> ${SDE_DEPLOYDIR}." + cp -p ${SDE_FILE} ${SDE_DEPLOYDIR}/__source_date_epoch.txt + else + echo "${SDE_FILE} not found!" + fi +} \ No newline at end of file diff --git a/meta-openeuler/recipes-external/gcc/libgcc-external.bb b/meta-openeuler/recipes-external/gcc/libgcc-external.bb index 05efd59a012fd74bb9559d8b5643870f7687ad8c..1aab7cbb66c09bea0dfb19a866046a263b35b6df 100644 --- a/meta-openeuler/recipes-external/gcc/libgcc-external.bb +++ b/meta-openeuler/recipes-external/gcc/libgcc-external.bb @@ -12,13 +12,13 @@ LICENSE = "GPL-3.0-with-GCC-exception" # libgcc needs libc, but glibc's utilities need libgcc, so short-circuit the # interdependency here by manually specifying it rather than depending on the # libc packagedata. -RDEPENDS_${PN} += "${@'${PREFERRED_PROVIDER_virtual/libc}' if '${PREFERRED_PROVIDER_virtual/libc}' else '${TCLIBC}'}" -INSANE_SKIP_${PN} += "build-deps file-rdeps" +RDEPENDS:${PN} += "${@'${PREFERRED_PROVIDER_virtual/libc}' if '${PREFERRED_PROVIDER_virtual/libc}' else '${TCLIBC}'}" +INSANE_SKIP:${PN} += "build-deps file-rdeps" # The dynamically loadable files belong to libgcc, since we really don't need the static files # on the target, moreover linker won't be able to find them there (see original libgcc.bb recipe). BINV = "${GCC_VERSION}" -FILES_${PN} = "${base_libdir}/libgcc_s.so.*" +FILES:${PN} = "${base_libdir}/libgcc_s.so.*" # TODO: these crt*.o and libgcc* no need for target, and sdk will contains these files not through package-libgcc. # So i think libgcc packages could not contain these files. Just remove its. @@ -30,14 +30,14 @@ FILES_${PN} = "${base_libdir}/libgcc_s.so.*" # makes a error when do_packages. so we just need crt*.o and libgcc* files. LIBROOT_RELATIVE_RESOLVED = "${@os.path.relpath(os.path.realpath('${EXTERNAL_TOOLCHAIN_LIBROOT}'), os.path.realpath('${EXTERNAL_TOOLCHAIN}'))}" LIBROOT_RELATIVE = "${@os.path.relpath('${EXTERNAL_TOOLCHAIN_LIBROOT}', '${EXTERNAL_TOOLCHAIN}')}" -FILES_${PN}-dev = "${base_libdir}/libgcc_s.so \ +FILES:${PN}-dev = "${base_libdir}/libgcc_s.so \ /${LIBROOT_RELATIVE_RESOLVED}/crt*.o \ /${LIBROOT_RELATIVE_RESOLVED}/libgcc* \ /${LIBROOT_RELATIVE}/crt*.o \ /${LIBROOT_RELATIVE}/libgcc* \ " -INSANE_SKIP_${PN}-dev += "staticdev" -FILES_${PN}-dbg += "${base_libdir}/.debug/libgcc_s.so.*.debug" +INSANE_SKIP:${PN}-dev += "staticdev" +FILES:${PN}-dbg += "${base_libdir}/.debug/libgcc_s.so.*.debug" # Follow any symlinks in the libroot (multilib build) to the main # libroot and include any symlinks there that link to our libroot. @@ -64,7 +64,7 @@ python add_ml_symlink_tcmode-external () { other = other_child.parent.resolve() / other_child.name relpath = other.relative_to(sysroot) d.appendVar('SYSROOT_DIRS', ' /' + str(relpath.parent)) - d.appendVar('FILES_${PN}-dev', ' /' + str(relpath)) + d.appendVar('FILES:${PN}-dev', ' /' + str(relpath)) } add_ml_symlink[eventmask] = "bb.event.RecipePreFinalise" addhandler add_ml_symlink @@ -87,5 +87,5 @@ python add_sys_symlink () { target_sys = pathlib.Path(d.expand('${D}${libdir}/${TARGET_SYS}')) if target_sys.exists(): pn = d.getVar('PN') - d.appendVar('FILES_%s-dev' % pn, ' ${libdir}/${TARGET_SYS}') + d.appendVar('FILES:%s-dev' % pn, ' ${libdir}/${TARGET_SYS}') } diff --git a/meta-openeuler/recipes-external/gcc/libgfortran-external.bb b/meta-openeuler/recipes-external/gcc/libgfortran-external.bb index c125b9857579464fdc8acf3d2bdd8b865261b9b3..f6dd59a32b96dcabe31fbd0de451af5ad769f7c1 100644 --- a/meta-openeuler/recipes-external/gcc/libgfortran-external.bb +++ b/meta-openeuler/recipes-external/gcc/libgfortran-external.bb @@ -12,8 +12,8 @@ LICENSE = "GPL-3.0-with-GCC-exception" BINV = "${GCC_VERSION}" LIBROOT_RELATIVE = "${@os.path.relpath('${EXTERNAL_TOOLCHAIN_LIBROOT}', '${EXTERNAL_TOOLCHAIN}')}" -FILES_${PN} = "${base_libdir}/libgfortran.so.*" -FILES_${PN}-dev = "\ +FILES:${PN} = "${base_libdir}/libgfortran.so.*" +FILES:${PN}-dev = "\ ${base_libdir}/libgfortran*.so \ ${base_libdir}/libgfortran.spec \ ${base_libdir}/libgfortran.la \ @@ -22,5 +22,5 @@ FILES_${PN}-dev = "\ ${LIBROOT_RELATIVE}/finclude/ \ ${LIBROOT_RELATIVE}/include/ \ " -INSANE_SKIP_${PN}-dev += "staticdev" -FILES_${PN}-staticdev = "${libdir}/libgfortran.a" +INSANE_SKIP:${PN}-dev += "staticdev" +FILES:${PN}-staticdev = "${libdir}/libgfortran.a" diff --git a/meta-openeuler/recipes-external/glibc/glibc-external-version.inc b/meta-openeuler/recipes-external/glibc/glibc-external-version.inc index b31d4cdd9767f8ba8e6f73ca6bf89c882948995a..97958e8ac4f130963acf3ae7106b0b085950e0a5 100644 --- a/meta-openeuler/recipes-external/glibc/glibc-external-version.inc +++ b/meta-openeuler/recipes-external/glibc/glibc-external-version.inc @@ -13,4 +13,4 @@ def get_external_libc_version(d): return 'UNKNOWN' -PV_tcmode-external := "${@get_external_libc_version(d)}" +PV:tcmode-external := "${@get_external_libc_version(d)}" diff --git a/meta-openeuler/recipes-external/glibc/glibc-external.bb b/meta-openeuler/recipes-external/glibc/glibc-external.bb index df7c49ca7dcc9ff33d4b4d5f10da5154a7159c19..8ed9704ee97f6e2a001827131c3228e1143b35c6 100644 --- a/meta-openeuler/recipes-external/glibc/glibc-external.bb +++ b/meta-openeuler/recipes-external/glibc/glibc-external.bb @@ -41,7 +41,7 @@ def get_external_libc_license(d): return 'UNKNOWN' -LICENSE_tcmode-external := "${@get_external_libc_license(d)}" +LICENSE:tcmode-external := "${@get_external_libc_license(d)}" require recipes-external/glibc/glibc-sysroot-setup.inc require recipes-external/glibc/glibc-package-adjusted.inc @@ -137,7 +137,7 @@ glibc_external_do_install_extra () { fi } -bberror_task-install () { +bberror:task-install () { # Silence any errors from oe_multilib_header, as we don't care about # missing multilib headers, as the oe-core glibc version isn't necessarily # the same as our own. @@ -153,12 +153,12 @@ EXTERNAL_EXTRA_FILES += "\ # These files are picked up out of the sysroot by glibc-locale, so we don't # need to keep them around ourselves. -do_install_locale_append() { +do_install_locale:append() { rm -rf ${D}${localedir} } python () { - # Undo the do_install_append which joined shell to python + # Undo the do_install:append which joined shell to python install = d.getVar('do_install', False) python, shell = install.split('# sentinel', 1) d.setVar('do_install_glibc', shell) @@ -174,7 +174,7 @@ python () { } # Default pattern is too greedy -FILES_${PN}-utils = "\ +FILES:${PN}-utils = "\ ${bindir}/gencat \ ${bindir}/getconf \ ${bindir}/getent \ @@ -187,10 +187,10 @@ FILES_${PN}-utils = "\ ${bindir}/pldd \ ${bindir}/sprof \ " -FILES_${PN}-doc += "${infodir}/libc.info*" +FILES:${PN}-doc += "${infodir}/libc.info*" # Extract for use by do_install_locale -FILES_${PN} += "\ +FILES:${PN} += "\ ${bindir}/localedef \ ${libdir}/gconv \ ${libdir}/locale \ @@ -199,25 +199,25 @@ FILES_${PN} += "\ " #For riscv64 -FILES_${PN} += "\ +FILES:${PN} += "\ ${libdir}/lp64d \ ${base_libdir}/lp64d \ " -FILES_${PN}-dev_remove := "${datadir}/aclocal" +FILES:${PN}-dev:remove := "${datadir}/aclocal" # use base_libdir to replace /lib -FILES_${PN}-dev_remove = "${base_libdir}/*.o" -FILES_${PN}-dev += "${libdir}/*crt*.o" +FILES:${PN}-dev:remove = "${base_libdir}/*.o" +FILES:${PN}-dev += "${libdir}/*crt*.o" # currently no dbg fils for glibc-external -FILES_${PN}-dbg = "" +FILES:${PN}-dbg = "" # no strip .o files used for startup, as user space app may need symbol information # here INHIBIT_PACKAGE_STRIP is no need to set to 1, # because poky package.bbclass will not strip the file with no executable permission except .so or .node linux_include_subdirs = "asm asm-generic bits drm linux mtd rdma sound sys video" -FILES_${PN}-dev += "${@' '.join('${includedir}/%s' % d for d in '${linux_include_subdirs}'.split())}" +FILES:${PN}-dev += "${@' '.join('${includedir}/%s' % d for d in '${linux_include_subdirs}'.split())}" # Already multilib headers for oe sdks libc_baselibs_dev += "\ @@ -225,27 +225,27 @@ libc_baselibs_dev += "\ ${includedir}/ieee754-*.h \ " libc_baselibs_dev += "${@' '.join('${libdir}/' + os.path.basename(l.replace('${SOLIBS}', '${SOLIBSDEV}')) for l in '${libc_baselibs}'.replace('${base_libdir}/ld*${SOLIBS}', '').split() if l.endswith('${SOLIBS}'))}" -FILES_${PN}-staticdev = "\ +FILES:${PN}-staticdev = "\ ${@'${libc_baselibs_dev}'.replace('${SOLIBSDEV}', '.a')} \ ${libdir}/libg.a \ ${libdir}/libieee.a \ ${libdir}/libmcheck.a \ " -FILES_${PN}-dev += "\ +FILES:${PN}-dev += "\ ${libc_baselibs_dev} \ ${libdir}/libcidn${SOLIBSDEV} \ ${libdir}/libthread_db${SOLIBSDEV} \ ${libdir}/libpthread${SOLIBSDEV} \ " libc_headers_file = "${@bb.utils.which('${FILESPATH}', 'libc.headers')}" -FILES_${PN}-dev += "\ +FILES:${PN}-dev += "\ ${@' '.join('${includedir}/' + f.rstrip() for f in oe.utils.read_file('${libc_headers_file}').splitlines())} \ ${includedir}/fpu_control.h \ ${includedir}/stdc-predef.h \ ${includedir}/uchar.h \ " -FILES_${PN}-dev[file-checksums] += "${libc_headers_file}:True" +FILES:${PN}-dev[file-checksums] += "${libc_headers_file}:True" # glibc's utils need libgcc do_package[depends] += "${MLPREFIX}libgcc:do_packagedata" @@ -258,7 +258,7 @@ do_packagedata[depends] += "gcc-runtime:do_packagedata" # We don't need linux-libc-headers LINUX_LIBC_RDEP_REMOVE ?= "linux-libc-headers-dev" -RDEPENDS_${PN}-dev_remove = "${LINUX_LIBC_RDEP_REMOVE}" +RDEPENDS:${PN}-dev:remove = "${LINUX_LIBC_RDEP_REMOVE}" -FILES_${PN}-dev_remove = "${base_libdir}/*_nonshared.a ${libdir}/*_nonshared.a" -FILES_${PN}-dev += "${libdir}/libc_nonshared.a ${libdir}/libpthread_nonshared.a ${libdir}/libmvec_nonshared.a" +FILES:${PN}-dev:remove = "${base_libdir}/*_nonshared.a ${libdir}/*_nonshared.a" +FILES:${PN}-dev += "${libdir}/libc_nonshared.a ${libdir}/libpthread_nonshared.a ${libdir}/libmvec_nonshared.a" diff --git a/meta-openeuler/recipes-external/glibc/glibc-package-adjusted.inc b/meta-openeuler/recipes-external/glibc/glibc-package-adjusted.inc index 528e7d9ebeef1e1aa887b5834bf71ec854ed32aa..78e8f2ed8be3ba0c45b11bb2d086c1c5579a5939 100644 --- a/meta-openeuler/recipes-external/glibc/glibc-package-adjusted.inc +++ b/meta-openeuler/recipes-external/glibc/glibc-package-adjusted.inc @@ -1,24 +1,24 @@ require recipes-core/glibc/glibc-package.inc -PKG_${PN} = "glibc" -RPROVIDES_${PN} += "${TCLIBC} glibc" -PKG_${PN}-dbg = "glibc-dbg" -RPROVIDES_${PN}-dbg += "${TCLIBC}-dbg glibc-dbg" -PKG_${PN}-dev = "glibc-dev" -RPROVIDES_${PN}-dev += "${TCLIBC}-dev glibc-dev" -PKG_${PN}-doc = "glibc-doc" -RPROVIDES_${PN}-doc += "${TCLIBC}-doc glibc-doc" -PKG_${PN}-gconv = "glibc-gconv" -RPROVIDES_${PN}-gconv += "${TCLIBC}-gconv glibc-gconv" -PKG_${PN}-mtrace = "glibc-mtrace" -RPROVIDES_${PN}-mtrace += "${TCLIBC}-mtrace glibc-mtrace" -PKG_${PN}-pcprofile = "glibc-pcprofile" -RPROVIDES_${PN}-pcprofile += "${TCLIBC}-pcprofile glibc-pcprofile" -PKG_${PN}-pic = "glibc-pic" -RPROVIDES_${PN}-pic += "${TCLIBC}-pic glibc-pic" -PKG_${PN}-staticdev = "glibc-staticdev" -RPROVIDES_${PN}-staticdev += "${TCLIBC}-staticdev glibc-staticdev" -PKG_${PN}-thread-db = "glibc-thread-db" -RPROVIDES_${PN}-thread-db += "${TCLIBC}-thread-db glibc-thread-db" -PKG_${PN}-utils = "glibc-utils" -RPROVIDES_${PN}-utils += "${TCLIBC}-utils glibc-utils" +PKG:${PN} = "glibc" +RPROVIDES:${PN} += "${TCLIBC} glibc" +PKG:${PN}-dbg = "glibc-dbg" +RPROVIDES:${PN}-dbg += "${TCLIBC}-dbg glibc-dbg" +PKG:${PN}-dev = "glibc-dev" +RPROVIDES:${PN}-dev += "${TCLIBC}-dev glibc-dev" +PKG:${PN}-doc = "glibc-doc" +RPROVIDES:${PN}-doc += "${TCLIBC}-doc glibc-doc" +PKG:${PN}-gconv = "glibc-gconv" +RPROVIDES:${PN}-gconv += "${TCLIBC}-gconv glibc-gconv" +PKG:${PN}-mtrace = "glibc-mtrace" +RPROVIDES:${PN}-mtrace += "${TCLIBC}-mtrace glibc-mtrace" +PKG:${PN}-pcprofile = "glibc-pcprofile" +RPROVIDES:${PN}-pcprofile += "${TCLIBC}-pcprofile glibc-pcprofile" +PKG:${PN}-pic = "glibc-pic" +RPROVIDES:${PN}-pic += "${TCLIBC}-pic glibc-pic" +PKG:${PN}-staticdev = "glibc-staticdev" +RPROVIDES:${PN}-staticdev += "${TCLIBC}-staticdev glibc-staticdev" +PKG:${PN}-thread-db = "glibc-thread-db" +RPROVIDES:${PN}-thread-db += "${TCLIBC}-thread-db glibc-thread-db" +PKG:${PN}-utils = "glibc-utils" +RPROVIDES:${PN}-utils += "${TCLIBC}-utils glibc-utils" diff --git a/meta-openeuler/recipes-external/glibc/glibc-sysroot-setup.inc b/meta-openeuler/recipes-external/glibc/glibc-sysroot-setup.inc index 2a46820a044c260d90fcaae57bda895ce9ad2f0e..456e4d3f8d253ad4aebaa061188f695a057b57df 100644 --- a/meta-openeuler/recipes-external/glibc/glibc-sysroot-setup.inc +++ b/meta-openeuler/recipes-external/glibc/glibc-sysroot-setup.inc @@ -1,6 +1,6 @@ # stash_locale_cleanup removes the empty /usr/lib after stashing the locale # files to avoid remnant clutter, but we need it in the sysroot -stash_locale_sysroot_cleanup_append() { +stash_locale_sysroot_cleanup:append() { # If the usr/lib directory doesn't exist, the toolchain fails to even # try to find crti.o in a completely different directory (usr/lib64) install -d ${SYSROOT_DESTDIR}${nonarch_libdir} diff --git a/meta-openeuler/recipes-external/libnsl/libnsl2-external.bb b/meta-openeuler/recipes-external/libnsl/libnsl2-external.bb index 649d69b9fd6fc722f6d6d6b9b96cb6fc99eb9676..63fd5a990f60027a3de5d6a9959cc941be3364d0 100644 --- a/meta-openeuler/recipes-external/libnsl/libnsl2-external.bb +++ b/meta-openeuler/recipes-external/libnsl/libnsl2-external.bb @@ -17,12 +17,12 @@ inherit external-toolchain # toolchain after necessary optimization. PN = "libnsl2-openeuler-external" -FILES_${PN} = "${libdir}/libnsl*.so.* ${libdir}/libnsl-*.so" -FILES_${PN}-dev = "${libdir}/libnsl.so ${includedir}/rpcsvc/nis*.h ${includedir}/rpcsvc/yp*.h" -FILES_${PN}-staticdev = "${libdir}/libnsl.a" +FILES:${PN} = "${libdir}/libnsl*.so.* ${libdir}/libnsl-*.so" +FILES:${PN}-dev = "${libdir}/libnsl.so ${includedir}/rpcsvc/nis*.h ${includedir}/rpcsvc/yp*.h" +FILES:${PN}-staticdev = "${libdir}/libnsl.a" libc_rdep = "${@'${PREFERRED_PROVIDER_virtual/libc}' if d.getVar('PREFERRED_PROVIDER_virtual/libc') else '${TCLIBC}'}" -RDEPENDS_${PN} += "${libc_rdep}" +RDEPENDS:${PN} += "${libc_rdep}" do_install_extra () { # Depending on whether this comes from the standalone libnsl2 or glibc, the diff --git a/meta-openeuler/recipes-external/libxcrypt/libxcrypt-external.bb b/meta-openeuler/recipes-external/libxcrypt/libxcrypt-external.bb index 01c011cac83be6ca79fc769858de01ed7ee9af22..7d8e26681a88a7ab9463d4aa5b49a579ffa75337 100644 --- a/meta-openeuler/recipes-external/libxcrypt/libxcrypt-external.bb +++ b/meta-openeuler/recipes-external/libxcrypt/libxcrypt-external.bb @@ -10,14 +10,14 @@ inherit external-toolchain EXTERNAL_PROVIDE_PATTERN = "${libdir}/libcrypt*.so.*" libc_rdep = "${@'${PREFERRED_PROVIDER_virtual/libc}' if '${PREFERRED_PROVIDER_virtual/libc}' else '${TCLIBC}'}" -RDEPENDS_${PN} += "${libc_rdep}" +RDEPENDS:${PN} += "${libc_rdep}" -FILES_${PN} = "${base_libdir}/libcrypt*.so.* \ +FILES:${PN} = "${base_libdir}/libcrypt*.so.* \ ${libdir}/libcrypt-*.so \ ${libdir}/libowcrypt*.so.* \ ${libdir}/libowcrypt-*.so \ " -FILES_${PN}-dev = "\ +FILES:${PN}-dev = "\ ${libdir}/libcrypt.so \ ${libdir}/libowcrypt.so \ ${includedir}/crypt.h \ diff --git a/meta-openeuler/recipes-external/sdk-env-external-toolchain/sdk-env-external-toolchain.bb b/meta-openeuler/recipes-external/sdk-env-external-toolchain/sdk-env-external-toolchain.bb index 12230a6cb6915e28349827e812b4bd73f1041a9b..9928c97b03e6d648140c4ad65cc0871c6d054a72 100644 --- a/meta-openeuler/recipes-external/sdk-env-external-toolchain/sdk-env-external-toolchain.bb +++ b/meta-openeuler/recipes-external/sdk-env-external-toolchain/sdk-env-external-toolchain.bb @@ -9,4 +9,4 @@ do_install () { install -m 0644 -o root -g root "${WORKDIR}/external.sh" "${D}/environment-setup.d/" } -FILES_${PN} += "/environment-setup.d/*" +FILES:${PN} += "/environment-setup.d/*" diff --git a/meta-openeuler/recipes-gnome/gobject-introspection/files/0001-Relocate-the-repository-directory-for-native-builds.patch b/meta-openeuler/recipes-gnome/gobject-introspection/files/0001-Relocate-the-repository-directory-for-native-builds.patch deleted file mode 100644 index ba965092e1430cbd8c0327ae2d29d73d4076333c..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-gnome/gobject-introspection/files/0001-Relocate-the-repository-directory-for-native-builds.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 74a0fee892235c722ac60ddea6ee79bc3d7a93f5 Mon Sep 17 00:00:00 2001 -From: Sascha Silbe -Date: Fri, 8 Jun 2018 13:55:10 +0200 -Subject: [PATCH] Relocate the repository directory for native builds - -Instead of hard-coding GOBJECT_INTROSPECTION_LIBDIR when -gobject-introspection is built, use dladdr() to determine where -GOBJECT_INTROSPECTION_LIBDIR is and use that path to calculate the -repository directory. - -This fixes gobject-introspection-native accessing paths across build -directories (e.g. if the build directories use the same shared state -cache or sstate mirror). - -Upstream-Status: Inappropriate -Signed-off-by: Sascha Silbe - ---- - girepository/girepository.c | 15 +++++++++++++-- - girepository/meson.build | 2 +- - 2 files changed, 14 insertions(+), 3 deletions(-) - -diff --git a/girepository/girepository.c b/girepository/girepository.c -index 7d03485..20f4813 100644 ---- a/girepository/girepository.c -+++ b/girepository/girepository.c -@@ -21,6 +21,8 @@ - * Boston, MA 02111-1307, USA. - */ - -+#define _GNU_SOURCE -+ - #include "config.h" - - #include -@@ -34,6 +36,8 @@ - #include "gitypelib-internal.h" - #include "girepository-private.h" - -+#include -+ - /** - * SECTION:girepository - * @short_description: GObject Introspection repository manager -@@ -215,9 +219,16 @@ init_globals (void) - g_free (custom_dirs); - } - -- libdir = GOBJECT_INTROSPECTION_LIBDIR; -+ Dl_info gi_lib_info; - -- typelib_dir = g_build_filename (libdir, "girepository-1.0", NULL); -+ if (dladdr (g_irepository_get_default, &gi_lib_info)) { -+ char *libdir = g_path_get_dirname (gi_lib_info.dli_fname); -+ typelib_dir = g_build_filename (libdir, "girepository-1.0", NULL); -+ g_free (libdir); -+ } else { -+ libdir = GOBJECT_INTROSPECTION_LIBDIR; -+ typelib_dir = g_build_filename (libdir, "girepository-1.0", NULL); -+ } - - typelib_search_path = g_slist_prepend (typelib_search_path, typelib_dir); - -diff --git a/girepository/meson.build b/girepository/meson.build -index 786749a..15cf2a9 100644 ---- a/girepository/meson.build -+++ b/girepository/meson.build -@@ -45,7 +45,7 @@ girepo_internals_lib = static_library('girepository-internals', - ], - c_args: gi_hidden_visibility_cflags + custom_c_args, - include_directories : configinc, -- dependencies: [girepo_gthash_dep, libffi_dep], -+ dependencies: [girepo_gthash_dep, libffi_dep, cc.find_library('dl')], - ) - - girepo_internals_dep = declare_dependency( diff --git a/meta-openeuler/recipes-gnome/gobject-introspection/files/0001-g-ir-tool-template.in-fix-girdir-path.patch b/meta-openeuler/recipes-gnome/gobject-introspection/files/0001-g-ir-tool-template.in-fix-girdir-path.patch deleted file mode 100644 index 5c78649de48875f47101fd25ca6a9c41535579de..0000000000000000000000000000000000000000 --- a/meta-openeuler/recipes-gnome/gobject-introspection/files/0001-g-ir-tool-template.in-fix-girdir-path.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b01b448613b76f9acefdfd89ee01686dc7a67df4 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Tue, 13 Jul 2021 02:05:11 -0700 -Subject: [PATCH] g-ir-tool-template.in: fix girdir path - -In case gir_dir_prefix is set, it's possible that g-ir-scanner -cannot find the .gir files. This is because that the girdir -is set to gir_dir_prefix, which is wrong. It's not a prefix, -it the actual gir dir. - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/329] - -Signed-off-by: Chen Qi ---- - tools/g-ir-tool-template.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/g-ir-tool-template.in b/tools/g-ir-tool-template.in -index 6e98f52e..62c07c31 100755 ---- a/tools/g-ir-tool-template.in -+++ b/tools/g-ir-tool-template.in -@@ -55,7 +55,7 @@ builtins.__dict__['DATADIR'] = datadir - - # Respect gir_dir_prefix - girdir = '' --girdir = os.path.abspath(os.path.join(filedir, '..', '@gir_dir_prefix@')) -+girdir = os.path.abspath(os.path.join(filedir, '..', '@gir_dir_prefix@', 'gir-1.0')) - builtins.__dict__['GIRDIR'] = [girdir] - - # Again, relative paths first so that the installation prefix is relocatable --- -2.30.2 - diff --git a/meta-openeuler/recipes-gnome/gobject-introspection/gobject-introspection_%.bbappend b/meta-openeuler/recipes-gnome/gobject-introspection/gobject-introspection_%.bbappend index 7924749f074c5468e69beba08d51013d1150df17..ebc505e8f372e7ab9c4fb53cf623721542e25e26 100644 --- a/meta-openeuler/recipes-gnome/gobject-introspection/gobject-introspection_%.bbappend +++ b/meta-openeuler/recipes-gnome/gobject-introspection/gobject-introspection_%.bbappend @@ -2,24 +2,5 @@ PV = "1.72.0" # openEuler-23.03 version is 1.74.0, but gobject-introspection-native depends glib2 at least 2.74 version. # nativesdk provides glib2 is too old to compile, so do not update package version now. -OPENEULER_BRANCH = "openEuler-22.09" -DEPENDS_remove_class-target = "prelink-native" - -# apply new patch for 1.72.0 from poky -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \ - file://0001-g-ir-tool-template.in-fix-girdir-path.patch \ - " - -SRC_URI[sha256sum] = "02fe8e590861d88f83060dd39cda5ccaa60b2da1d21d0f95499301b186beaabc" - -do_configure_append_class-target() { - # delete prelink-rtld - cat > ${B}/g-ir-scanner-lddwrapper << EOF -#!/bin/sh -\$OBJDUMP -p "\$@" -EOF -} - -RDEPENDS_${PN}_remove_class-native = "python3-pickle python3-xml" +RDEPENDS:${PN}:remove:class-native = "python3-pickle python3-xml" diff --git a/meta-openeuler/recipes-graphics/cairo/cairo_%.bbappend b/meta-openeuler/recipes-graphics/cairo/cairo_%.bbappend index 95bce29fd2ac157411d17758eb5ff5bfc51dafd6..32ce7a567abe20d76304014e8842b0f11a4899d1 100644 --- a/meta-openeuler/recipes-graphics/cairo/cairo_%.bbappend +++ b/meta-openeuler/recipes-graphics/cairo/cairo_%.bbappend @@ -1,11 +1,11 @@ # version in src-openEuler PV = "1.17.4" -SRC_URI_remove = "file://CVE-2018-19876.patch \ +SRC_URI:remove = "file://CVE-2018-19876.patch \ file://CVE-2020-35492.patch \ " -SRC_URI_prepend = "file://0001-Set-default-LCD-filter-to-FreeType-s-default.patch \ +SRC_URI:prepend = "file://0001-Set-default-LCD-filter-to-FreeType-s-default.patch \ file://backport-CVE-2020-35492.patch \ " diff --git a/meta-openeuler/recipes-graphics/drm/libdrm_%.bbappend b/meta-openeuler/recipes-graphics/drm/libdrm_%.bbappend index 858d8310a588dc96fb1042fde23c9b038616b8a5..2681a4971cea0dc4cfc0b2308f9e69a35f972f5a 100644 --- a/meta-openeuler/recipes-graphics/drm/libdrm_%.bbappend +++ b/meta-openeuler/recipes-graphics/drm/libdrm_%.bbappend @@ -2,14 +2,15 @@ PV = "2.4.109" -DEPENDS_remove = "python3-native libpthread-stubs" -PACKAGECONFIG_remove = "intel" +DEPENDS:remove = "python3-native libpthread-stubs" +PACKAGECONFIG:remove = "intel" -SRC_URI_prepend = "file://libdrm-make-dri-perms-okay.patch \ +SRC_URI:prepend = "file://libdrm-make-dri-perms-okay.patch \ file://libdrm-2.4.0-no-bc.patch \ " -SRC_URI_remove = "file://0001-meson-Also-search-for-rst2man.py.patch \ +SRC_URI:remove = "file://0001-meson-Also-search-for-rst2man.py.patch \ " SRC_URI[sha256sum] = "629352e08c1fe84862ca046598d8a08ce14d26ab25ee1f4704f993d074cb7f26" + diff --git a/meta-openeuler/recipes-graphics/fontconfig/fontconfig_%.bbappend b/meta-openeuler/recipes-graphics/fontconfig/fontconfig_%.bbappend index 5c78a8c7977b7eec13679b45cca69bc56df703b9..ab2c66200ffb37f13f8f03ab9183db037204bbf8 100644 --- a/meta-openeuler/recipes-graphics/fontconfig/fontconfig_%.bbappend +++ b/meta-openeuler/recipes-graphics/fontconfig/fontconfig_%.bbappend @@ -10,11 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=00252fd272bf2e722925613ad74cb6c7 \ " -SRC_URI_remove = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ +SRC_URI:remove = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ " # fontconfig-2.13.94-sw.patch is for arch sw, no need current -SRC_URI_prepend = "file://fontconfig-${PV}.tar.xz \ +SRC_URI:prepend = "file://fontconfig-${PV}.tar.xz \ file://backport-fontconfig-disable-network-required-test.patch \ " diff --git a/meta-openeuler/recipes-graphics/freetype/freetype_%.bbappend b/meta-openeuler/recipes-graphics/freetype/freetype_%.bbappend index 4d478633ba643b6871720c3382f12754db944893..3ddf7cc2acfef4056dbb79ef148e9f3fc46ff9ea 100644 --- a/meta-openeuler/recipes-graphics/freetype/freetype_%.bbappend +++ b/meta-openeuler/recipes-graphics/freetype/freetype_%.bbappend @@ -1,22 +1,37 @@ +# the main bb file: yocto-poky/meta/recipes-graphics/freetype/freetype_2.11.1.bb # version in src-openEuler PV = "2.12.1" +SRC_URI:remove = " \ + ${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.xz \ + file://CVE-2022-27404.patch \ + file://CVE-2022-27405.patch \ + file://CVE-2022-27406.patch \ + file://CVE-2023-2004.patch \ +" # apply src-openEuler patches # backport-freetype-2.5.2-more-demos.patch for ft2demos -SRC_URI_prepend = "file://backport-freetype-2.3.0-enable-spr.patch \ - file://backport-freetype-2.2.1-enable-valid.patch \ - file://backport-freetype-2.6.5-libtool.patch \ - file://backport-freetype-2.8-multilib.patch \ - file://backport-freetype-2.10.0-internal-outline.patch \ - file://backport-freetype-2.10.1-debughook.patch \ - " - -# LICENSE.TXT change -LIC_FILES_CHKSUM_remove = "file://docs/LICENSE.TXT;md5=4af6221506f202774ef74f64932878a1 \ +SRC_URI:prepend = " \ + file://freetype-${PV}.tar.xz \ + file://backport-freetype-2.3.0-enable-spr.patch \ + file://backport-freetype-2.2.1-enable-valid.patch \ + file://backport-freetype-2.6.5-libtool.patch \ + file://backport-freetype-2.8-multilib.patch \ + file://backport-freetype-2.10.0-internal-outline.patch \ + file://backport-freetype-2.10.1-debughook.patch \ " -LIC_FILES_CHKSUM_prepend = "file://LICENSE.TXT;md5=a5927784d823d443c6cae55701d01553 \ + +LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=a5927784d823d443c6cae55701d01553 \ " # new checksum -SRC_URI[sha256sum] = "4766f20157cc4cf0cd292f80bf917f92d1c439b243ac3018debf6b9140c41a7f" +SRC_URI[sha256sum] = "ce729d97f166a919a6a3037c949af01d5d6e1783614024d72683153f0bc5ef05" + +# when running compile task, it will put libtool can not be find, but we can find libtool with arch +# so make a software link from arch libtool to libtool +do_configure:append() { + if [ ! -f "libtool" ];then + ln -s $(ls | grep *libtool) libtool + fi +} diff --git a/meta-openeuler/recipes-graphics/harfbuzz/harfbuzz_%.bbappend b/meta-openeuler/recipes-graphics/harfbuzz/harfbuzz_%.bbappend index c6cb03cb0325653f1d2ef5cedc94a33db208d8f1..40eace60d127711cb16a6bb06455dcbc2dc3fce2 100644 --- a/meta-openeuler/recipes-graphics/harfbuzz/harfbuzz_%.bbappend +++ b/meta-openeuler/recipes-graphics/harfbuzz/harfbuzz_%.bbappend @@ -2,21 +2,11 @@ PV = "6.0.0" -# update LICENSE checksum -LIC_FILES_CHKSUM_remove = "file://COPYING;md5=8f787620b7d3866d9552fd1924c07572 \ +LIC_FILES_CHKSUM = "file://COPYING;md5=6ee0f16281694fb6aa689cca1e0fb3da \ " -LIC_FILES_CHKSUM_prepend = "file://COPYING;md5=6ee0f16281694fb6aa689cca1e0fb3da \ -" - -SRC_URI_remove = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.xz \ - " -SRC_URI_prepend = "file://${BP}.tar.xz \ - file://backport-CVE-2023-25193.patch \ - " +SRC_URI = "file://${BP}.tar.xz \ + file://backport-CVE-2023-25193.patch \ +" SRC_URI[sha256sum] = "1d1010a1751d076d5291e433c138502a794d679a7498d1268ee21e2d4a140eb4" - -# no this configuration option in version 4.3.0 -PACKAGECONFIG_remove = "fontconfig" -PACKAGECONFIG[fontconfig] = "" diff --git a/meta-openeuler/recipes-graphics/jpeg/libjpeg-turbo_%.bbappend b/meta-openeuler/recipes-graphics/jpeg/libjpeg-turbo_%.bbappend index 5b7dcd49fe5971632af6c44edbad6e777f6b27a2..ea76e3322a1bde3c3d2172be086236069fb57031 100644 --- a/meta-openeuler/recipes-graphics/jpeg/libjpeg-turbo_%.bbappend +++ b/meta-openeuler/recipes-graphics/jpeg/libjpeg-turbo_%.bbappend @@ -1,4 +1,4 @@ -# main bbfile: yocto-poky/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.6.bb +# main bbfile: yocto-poky/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.1.bb # version in openEuler PV = "2.1.1" @@ -9,6 +9,14 @@ LIC_FILES_CHKSUM = "file://cdjpeg.h;endline=13;md5=8a61af33cc1c681cd5cc297150bbb file://djpeg.c;endline=11;md5=b61f01ad6aff437b34d1f9e8004280a4 \ " +SRC_URI:remove = " \ + ${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ +" + +SRC_URI:append = " \ + file://libjpeg-turbo-${PV}.tar.gz \ +" + # new check value SRC_URI[md5sum] = "cf16866976ab31cd6fc478eac8c2c54e" SRC_URI[sha256sum] = "b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510" diff --git a/meta-openeuler/recipes-graphics/kmscube/kmscube_%.bbappend b/meta-openeuler/recipes-graphics/kmscube/kmscube_%.bbappend index d358093c54112537aa2282973527544498cf73c4..2f0f73d40b6979d6384826bc0a0f1fdf341958d2 100644 --- a/meta-openeuler/recipes-graphics/kmscube/kmscube_%.bbappend +++ b/meta-openeuler/recipes-graphics/kmscube/kmscube_%.bbappend @@ -1,5 +1,5 @@ # get src from here -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI = "file://${BPN}.tar.gz" diff --git a/meta-openeuler/recipes-graphics/mesa/mesa_%.bbappend b/meta-openeuler/recipes-graphics/mesa/mesa_%.bbappend index 30da09ebd91902c626d6b3dcf747bcc601360158..a45756125826922d8fb0909a9d1c36d5edc12c13 100644 --- a/meta-openeuler/recipes-graphics/mesa/mesa_%.bbappend +++ b/meta-openeuler/recipes-graphics/mesa/mesa_%.bbappend @@ -6,19 +6,19 @@ PV = "21.3.1" LIC_FILES_CHKSUM = "file://docs/license.rst;md5=17a4ea65de7a9ab42437f3131e616a7f" # add patch search path -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" # remove makedepend from DEPENDS since it is rarely used now -DEPENDS_remove = "makedepend-native" +DEPENDS:remove = "makedepend-native" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = " \ +SRC_URI:remove = " \ file://0002-meson.build-make-TLS-ELF-optional.patch \ file://0001-gallium-dri-Make-YUV-formats-we-re-going-to-emulate-.patch \ " # files, patches that come from openeuler -SRC_URI_prepend = " \ +SRC_URI:prepend = " \ file://backport-fix-build-err-on-arm.patch \ file://0001-evergreen-big-endian.patch \ file://mesa-21.3.1-meson.build-make-TLS-ELF-optional.patch \ diff --git a/meta-openeuler/recipes-graphics/pango/pango_%.bbappend b/meta-openeuler/recipes-graphics/pango/pango_%.bbappend index 74286081258ad755c26afab4ed9ac22f9576b98b..3c4c4ff2ed3050ebd3eccf0b99253e595bf2e6a0 100644 --- a/meta-openeuler/recipes-graphics/pango/pango_%.bbappend +++ b/meta-openeuler/recipes-graphics/pango/pango_%.bbappend @@ -1,3 +1,8 @@ -PV = "1.50.7" +# the main bb file: yocto-poky/meta/recipes-graphics/pango/pango_1.50.4.bb -SRC_URI[archive.sha256sum] = "0477f369a3d4c695df7299a6989dc004756a7f4de27eecac405c6790b7e3ad33" +PV = "1.50.12" + +SRC_URI:prepend = "file://${BP}.tar.xz;name=archive \ +" + +SRC_URI[archive.sha256sum] = "caef96d27bbe792a6be92727c73468d832b13da57c8071ef79b9df69ee058fe3" diff --git a/meta-openeuler/recipes-graphics/ttf-fonts/files/liberation-fonts-ttf-2.00.1.tar.gz b/meta-openeuler/recipes-graphics/ttf-fonts/files/liberation-fonts-ttf-2.00.1.tar.gz deleted file mode 100644 index ab2de91c342f021ad193f795697fbe6268d99051..0000000000000000000000000000000000000000 Binary files a/meta-openeuler/recipes-graphics/ttf-fonts/files/liberation-fonts-ttf-2.00.1.tar.gz and /dev/null differ diff --git a/meta-openeuler/recipes-graphics/ttf-fonts/liberation-fonts_%.bbappend b/meta-openeuler/recipes-graphics/ttf-fonts/liberation-fonts_%.bbappend index 6f7c8eedb8c6c11afe92530cfc4d6f1f84002614..a68bab30f45c246b802bd4bd825a9903f230b753 100644 --- a/meta-openeuler/recipes-graphics/ttf-fonts/liberation-fonts_%.bbappend +++ b/meta-openeuler/recipes-graphics/ttf-fonts/liberation-fonts_%.bbappend @@ -1,10 +1,11 @@ -# main bb file: yocto-poky/meta/recipes-graphics/ttf-fonts/liberation-fonts_2.00.1.bb +# main bb file: yocto-poky/meta/recipes-graphics/ttf-fonts/liberation-fonts_2.1.5.bb -# avoid download online -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +PV = "2.00.5" -SRC_URI_remove = "https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-${PV}.tar.gz \ +S = "${WORKDIR}/liberation-fonts-${PV}" + +SRC_URI:remove = "https://github.com/liberationfonts/liberation-fonts/files/7261482/liberation-fonts-ttf-${PV}.tar.gz \ " -SRC_URI_prepend = "file://liberation-fonts-ttf-${PV}.tar.gz \ +SRC_URI:prepend = "file://${PV}.tar.gz \ " diff --git a/meta-openeuler/recipes-graphics/wayland/libinput_%.bbappend b/meta-openeuler/recipes-graphics/wayland/libinput_%.bbappend index fe9f83860ba55cff412fbe12dc7bdd84e1556423..75209504f14fd8c0d2946f88e10487d8cb40103d 100644 --- a/meta-openeuler/recipes-graphics/wayland/libinput_%.bbappend +++ b/meta-openeuler/recipes-graphics/wayland/libinput_%.bbappend @@ -1,13 +1,14 @@ +# the main bb file: yocto-poky/meta/recipes-graphics/wayland/libinput_1.19.4.bb PV="1.22.1" # update license checksum LIC_FILES_CHKSUM = "file://COPYING;md5=bab4ac7dc1c10bc0fb037dc76c46ef8a" -SRC_URI_remove = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ +SRC_URI:remove = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ " -SRC_URI_prepend = "file://libinput-${PV}.tar.gz \ +SRC_URI:prepend = "file://libinput-${PV}.tar.gz \ " SRC_URI[sha256sum] = "45d9e03c16c3c343b7537aa7f744ae9339b1a0dae446ecbe6f5ed9d49be11e87" diff --git a/meta-openeuler/recipes-graphics/wayland/wayland-protocols_%.bbappend b/meta-openeuler/recipes-graphics/wayland/wayland-protocols_%.bbappend index 687dce0d7133a044bf7576494afa145fec5426c7..46ae6ff1f2043027942b5351f15a7896ddf9113a 100644 --- a/meta-openeuler/recipes-graphics/wayland/wayland-protocols_%.bbappend +++ b/meta-openeuler/recipes-graphics/wayland/wayland-protocols_%.bbappend @@ -1,12 +1,10 @@ # version in src-openEuler PV = "1.25" -SRC_URI[md5sum] = "0c192bf32de09ec30de4a82d1c65329c" -SRC_URI[sha256sum] = "f1ff0f7199d0a0da337217dd8c99979967808dc37731a1e759e822b75b571460" +SRC_URI:remove = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ +" -# use meson build instead of autotools build in version 1.25 -inherit meson +SRC_URI += "file://wayland-protocols-${PV}.tar.xz \ +" -# add configuration in later version -# http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-graphics/wayland/wayland-protocols_1.25.bb?h=kirkstone -EXTRA_OEMESON += "-Dtests=false" +SRC_URI[md5sum] = "0c192bf32de09ec30de4a82d1c65329c" diff --git a/meta-openeuler/recipes-graphics/wayland/wayland_%.bbappend b/meta-openeuler/recipes-graphics/wayland/wayland_%.bbappend index 9aa826ff750d540fd14637a59e34648feb27c344..6a65adefab6ce07b5cb62de3957ac1b4a9ce3daf 100644 --- a/meta-openeuler/recipes-graphics/wayland/wayland_%.bbappend +++ b/meta-openeuler/recipes-graphics/wayland/wayland_%.bbappend @@ -2,14 +2,16 @@ PV = "1.21.0" # modify 0002-meson.build-find-the-native-wayland-scanner-directly.patch -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" # 0001-build-Fix-strndup-detection-on-MinGW.patch cannot be applied -SRC_URI_remove = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ +SRC_URI:remove = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://0001-build-Fix-strndup-detection-on-MinGW.patch \ + file://CVE-2021-3782.patch \ " -SRC_URI_prepend = "file://wayland-${PV}.tar.gz \ +SRC_URI:prepend = "file://wayland-${PV}.tar.gz \ + file://0002-meson.build-find-the-native-wayland-scanner-directly.patch \ " # fix ERROR: Problem encountered: -Dtests=true requires -Dlibraries=true -EXTRA_OEMESON_remove_class-native = "-Dlibraries=false" +EXTRA_OEMESON:remove:class-native = "-Dlibraries=false" diff --git a/meta-openeuler/recipes-graphics/wayland/weston-init.bbappend b/meta-openeuler/recipes-graphics/wayland/weston-init.bbappend index 8ea4326967039aa7cf5cfcb05466604791855189..47e9509b13e23449e3a84bc2731ca4dadc2a59f7 100644 --- a/meta-openeuler/recipes-graphics/wayland/weston-init.bbappend +++ b/meta-openeuler/recipes-graphics/wayland/weston-init.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" # we current use rc5.d of rcS, we don't want it autostart default # occurs when udev is used instead of systemd diff --git a/meta-openeuler/recipes-graphics/wayland/weston_%.bbappend b/meta-openeuler/recipes-graphics/wayland/weston_%.bbappend index 1508ae83446cc9c39480bdad312761e37d34466c..66f73d8f1c340ace95e71bacdf7b9f5dbcb83c3b 100644 --- a/meta-openeuler/recipes-graphics/wayland/weston_%.bbappend +++ b/meta-openeuler/recipes-graphics/wayland/weston_%.bbappend @@ -2,20 +2,20 @@ OPENEULER_BRANCH = "master" -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" PV = "8.0.0" -SRC_URI_remove = "file://0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch \ +SRC_URI:remove = "file://0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch \ " -SRC_URI_prepend = "file://openeuler.png \ +SRC_URI:prepend = "file://openeuler.png \ " SRC_URI[sha256sum] = "7518b49b2eaa1c3091f24671bdcc124fd49fc8f1af51161927afa4329c027848" -DEPENDS_remove = "gdk-pixbuf" +DEPENDS:remove = "gdk-pixbuf" -do_install_append() { +do_install:append() { install -m 644 ${WORKDIR}/openeuler.png ${D}${datadir}/weston/ } diff --git a/meta-openeuler/recipes-graphics/xorg-lib/libx11-compose-data_%.bbappend b/meta-openeuler/recipes-graphics/xorg-lib/libx11-compose-data_%.bbappend index 3127cdf341f73d8e83e19459eb6abe714e1727f4..e028cf5638c72293603dbab40f7a39df8981f449 100644 --- a/meta-openeuler/recipes-graphics/xorg-lib/libx11-compose-data_%.bbappend +++ b/meta-openeuler/recipes-graphics/xorg-lib/libx11-compose-data_%.bbappend @@ -4,14 +4,14 @@ OPENEULER_REPO_NAME = "libX11" OPENEULER_SRC_URI_REMOVE = "https http git" # update 0001-Drop-x11-dependencies.patch to libX11-1.7.2 -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" PV = "1.8.1" # update LICENSE checksum LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" -SRC_URI_prepend = "file://libX11-1.8.1.tar.xz \ +SRC_URI:prepend = "file://libX11-1.8.1.tar.xz \ file://dont-forward-keycode-0.patch \ file://backport-CVE-2022-3554.patch \ " diff --git a/meta-openeuler/recipes-graphics/xorg-lib/pixman_%.bbappend b/meta-openeuler/recipes-graphics/xorg-lib/pixman_%.bbappend index 94d844c47ee36540fc40a053fb3291d5251f77f9..026d7d05c96b9672aabf2e008438515db80dd225 100644 --- a/meta-openeuler/recipes-graphics/xorg-lib/pixman_%.bbappend +++ b/meta-openeuler/recipes-graphics/xorg-lib/pixman_%.bbappend @@ -1,9 +1,11 @@ +# the main bb file: yocto-poky/meta/recipes-graphics/xorg-lib/pixman_0.40.0.bb + PV = "0.42.2" -SRC_URI_remove = "https://www.cairographics.org/releases/${BP}.tar.gz \ +SRC_URI = "file://${BPN}-${BP}.tar.bz2 \ " -SRC_URI_prepend = "file://${BPN}-${BP}.tar.bz2 \ -" +SRC_URI[md5sum] = "b07d3ba74f4824d94fa8f4e5248858d4" +SRC_URI[sha256sum] = "891a3a8b925562306dbbaaad88a80b83d68d6a41485ff2a8b1e09cd5350e4362" S = "${WORKDIR}/${BPN}-${BP}" diff --git a/meta-openeuler/recipes-graphics/xorg-lib/xkeyboard-config_%.bbappend b/meta-openeuler/recipes-graphics/xorg-lib/xkeyboard-config_%.bbappend index d8aed4e1d1c5dbd90d0b79cc96e0948a255b863a..ad15564d3b681c6ff00d5a3491f6f9656737c164 100644 --- a/meta-openeuler/recipes-graphics/xorg-lib/xkeyboard-config_%.bbappend +++ b/meta-openeuler/recipes-graphics/xorg-lib/xkeyboard-config_%.bbappend @@ -3,8 +3,11 @@ # version in src-openEuler PV = "2.33" +SRC_URI = "file://${BP}.tar.bz2 \ +" + # use nativesdk's python3 tool -DEPENDS_remove = "python3-native" -PYTHON_remove = "${STAGING_BINDIR_NATIVE}/python3-native/python3" +DEPENDS:remove = "python3-native" +PYTHON:remove = "${STAGING_BINDIR_NATIVE}/python3-native/python3" SRC_URI[sha256sum] = "657fd790d6dcf781cd395de4cf726120a5b0f93ba91dfb2628bcc70ae8b1d3bc" diff --git a/meta-openeuler/recipes-graphics/xorg-proto/xorgproto_%.bbappend b/meta-openeuler/recipes-graphics/xorg-proto/xorgproto_%.bbappend index 380517d17cb23cf2976993f62b6c11ccb0929cf2..44ac48594ee57f55ef91b3856731f6b767928dee 100644 --- a/meta-openeuler/recipes-graphics/xorg-proto/xorgproto_%.bbappend +++ b/meta-openeuler/recipes-graphics/xorg-proto/xorgproto_%.bbappend @@ -1,8 +1,11 @@ -# main bb file: yocto-poky/meta/recipes-graphics/xorg-proto/xorgproto_2020.1.bb +# main bb file: yocto-poky/meta/recipes-graphics/xorg-proto/xorgproto_2021.5.bb OPENEULER_REPO_NAME = "xorg-x11-proto-devel" PV = "2021.5" +SRC_URI = "file://${BP}.tar.bz2 \ +" + LIC_FILES_CHKSUM = "file://COPYING-x11proto;md5=dfc4bd2b0568b31725b85b0604e69b56" SRC_URI[md5sum] = "bff0c9a6a060ecde954e255a2d1d9a22" diff --git a/meta-openeuler/recipes-graphics/xorg-utils/util-macros_%.bbappend b/meta-openeuler/recipes-graphics/xorg-utils/util-macros_%.bbappend index 7689b017ff40025926102c0ce36918fe1df781a3..5fe0ec35276fb8bf3ec5b424511c80e9522ad073 100644 --- a/meta-openeuler/recipes-graphics/xorg-utils/util-macros_%.bbappend +++ b/meta-openeuler/recipes-graphics/xorg-utils/util-macros_%.bbappend @@ -3,9 +3,9 @@ OPENEULER_REPO_NAME = "xorg-x11-util-macros" # use src-openEuler source -SRC_URI_remove = "${XORG_MIRROR}/individual/util/${XORG_PN}-${PV}.tar.gz" +SRC_URI:remove = "${XORG_MIRROR}/individual/util/${XORG_PN}-${PV}.tar.gz" -SRC_URI_prepend = "file://${XORG_PN}-${PV}.tar.bz2 \ +SRC_URI:prepend = "file://${XORG_PN}-${PV}.tar.bz2 \ " SRC_URI[md5sum] = "4be6df7e6af52e28e13dc533244eb9d7" diff --git a/meta-openeuler/recipes-kernel/dtc/dtc_%.bbappend b/meta-openeuler/recipes-kernel/dtc/dtc_%.bbappend index efa03ceaf28cd554f22b0b7a58a388bf78d781fb..5cdd45fa6a24d0a76687b5de8c53cd78481668d8 100644 --- a/meta-openeuler/recipes-kernel/dtc/dtc_%.bbappend +++ b/meta-openeuler/recipes-kernel/dtc/dtc_%.bbappend @@ -3,13 +3,13 @@ PV = "1.6.1" # Use the source packages from openEuler, remove patch conflict with openeuler -SRC_URI_remove = " \ +SRC_URI:remove = " \ git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=master \ file://0001-fdtdump-Fix-gcc11-warning.patch \ " # openEuler-add-secure-compile-option-in-Makefile.patch can't apply -SRC_URI_append = " \ +SRC_URI:append = " \ file://${BP}.tar.xz \ " diff --git a/meta-openeuler/recipes-kernel/dtc/python3-dtc_1.6.1.bb b/meta-openeuler/recipes-kernel/dtc/python3-dtc_1.6.1.bb index 0a46c58128820c8ccedde46abf2372deaae196d8..a959a880a6323118e8c774db9b4720203ee55d6b 100644 --- a/meta-openeuler/recipes-kernel/dtc/python3-dtc_1.6.1.bb +++ b/meta-openeuler/recipes-kernel/dtc/python3-dtc_1.6.1.bb @@ -19,7 +19,7 @@ inherit distutils3 DISTUTILS_SETUP_PATH = "${S}/pylibfdt" -do_configure_prepend() { +do_configure:prepend() { oe_runmake -C "${S}" version_gen.h mv "${S}/version_gen.h" "${DISTUTILS_SETUP_PATH}/" } diff --git a/meta-openeuler/recipes-kernel/kern-tools/kern-tools-native_%.bbappend b/meta-openeuler/recipes-kernel/kern-tools/kern-tools-native_%.bbappend index 50ef4eac3a94edab4c19baa2def23bfd6d8e059a..5b58bbbede68d8ca00aee5bf658beca53cc65505 100644 --- a/meta-openeuler/recipes-kernel/kern-tools/kern-tools-native_%.bbappend +++ b/meta-openeuler/recipes-kernel/kern-tools/kern-tools-native_%.bbappend @@ -1,6 +1,6 @@ # main bbfile: yocto-poky/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" # avoid parse filespath error after adding FILESEXTRAPATHS PV = "0.2" diff --git a/meta-openeuler/recipes-kernel/kexec/kexec-tools_%.bbappend b/meta-openeuler/recipes-kernel/kexec/kexec-tools_%.bbappend index cc74933d4515c3978658f04ff1036e370eb71947..542c4345cafdcaf34bf151731596e61a38b3e515 100644 --- a/meta-openeuler/recipes-kernel/kexec/kexec-tools_%.bbappend +++ b/meta-openeuler/recipes-kernel/kexec/kexec-tools_%.bbappend @@ -4,10 +4,10 @@ PV = "2.0.26" # Use the source packages from openEuler and remove conflicting patches -SRC_URI_remove = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz \ +SRC_URI:remove = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz \ file://0001-arm64-kexec-disabled-check-if-kaslr-seed-dtb-propert.patch \ " -SRC_URI_prepend = "file://kexec-tools-${PV}.tar.xz " +SRC_URI:prepend = "file://kexec-tools-${PV}.tar.xz " SRC_URI += "file://kexec-Add-quick-kexec-support.patch \ file://kexec-Quick-kexec-implementation-for-arm64.patch \ diff --git a/meta-openeuler/recipes-kernel/kmod/kmod_%.bbappend b/meta-openeuler/recipes-kernel/kmod/kmod_%.bbappend index dde97e530b70073316d011fda3c52de55e7fd17d..111c4addbf44612c23ea4ed4da4e943d40396c66 100644 --- a/meta-openeuler/recipes-kernel/kmod/kmod_%.bbappend +++ b/meta-openeuler/recipes-kernel/kmod/kmod_%.bbappend @@ -4,10 +4,11 @@ PV = "30" # Use the source packages from openEuler -SRC_URI_remove = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \ +SRC_URI:remove = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \ git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git;branch=master \ + file://0001-depmod-Add-support-for-excluding-a-directory.patch \ " -SRC_URI_prepend = "file://${BP}.tar.xz \ +SRC_URI:prepend = "file://${BP}.tar.xz \ file://0001-Module-replace-the-module-with-new-module.patch \ file://0002-Module-suspend-the-module-by-rmmod-r-option.patch \ " diff --git a/meta-openeuler/recipes-kernel/linux/files/config/arm/defconfig-kernel b/meta-openeuler/recipes-kernel/linux/files/config/arm/defconfig-kernel index 082b23fd194e86216427e0dcd800eee755db042a..369e310380bdb94e06b966dc529fb2306e4b70cb 100644 --- a/meta-openeuler/recipes-kernel/linux/files/config/arm/defconfig-kernel +++ b/meta-openeuler/recipes-kernel/linux/files/config/arm/defconfig-kernel @@ -492,7 +492,7 @@ CONFIG_ATAGS=y # CONFIG_DEPRECATED_PARAM_STRUCT is not set CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_ARM_APPENDED_DTB=y +CONFIG_ARM:appendED_DTB=y CONFIG_ARM_ATAG_DTB_COMPAT=y # CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER is not set CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND=y @@ -1245,7 +1245,7 @@ CONFIG_EXTRA_FIRMWARE="" CONFIG_ALLOW_DEV_COREDUMP=y # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set -# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set +# CONFIG_DEBUG_TEST_DRIVER:remove is not set # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set CONFIG_GENERIC_CPU_AUTOPROBE=y # end of Generic Driver Options @@ -3198,7 +3198,7 @@ CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 CONFIG_SECURITY_SMACK=y # CONFIG_SECURITY_SMACK_BRINGUP is not set # CONFIG_SECURITY_SMACK_NETFILTER is not set -# CONFIG_SECURITY_SMACK_APPEND_SIGNALS is not set +# CONFIG_SECURITY_SMACK:append:SIGNALS is not set # CONFIG_SECURITY_TOMOYO is not set # CONFIG_SECURITY_APPARMOR is not set # CONFIG_SECURITY_LOADPIN is not set diff --git a/meta-openeuler/recipes-kernel/linux/files/config/arm64/defconfig-kernel b/meta-openeuler/recipes-kernel/linux/files/config/arm64/defconfig-kernel index b4e8e8f611746f63c1486004d1627c334ab01e5e..01eb8bc2c516952e8782a1ee05f081b9379d7989 100644 --- a/meta-openeuler/recipes-kernel/linux/files/config/arm64/defconfig-kernel +++ b/meta-openeuler/recipes-kernel/linux/files/config/arm64/defconfig-kernel @@ -1376,7 +1376,7 @@ CONFIG_EXTRA_FIRMWARE="" CONFIG_ALLOW_DEV_COREDUMP=y # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set -# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set +# CONFIG_DEBUG_TEST_DRIVER:remove is not set # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set CONFIG_GENERIC_CPU_AUTOPROBE=y CONFIG_GENERIC_CPU_VULNERABILITIES=y @@ -3475,7 +3475,7 @@ CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 CONFIG_SECURITY_SMACK=y # CONFIG_SECURITY_SMACK_BRINGUP is not set # CONFIG_SECURITY_SMACK_NETFILTER is not set -# CONFIG_SECURITY_SMACK_APPEND_SIGNALS is not set +# CONFIG_SECURITY_SMACK:append:SIGNALS is not set # CONFIG_SECURITY_TOMOYO is not set # CONFIG_SECURITY_APPARMOR is not set # CONFIG_SECURITY_LOADPIN is not set diff --git a/meta-openeuler/recipes-kernel/linux/files/config/riscv/defconfig-kernel b/meta-openeuler/recipes-kernel/linux/files/config/riscv/defconfig-kernel index bc84ea1cea4cc00cfab8cc91f0fb5d935a2be0a8..02ff19de74045cb52f182d651c69f0b2f77883ce 100644 --- a/meta-openeuler/recipes-kernel/linux/files/config/riscv/defconfig-kernel +++ b/meta-openeuler/recipes-kernel/linux/files/config/riscv/defconfig-kernel @@ -735,7 +735,7 @@ CONFIG_EXTRA_FIRMWARE="" CONFIG_ALLOW_DEV_COREDUMP=y # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set -# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set +# CONFIG_DEBUG_TEST_DRIVER:remove is not set # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set CONFIG_REGMAP=y CONFIG_REGMAP_MMIO=y diff --git a/meta-openeuler/recipes-kernel/linux/files/config/x86/defconfig-kernel b/meta-openeuler/recipes-kernel/linux/files/config/x86/defconfig-kernel index 0ecb243cf7e4c7f10187810f4aa4cf8c59b08528..e86b0e11f7a19f76258bed7dd2b21890e0eeb521 100644 --- a/meta-openeuler/recipes-kernel/linux/files/config/x86/defconfig-kernel +++ b/meta-openeuler/recipes-kernel/linux/files/config/x86/defconfig-kernel @@ -1533,7 +1533,7 @@ CONFIG_FW_CACHE=y CONFIG_ALLOW_DEV_COREDUMP=y # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set -# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set +# CONFIG_DEBUG_TEST_DRIVER:remove is not set # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set CONFIG_GENERIC_CPU_AUTOPROBE=y CONFIG_GENERIC_CPU_VULNERABILITIES=y diff --git a/meta-openeuler/recipes-kernel/linux/kernel-devsrc.bbappend b/meta-openeuler/recipes-kernel/linux/kernel-devsrc.bbappend index 3686e923f70683330649cf7bf2218160e8411807..3da105ff0de6894acf82790b2666cf9664a94a2e 100644 --- a/meta-openeuler/recipes-kernel/linux/kernel-devsrc.bbappend +++ b/meta-openeuler/recipes-kernel/linux/kernel-devsrc.bbappend @@ -1,7 +1,7 @@ -RDEPENDS_${PN} = "" -RDEPENDS_${PN}_remove_aarch64 = " gawk" +RDEPENDS:${PN} = "" +RDEPENDS:${PN}:remove:aarch64 = " gawk" # not strip, host tools under scripts arch is different, cannot strip # and cannot check arch in do_package_qa INHIBIT_PACKAGE_STRIP = "1" -INSANE_SKIP_${PN} += "arch" +INSANE_SKIP:${PN} += "arch" diff --git a/meta-openeuler/recipes-kernel/linux/linux-openeuler-rt.bb b/meta-openeuler/recipes-kernel/linux/linux-openeuler-rt.bb index 989bc5eb65fadb061ff9f2c7636afde77c4b4c4d..c0ef1ce9ad074e07b25cc4771e89b7db92cd741f 100644 --- a/meta-openeuler/recipes-kernel/linux/linux-openeuler-rt.bb +++ b/meta-openeuler/recipes-kernel/linux/linux-openeuler-rt.bb @@ -1,18 +1,18 @@ require recipes-kernel/linux/linux-openeuler.inc -SRC_URI_append_aarch64 += " \ +SRC_URI:append:aarch64 += " \ file://src-kernel-5.10/0001-apply-preempt-RT-patch.patch \ file://src-kernel-5.10/0001-modify-openeuler_defconfig-for-rt62.patch \ " -SRC_URI_append_x86-64 += " \ +SRC_URI:append:x86-64 += " \ file://src-kernel-5.10/0001-apply-preempt-RT-patch.patch \ file://src-kernel-5.10/0001-modify-openeuler_defconfig-for-rt62.patch \ " COMPATIBLE_MACHINE = "qemu-aarch64|generic-x86-64" -do_configure_prepend() { +do_configure:prepend() { sed -i 's/CONFIG_PREEMPT=y/CONFIG_PREEMPT_RT=y/g' ${OPENEULER_KERNEL_CONFIG} cp -f "${OPENEULER_KERNEL_CONFIG}" .config } diff --git a/meta-openeuler/recipes-kernel/linux/linux-openeuler.inc b/meta-openeuler/recipes-kernel/linux/linux-openeuler.inc index bf3a1a9f987d53de0f4ac388c28ec25ecc3cafd0..4e716bcf1cf02e0d1ae571e83d4a5896d6c7c44d 100644 --- a/meta-openeuler/recipes-kernel/linux/linux-openeuler.inc +++ b/meta-openeuler/recipes-kernel/linux/linux-openeuler.inc @@ -15,20 +15,20 @@ LINUX_VERSION ?= "5.10" PV = "${LINUX_VERSION}" # add patches only for aarch64 -SRC_URI_append_aarch64 = " \ +SRC_URI:append:aarch64 = " \ file://patches/${ARCH}/0001-arm64-add-zImage-support-for-arm64.patch \ " # add openamp support for x86 mcs # todo: jailhouse support -SRC_URI_append_x86-64 = " \ +SRC_URI:append:x86-64 = " \ ${@bb.utils.contains('MCS_FEATURES', 'openamp', 'file://patches/${ARCH}/0001-x86-irq-add-a-vector-define-for-mcs.patch', '', d)} \ " # export symbol for jailhouse -SRC_URI_append = " ${@bb.utils.contains('MCS_FEATURES', 'jailhouse', 'file://Jailhouse/jailhouse_export_symbol.patch', '', d)}" +SRC_URI:append = " ${@bb.utils.contains('MCS_FEATURES', 'jailhouse', 'file://Jailhouse/jailhouse_export_symbol.patch', '', d)}" -LINUX_VERSION_EXTENSION_append = "-openeuler" +LINUX_VERSION_EXTENSION:append = "-openeuler" # delete v8 in kernel module name, such as kernel-module-xxx-5.10.0-v8 KERNEL_MODULE_PACKAGE_SUFFIX = "" @@ -87,27 +87,27 @@ python do_fetch() { bb.utils.unlockfile(lf) } -KERNEL_CC_append_aarch64 = " ${TOOLCHAIN_OPTIONS}" -KERNEL_LD_append_aarch64 = " ${TOOLCHAIN_OPTIONS}" +KERNEL_CC:append:aarch64 = " ${TOOLCHAIN_OPTIONS}" +KERNEL_LD:append:aarch64 = " ${TOOLCHAIN_OPTIONS}" -KERNEL_CC_append_riscv64 = " ${TOOLCHAIN_OPTIONS}" -KERNEL_LD_append_riscv64 = " ${TOOLCHAIN_OPTIONS}" +KERNEL_CC:append:riscv64 = " ${TOOLCHAIN_OPTIONS}" +KERNEL_LD:append:riscv64 = " ${TOOLCHAIN_OPTIONS}" OPENEULER_KERNEL_CONFIG = "../config/${ARCH}/defconfig-kernel" -do_configure_prepend() { +do_configure:prepend() { cp -f "${OPENEULER_KERNEL_CONFIG}" .config } # Even if the KERNEL_IMAGETYPE is zImage, we will install Image, so add it into PACKAGES PACKAGES += "${KERNEL_PACKAGE_NAME}-img" -FILES_${KERNEL_PACKAGE_NAME}-img = "/boot/Image-${KERNEL_VERSION}" -do_install_append(){ +FILES:${KERNEL_PACKAGE_NAME}-img = "/boot/Image-${KERNEL_VERSION}" +do_install:append(){ if [ -e ${KERNEL_OUTPUT_DIR}/Image ]; then install -m 0644 ${KERNEL_OUTPUT_DIR}/Image ${D}/${KERNEL_IMAGEDEST}/Image-${KERNEL_VERSION} fi } -do_deploy_append() { +do_deploy:append() { if [ -e ${KERNEL_OUTPUT_DIR}/Image ]; then install -m 0644 ${KERNEL_OUTPUT_DIR}/Image $deployDir/Image-${KERNEL_VERSION} fi @@ -123,7 +123,7 @@ pkg_postinst_${KERNEL_PACKAGE_NAME}-base () { # then we can use pkgname in KERNEL_MODULE_AUTOLOAD # reference 1: split_kernel_module_packages: yocto-poky/meta/classes/kernel-module-split.bbclass # reference 2: do_split_packages: yocto-poky/meta/classes/package.bbclass -split_kernel_module_packages_prepend () { +split_kernel_module_packages:prepend () { def update_module_loadlist (): module_regex = r'^(.*)\.k?o(?:\.[xg]z)?$' kernel_package_name = d.getVar("KERNEL_PACKAGE_NAME") or "kernel" diff --git a/meta-openeuler/recipes-kernel/lopper/lopper-ops.bb b/meta-openeuler/recipes-kernel/lopper/lopper-ops.bb index 3b1fe4e6f2c95cea3ee7f34a93e61592864edc1c..b8c522b63ae7035ca0131b019d02bf7613244073 100644 --- a/meta-openeuler/recipes-kernel/lopper/lopper-ops.bb +++ b/meta-openeuler/recipes-kernel/lopper/lopper-ops.bb @@ -5,7 +5,7 @@ LICENSE = "MulanPSLv2" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MulanPSL-2.0;md5=74b1b7a7ee537a16390ed514498bf23c" # Use the operation files from current layer -FILESEXTRAPATHS_prepend := "${THISDIR}/:" +FILESEXTRAPATHS:prepend := "${THISDIR}/:" SRC_URI = "file://lops/" DEPENDS += "lopper-native" @@ -15,4 +15,4 @@ do_install() { cp -r ${WORKDIR}/lops ${D}${libdir} } -FILES_${PN} += "${libdir}/lops" +FILES:${PN} += "${libdir}/lops" diff --git a/meta-openeuler/recipes-kernel/lttng/lttng-ust_%.bbappend b/meta-openeuler/recipes-kernel/lttng/lttng-ust_%.bbappend index 2a1da79c3216ac3b8e3f03de632a8722cbdedc33..f3d6c8c45797233f9b56fc3fa05ad602266fbbb7 100644 --- a/meta-openeuler/recipes-kernel/lttng/lttng-ust_%.bbappend +++ b/meta-openeuler/recipes-kernel/lttng/lttng-ust_%.bbappend @@ -1,18 +1,16 @@ -# main bbfile: yocto-poky/meta/recipes-kernel/lttng/lttng-ust_2.12.1.bb - -FILESEXTRAPATHS_append := "${THISDIR}/${BPN}/:" - -# version in openEuler -PV = "2.13.5" +# main bbfile: yocto-poky/meta/recipes-kernel/lttng/lttng-ust_2.13.5.bb # update LICENSE checksums LIC_FILES_CHKSUM = "file://LICENSE;md5=a46577a38ad0c36ff6ff43ccf40c480f" +SRC_URI:remove = " \ + https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \ +" + # apply new poky patches -SRC_URI_append = " \ - file://0001-lttng-ust-common-link-with-liburcu-explicitly.patch \ - file://0001-Makefile.am-update-rpath-link.patch \ - " +SRC_URI:append = " \ + file://${BP}.tar.bz2 \ +" SRC_URI[md5sum] = "9fdf788f88b3eb4fb4ced817fa0ed6c5" SRC_URI[sha256sum] = "dfafea313b99ab94be72b23a749ce82cb3b7e60b09cf84e2370f0eebd88f4c98" diff --git a/meta-openeuler/recipes-kernel/modutils-initscripts/modutils-initscripts.bbappend b/meta-openeuler/recipes-kernel/modutils-initscripts/modutils-initscripts.bbappend index 5f718933275986f5424036d1f4b75b8e633a5a43..de2f653d7a5618c632fd9673a0c15d7cf89194b1 100644 --- a/meta-openeuler/recipes-kernel/modutils-initscripts/modutils-initscripts.bbappend +++ b/meta-openeuler/recipes-kernel/modutils-initscripts/modutils-initscripts.bbappend @@ -1,5 +1,5 @@ # PD.patch will create LICENSE file, but if WORKDIR dir is not a clean # dir, i.e., LICENSE file is already there because of last build, # do patch may fail. -SRC_URI_remove = "file://PD.patch" +SRC_URI:remove = "file://PD.patch" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/PD;md5=b3597d12946881e13cb3b548d1173851" diff --git a/meta-openeuler/recipes-mcs/jailhouse/jailhouse.bb b/meta-openeuler/recipes-mcs/jailhouse/jailhouse.bb index fc2939c424352524fdf04596fd4d755fdaf01182..fe6c17a2998ce9baac97d4cfab83ffdf10c09406 100644 --- a/meta-openeuler/recipes-mcs/jailhouse/jailhouse.bb +++ b/meta-openeuler/recipes-mcs/jailhouse/jailhouse.bb @@ -36,7 +36,7 @@ DTS_DIR ?= "${JH_DATADIR}/cells/dts" JH_CELLS_raspberrypi4-64 = "rpi4" JH_CELLS_qemu-aarch64 = "qemu-arm64" -do_configure_prepend() { +do_configure:prepend() { if ls ${WORKDIR}/cells/${ARCH}/${JH_CELLS}*.c 1>/dev/null 2>&1; then cp -f ${WORKDIR}/cells/${ARCH}/${JH_CELLS}*.c ${S}/configs/${ARCH}/ fi @@ -74,5 +74,5 @@ do_install() { } PACKAGE_BEFORE_PN = "kernel-module-jailhouse pyjailhouse ${PN}-tools ${PN}-demos" -FILES_${PN} += "${nonarch_base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR}" +FILES:${PN} += "${nonarch_base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR}" KERNEL_MODULE_AUTOLOAD += "jailhouse" diff --git a/meta-openeuler/recipes-mcs/libmetal/libmetal.inc b/meta-openeuler/recipes-mcs/libmetal/libmetal.inc index 5a88d8c36124cc0319e52ce5f2ee2becdda05c81..b0b45c477b589605c50b906dbad91575d8dd76a3 100644 --- a/meta-openeuler/recipes-mcs/libmetal/libmetal.inc +++ b/meta-openeuler/recipes-mcs/libmetal/libmetal.inc @@ -25,7 +25,7 @@ S = "${WORKDIR}/${BPN}-${PV}" # the software packages required in build # if user want to enable hugetlbfs support, please -# add "DEPENDS_append_pn-libmetal = " libhugetlbfs "" to your local.conf +# add "DEPENDS:append:pn-libmetal = " libhugetlbfs "" to your local.conf # udev/mdev(provided by busybox) is required, may need to add it into DEPENDS DEPENDS = "sysfsutils" @@ -39,20 +39,20 @@ EXTRA_OECMAKE = " \ " ### Runtime metadata -#RDEPENDS_${PN} += "libudev" +#RDEPENDS:${PN} += "libudev" ### Package metadata -FILES_${PN} = " \ +FILES:${PN} = " \ ${libdir}/*.so* \ " -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${bindir}/test-* \ " ### Tasks for package -do_install_append () { +do_install:append () { # Only install the shared lib binaries rm -rf ${D}/${bindir}/*-static diff --git a/meta-openeuler/recipes-mcs/libmetal/libmetal_2022.10.0.bb b/meta-openeuler/recipes-mcs/libmetal/libmetal_2022.10.0.bb index c95e9e19951a86b9a9cba68d85c1aaf17074fbff..a14ccabee5b9495328c1288d8b2fc89f876fb7b1 100644 --- a/meta-openeuler/recipes-mcs/libmetal/libmetal_2022.10.0.bb +++ b/meta-openeuler/recipes-mcs/libmetal/libmetal_2022.10.0.bb @@ -1,4 +1,4 @@ require libmetal.inc -SRC_URI_prepend = "file://libmetal-add-additional-arches.patch \ +SRC_URI:prepend = "file://libmetal-add-additional-arches.patch \ " diff --git a/meta-openeuler/recipes-mcs/mcs-linux/mcs-km.bb b/meta-openeuler/recipes-mcs/mcs-linux/mcs-km.bb index 5fb4e47b85b52f2948a256dcf613366396805403..7d8c3a6145d5274b24f97f8004fda4ab8847fc2a 100644 --- a/meta-openeuler/recipes-mcs/mcs-linux/mcs-km.bb +++ b/meta-openeuler/recipes-mcs/mcs-linux/mcs-km.bb @@ -19,14 +19,14 @@ require mcs-resources-overlay.inc PV = "0.0.1" OPENEULER_REPO_NAME = "mcs" -SRC_URI_append_aarch64 = " \ +SRC_URI:append:aarch64 = " \ file://mcs/mcs_km \ " S = "${WORKDIR}/mcs/mcs_km" # for x86 OPENEULER_LOCAL_NAME_x86-64 = "mcs-x86" -SRC_URI_append_x86-64 = " \ +SRC_URI:append:x86-64 = " \ file://mcs-x86/mcs_km \ " S_x86-64 = "${WORKDIR}/mcs-x86/mcs_km" @@ -36,4 +36,4 @@ do_fetch[depends] += "mcs-linux:do_fetch" # The inherit of module.bbclass will automatically name module packages with # "kernel-module-" prefix as required by the oe-core build environment. -RPROVIDES_${PN} += "kernel-module-mcs-km" +RPROVIDES:${PN} += "kernel-module-mcs-km" diff --git a/meta-openeuler/recipes-mcs/mcs-linux/mcs-linux.bb b/meta-openeuler/recipes-mcs/mcs-linux/mcs-linux.bb index 660e70ad7e470c9abb63cf004a9134795dc2a850..f213ff11d93ea584d099906b1a8a2ab9ccdb787b 100644 --- a/meta-openeuler/recipes-mcs/mcs-linux/mcs-linux.bb +++ b/meta-openeuler/recipes-mcs/mcs-linux/mcs-linux.bb @@ -18,14 +18,14 @@ inherit cmake ### Build metadata: SRC_URI, SRCDATA, S, B, FILESEXTRAPATHS.... OPENEULER_REPO_NAME = "mcs" PV = "0.0.1" -SRC_URI_append_aarch64 = " \ +SRC_URI:append:aarch64 = " \ file://mcs \ " S = "${WORKDIR}/mcs" # for x86 OPENEULER_LOCAL_NAME_x86-64 = "mcs-x86" -SRC_URI_append_x86-64 = " \ +SRC_URI:append:x86-64 = " \ file://mcs-x86 \ " S_x86-64 = "${WORKDIR}/mcs-x86" @@ -41,6 +41,6 @@ EXTRA_OECMAKE = " \ -DDEMO_TARGET=rpmsg_pty_demo \ " -FILES_${PN} = " \ +FILES:${PN} = " \ ${bindir}/rpmsg_main \ " diff --git a/meta-openeuler/recipes-mcs/openamp/openamp.inc b/meta-openeuler/recipes-mcs/openamp/openamp.inc index cf65e7ad300c67b28206ff04cfc9617cd7410ece..d76c83f4268868c71d43654682b4e4c07ab6a1a4 100644 --- a/meta-openeuler/recipes-mcs/openamp/openamp.inc +++ b/meta-openeuler/recipes-mcs/openamp/openamp.inc @@ -43,19 +43,19 @@ EXTRA_OECMAKE = " \ ### Package metadata -ALLOW_EMPTY_${PN}-demos = "1" -PACKAGES_append += "${PN}-demos" +ALLOW_EMPTY:${PN}-demos = "1" +PACKAGES:append = "${PN}-demos" -FILES_${PN} = " \ +FILES:${PN} = " \ ${libdir}/*.so* \ " -FILES_${PN}-demos = " \ +FILES:${PN}-demos = " \ ${bindir}/*-shared \ " ### Tasks for package -do_install_append () { +do_install:append () { # Only install echo test client, matrix multiplication client, # and proxy app server for ZynqMP rm -rf ${D}/${bindir}/*-static diff --git a/meta-openeuler/recipes-multimedia/alsa/alsa-lib_%.bbappend b/meta-openeuler/recipes-multimedia/alsa/alsa-lib_%.bbappend index bb67c394a5e283801c7574d6757f5792454e4460..dba4d5b8f305343c01e7a168e0ca2367bff9f671 100644 --- a/meta-openeuler/recipes-multimedia/alsa/alsa-lib_%.bbappend +++ b/meta-openeuler/recipes-multimedia/alsa/alsa-lib_%.bbappend @@ -2,6 +2,6 @@ OPENEULER_REPO_NAME = "alsa-lib" PV = "1.2.8" -SRC_URI_remove = "file://ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e.patch" +SRC_URI:remove = "file://ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e.patch" SRC_URI[sha256sum] = "1ab01b74e33425ca99c2e36c0844fd6888273193bd898240fe8f93accbcbf347" diff --git a/meta-openeuler/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend b/meta-openeuler/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend index 341a33ff7bce1426216d2f2b1ed11a67f555cbc0..77279dbdf5a693f10e1b84067493eaf4e4c75660 100644 --- a/meta-openeuler/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend +++ b/meta-openeuler/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend @@ -5,7 +5,7 @@ PV = "1.20.3" LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770" # remove outdated patch -SRC_URI_remove = "file://0004-glimagesink-Downrank-to-marginal.patch \ +SRC_URI:remove = "file://0004-glimagesink-Downrank-to-marginal.patch \ " SRC_URI += "file://0001-missing-plugins-Remove-the-mpegaudioversion-field.patch \ @@ -14,7 +14,7 @@ SRC_URI += "file://0001-missing-plugins-Remove-the-mpegaudioversion-field.patch SRC_URI[sha256sum] = "7e30b3dd81a70380ff7554f998471d6996ff76bbe6fc5447096f851e24473c9f" # keep same as new bbfile below -PACKAGES_DYNAMIC_remove = "^libgst.*" +PACKAGES_DYNAMIC:remove = "^libgst.*" PACKAGECONFIG[graphene] = "-Dgl-graphene=enabled,-Dgl-graphene=disabled,graphene" # This enables Qt5 QML examples in -base. The Qt5 GStreamer @@ -22,7 +22,7 @@ PACKAGECONFIG[graphene] = "-Dgl-graphene=enabled,-Dgl-graphene=disabled,graphene PACKAGECONFIG[qt5] = "-Dqt5=enabled,-Dqt5=disabled,qtbase qtdeclarative qtbase-native" PACKAGECONFIG[viv-fb] = ",,virtual/libgles2 virtual/libg2d" -OPENGL_WINSYS_append = "${@bb.utils.contains('PACKAGECONFIG', 'viv-fb', ' viv-fb', '', d)}" +OPENGL_WINSYS:append = "${@bb.utils.contains('PACKAGECONFIG', 'viv-fb', ' viv-fb', '', d)}" -EXTRA_OEMESON_remove = "-Dgl-graphene=disabled \ +EXTRA_OEMESON:remove = "-Dgl-graphene=disabled \ " diff --git a/meta-openeuler/recipes-multimedia/gstreamer/gstreamer1.0_%.bbappend b/meta-openeuler/recipes-multimedia/gstreamer/gstreamer1.0_%.bbappend index 755d9c896505d47d0f7d72eeaea678d27fd6a0c5..3f7ba0cb4e8fc11d24a5e4420fe1922cb23b47b6 100644 --- a/meta-openeuler/recipes-multimedia/gstreamer/gstreamer1.0_%.bbappend +++ b/meta-openeuler/recipes-multimedia/gstreamer/gstreamer1.0_%.bbappend @@ -2,6 +2,6 @@ OPENEULER_REPO_NAME = "gstreamer1" PV = "1.20.4" -SRC_URI_prepend = "file://ci.patch \ +SRC_URI:prepend = "file://ci.patch \ file://gstreamer-inspect-rpm-format.patch \ " diff --git a/meta-openeuler/recipes-multimedia/libogg/libogg_%.bbappend b/meta-openeuler/recipes-multimedia/libogg/libogg_%.bbappend index 51e7cfff14743b6b979b3bdf7ad7c288b9c81a33..d994a19cde4c2304e04eec7b1fdf7fb0aa2ee8c6 100644 --- a/meta-openeuler/recipes-multimedia/libogg/libogg_%.bbappend +++ b/meta-openeuler/recipes-multimedia/libogg/libogg_%.bbappend @@ -1,3 +1,5 @@ +# the main bb file: yocto-poky/meta/recipes-multimedia/libogg/libogg_1.3.5.bb + PV = "1.3.5" SRC_URI[md5sum] = "3178c98341559657a15b185bf5d700a5" diff --git a/meta-openeuler/recipes-multimedia/libpng/libpng_%.bbappend b/meta-openeuler/recipes-multimedia/libpng/libpng_%.bbappend index 06a0ba773f97b8399c56da8d386c1adb3ce9d491..d712aa8c4ed57e35ac9be9826a74073fb6fb490e 100644 --- a/meta-openeuler/recipes-multimedia/libpng/libpng_%.bbappend +++ b/meta-openeuler/recipes-multimedia/libpng/libpng_%.bbappend @@ -1,14 +1,15 @@ -# main bbfile: yocto-poky/meta/recipes-multimedia/libpng/libpng_1.6.37.bb +# main bbfile: yocto-poky/meta/recipes-multimedia/libpng/libpng_1.6.39.bb # source change to openEuler -SRC_URI_remove = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}${LIBV}/${BP}.tar.xz" +SRC_URI:remove = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}${LIBV}/${BP}.tar.xz" PV = "1.6.38" + LIC_FILES_CHKSUM = "file://LICENSE;md5=5c900cc124ba35a274073b5de7639b13" # patch in openEuler # build error: libpng-fix-arm-neon.patch -SRC_URI_prepend = "file://${BP}.tar.gz \ +SRC_URI:prepend = "file://${BP}.tar.gz \ file://libpng-multilib.patch \ file://CVE-2019-6129.patch \ " diff --git a/meta-openeuler/recipes-multimedia/libtheora/libtheora_%.bbappend b/meta-openeuler/recipes-multimedia/libtheora/libtheora_%.bbappend index 09453bca8c1109e73a39178b31ec447c37c8cc13..dfd75ae54672f3036bebdef5be3312f0ea1fe977 100644 --- a/meta-openeuler/recipes-multimedia/libtheora/libtheora_%.bbappend +++ b/meta-openeuler/recipes-multimedia/libtheora/libtheora_%.bbappend @@ -1,8 +1,8 @@ -OPENEULER_SRC_URI_REMOVE = "https git http" +# the main bb file: yocto-poky/meta/recipes-multimedia/libtheora/libtheora_1.1.1.bb -PV = "1.1.1" +OPENEULER_SRC_URI_REMOVE = "https git http" -SRC_URI_prepend = "file://${BP}.tar.xz \ +SRC_URI:prepend = "file://${BP}.tar.xz \ file://Fix-pp_sharp_mod-calculation.patch \ file://examples-fix-underlinking.patch \ file://examples-png_sizeof-no-longer-available-since-libpng.patch \ diff --git a/meta-openeuler/recipes-multimedia/libtiff/tiff_%.bbappend b/meta-openeuler/recipes-multimedia/libtiff/tiff_%.bbappend index 97034c40ba93fdb9df92c67a82e2988b5da539d5..e13e2333301b078a97c70bc28b1b05fbe2820835 100644 --- a/meta-openeuler/recipes-multimedia/libtiff/tiff_%.bbappend +++ b/meta-openeuler/recipes-multimedia/libtiff/tiff_%.bbappend @@ -6,30 +6,29 @@ OPENEULER_BRANCH = "master" OPENEULER_SRC_URI_REMOVE = "https http git" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a3e32d664d6db1386b4689c8121531c3" + PV = "4.5.0" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" + +# source patch from poky +SRC_URI = " \ + file://CVE-2022-48281.patch \ + file://CVE-2023-2731.patch \ + file://CVE-2023-26965.patch \ +" + # source change to openEuler -SRC_URI += " \ +SRC_URI:append = " \ file://tiff-${PV}.tar.gz \ - file://backport-CVE-2022-48281.patch \ file://backport-0001-CVE-2023-0795-0796-0797-0798-0799.patch \ file://backport-0002-CVE-2023-0795-0796-0797-0798-0799.patch \ file://backport-CVE-2023-0800-0801-0802-0803-0804.patch \ " -# no need in 4.5.0 -CVE_CHECK_WHITELIST:remove += "CVE-2015-7313" - -# sync from 4.5.0 bb: -CVE_CHECK_IGNORE += "CVE-2015-7313" -# These issues only affect libtiff post-4.3.0 but before 4.4.0, -# caused by 3079627e and fixed by b4e79bfa. -CVE_CHECK_IGNORE += "CVE-2022-1622 CVE-2022-1623" -# Issue is in jbig which we don't enable -CVE_CHECK_IGNORE += "CVE-2022-1210" +# the list patches apply failed +# file://backport-CVE-2022-48281.patch -PACKAGECONFIG[jbig] = "--enable-jbig,--disable-jbig,jbig," -PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp," PACKAGECONFIG[zstd] = "--enable-zstd,--disable-zstd,zstd," PACKAGECONFIG[libdeflate] = "--enable-libdeflate,--disable-libdeflate,libdeflate," diff --git a/meta-openeuler/recipes-multimedia/libvorbis/libvorbis_%.bbappend b/meta-openeuler/recipes-multimedia/libvorbis/libvorbis_%.bbappend index 71ee15b137011fad69e344d84d9e9f4ca2f268cb..1fd843b02a6a207a7c1f6cd1e18ab254b3052a8d 100644 --- a/meta-openeuler/recipes-multimedia/libvorbis/libvorbis_%.bbappend +++ b/meta-openeuler/recipes-multimedia/libvorbis/libvorbis_%.bbappend @@ -1 +1,8 @@ -PV = "1.3.7" +# the main bb file: yocto-poky/meta/recipes-multimedia/libvorbis/libvorbis_1.3.7.bb + +SRC_URI:remove = "http://downloads.xiph.org/releases/vorbis/${BP}.tar.xz \ +" + +SRC_URI:append = " \ + file://libvorbis-1.3.7.tar.xz \ +" diff --git a/meta-openeuler/recipes-multimedia/webp/files/CVE-2023-1999.patch b/meta-openeuler/recipes-multimedia/webp/files/CVE-2023-1999.patch new file mode 100644 index 0000000000000000000000000000000000000000..d293ab93abb6afc8e33e2107a245e5099c04ba35 --- /dev/null +++ b/meta-openeuler/recipes-multimedia/webp/files/CVE-2023-1999.patch @@ -0,0 +1,55 @@ +From a486d800b60d0af4cc0836bf7ed8f21e12974129 Mon Sep 17 00:00:00 2001 +From: James Zern +Date: Wed, 22 Feb 2023 22:15:47 -0800 +Subject: [PATCH] EncodeAlphaInternal: clear result->bw on error + +This avoids a double free should the function fail prior to +VP8BitWriterInit() and a previous trial result's buffer carried over. +Previously in ApplyFiltersAndEncode() trial.bw (with a previous +iteration's buffer) would be freed, followed by best.bw pointing to the +same buffer. + +Since: +187d379d add a fallback to ALPHA_NO_COMPRESSION + +In addition, check the return value of VP8BitWriterInit() in this +function. + +Bug: webp:603 +Change-Id: Ic258381ee26c8c16bc211d157c8153831c8c6910 + +CVE: CVE-2023-1999 +Upstream-Status: Backport [https://github.com/webmproject/libwebp/commit/a486d800b60d0af4cc0836bf7ed8f21e12974129] +Signed-off-by: Nikhil R +--- + src/enc/alpha_enc.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/enc/alpha_enc.c b/src/enc/alpha_enc.c +index f7c02690e3..7d205586fe 100644 +--- a/src/enc/alpha_enc.c ++++ b/src/enc/alpha_enc.c +@@ -13,6 +13,7 @@ + + #include + #include ++#include + + #include "src/enc/vp8i_enc.h" + #include "src/dsp/dsp.h" +@@ -148,6 +149,7 @@ static int EncodeAlphaInternal(const uint8_t* const data, int width, int height, + } + } else { + VP8LBitWriterWipeOut(&tmp_bw); ++ memset(&result->bw, 0, sizeof(result->bw)); + return 0; + } + } +@@ -162,7 +164,7 @@ static int EncodeAlphaInternal(const uint8_t* const data, int width, int height, + header = method | (filter << 2); + if (reduce_levels) header |= ALPHA_PREPROCESSED_LEVELS << 4; + +- VP8BitWriterInit(&result->bw, ALPHA_HEADER_LEN + output_size); ++ if (!VP8BitWriterInit(&result->bw, ALPHA_HEADER_LEN + output_size)) ok = 0; + ok = ok && VP8BitWriterAppend(&result->bw, &header, ALPHA_HEADER_LEN); + ok = ok && VP8BitWriterAppend(&result->bw, output, output_size); diff --git a/meta-openeuler/recipes-multimedia/webp/libwebp_%.bbappend b/meta-openeuler/recipes-multimedia/webp/libwebp_%.bbappend index 90a4859278c7f0e39a439ed2e98d4d34646fee74..54bb9655c66b174acc0aa5b616a8e5d6960a04d8 100644 --- a/meta-openeuler/recipes-multimedia/webp/libwebp_%.bbappend +++ b/meta-openeuler/recipes-multimedia/webp/libwebp_%.bbappend @@ -1,3 +1,15 @@ +# the main bb file: yocto-poky/meta/recipes-multimedia/webp/libwebp_1.2.4.bb + PV = "1.3.0" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" + +SRC_URI:remove = " \ + http://downloads.webmproject.org/releases/webp/${BP}.tar.gz \ +" + +SRC_URI:append = " \ + file://${BP}.tar.gz \ +" + SRC_URI[sha256sum] = "64ac4614db292ae8c5aa26de0295bf1623dbb3985054cb656c55e67431def17c" diff --git a/meta-openeuler/recipes-support/attr/attr_%.bbappend b/meta-openeuler/recipes-support/attr/attr_%.bbappend index 5d48f6c40642319750fb0e0afd840c4472d8f744..d9c2ddb951017b29b9bbecbd928bb194b14a2af8 100644 --- a/meta-openeuler/recipes-support/attr/attr_%.bbappend +++ b/meta-openeuler/recipes-support/attr/attr_%.bbappend @@ -4,7 +4,7 @@ PV = "2.5.1" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = " \ +SRC_URI:remove = " \ ${SAVANNAH_GNU_MIRROR}/attr/${BP}.tar.gz \ " diff --git a/meta-openeuler/recipes-support/bash-completion/bash-completion_%.bbappend b/meta-openeuler/recipes-support/bash-completion/bash-completion_%.bbappend index 6957a254469bdee9212ea87e61de55a45a5144e0..c6f59e0abde0abe35025b31c5b66de34a94c6abf 100644 --- a/meta-openeuler/recipes-support/bash-completion/bash-completion_%.bbappend +++ b/meta-openeuler/recipes-support/bash-completion/bash-completion_%.bbappend @@ -2,6 +2,6 @@ PV = "2.11" # add patches in openEuler -SRC_URI += "file://bash-completion/bash-completion-remove-python2.patch \ +SRC_URI += "file://bash-completion-remove-python2.patch \ file://bash-completion-remove-redundant-python2-links.patch \ " diff --git a/meta-openeuler/recipes-support/boost/boost-build-native_%.bbappend b/meta-openeuler/recipes-support/boost/boost-build-native_%.bbappend index 67299fd9bf2660a37557fdb3a584f42c763dca06..c7f2f67d96b0da50e63074531369daf439a7bb6f 100644 --- a/meta-openeuler/recipes-support/boost/boost-build-native_%.bbappend +++ b/meta-openeuler/recipes-support/boost/boost-build-native_%.bbappend @@ -5,11 +5,11 @@ OPENEULER_REPO_NAME = "boost" PV = "1.81.0" -SRC_URI_remove = " \ +SRC_URI:remove = " \ git://github.com/boostorg/build;protocol=https;branch=master \ " -SRC_URI_prepend = " \ +SRC_URI:prepend = " \ file://boost_1_81_0.tar.gz \ " diff --git a/meta-openeuler/recipes-support/boost/boost_%.bbappend b/meta-openeuler/recipes-support/boost/boost_%.bbappend index 9acd3e7d7e2130e51dab831871e7d0cd7dda90a4..791ea315192085fa3359fd207580f0157e98d349 100644 --- a/meta-openeuler/recipes-support/boost/boost_%.bbappend +++ b/meta-openeuler/recipes-support/boost/boost_%.bbappend @@ -6,15 +6,18 @@ OPENEULER_REPO_NAME = "boost" PV = "1.81.0" # modify 0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" # remove conflict files -SRC_URI_remove = "https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/${BOOST_P}.tar.bz2 \ +SRC_URI:remove = "https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/${BOOST_P}.tar.bz2 \ file://boost-CVE-2012-2677.patch \ file://0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch \ + file://de657e01635306085488290ea83de541ec393f8b.patch \ + file://0001-futex-fix-build-on-32-bit-architectures-using-64-bit.patch \ + file://0001-Don-t-skip-install-targets-if-there-s-build-no-in-ur.patch \ " -SRC_URI_prepend = " \ +SRC_URI:prepend = " \ file://${BOOST_P}.tar.gz \ file://boost-1.80-outcome-Stop-Boost-regression-tests-complaining-about-no-test-tree.patch \ file://boost-1.81-graph-Dont-run-performance-test-in-CI.patch \ @@ -28,5 +31,5 @@ SRC_URI[sha256sum] = "205666dea9f6a7cfed87c7a6dfbeb52a2c1b9de55712c9c1a87735d718 S = "${WORKDIR}/${BOOST_P}" # keep consistent with the higher version bb -BOOST_LIBS += "json" + BJAM_OPTS += "-sICU_PATH=${STAGING_EXECPREFIXDIR}" diff --git a/meta-openeuler/recipes-support/ca-certificates/ca-certificates_%.bbappend b/meta-openeuler/recipes-support/ca-certificates/ca-certificates_%.bbappend index 8a26cc8d578b11c4879719ae0d0457f11d684532..60a2186bc5851ae5bdc36fd0a5bd141aacf49753 100644 --- a/meta-openeuler/recipes-support/ca-certificates/ca-certificates_%.bbappend +++ b/meta-openeuler/recipes-support/ca-certificates/ca-certificates_%.bbappend @@ -1,13 +1,13 @@ # main bbfile: yocto-poky/meta/recipes-support/ca-certificates/ca-certificates_20210119.bb # don't donwload ca-certificates by network -SRC_URI_remove = " \ +SRC_URI:remove = " \ git://salsa.debian.org/debian/ca-certificates.git;protocol=https \ git://salsa.debian.org/debian/ca-certificates.git;protocol=https;branch=master \ " # get extra tarball locally, because ca-certificates src repository doesn't have ca-certificates.crt or tarball -FILESEXTRAPATHS_append := "${THISDIR}/files/:" +FILESEXTRAPATHS:append := "${THISDIR}/files/:" SRC_URI =+ " \ file://${BP}.tar.gz \ " diff --git a/meta-openeuler/recipes-support/curl/curl_%.bbappend b/meta-openeuler/recipes-support/curl/curl_%.bbappend index 076378aca3fae6c7596fb785c9adc9e6a7a3aa30..62b027505d77b6796a359b91581b03fd9b02b454 100644 --- a/meta-openeuler/recipes-support/curl/curl_%.bbappend +++ b/meta-openeuler/recipes-support/curl/curl_%.bbappend @@ -4,22 +4,44 @@ PV = "7.86.0" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = " \ - https://curl.haxx.se/download/curl-${PV}.tar.bz2 \ - file://0001-vtls-add-isproxy-argument-to-Curl_ssl_get-addsession.patch \ - file://0002-transfer-strip-credentials-from-the-auto-referer-hea.patch \ - file://vtls-fix-addsessionid.patch \ - file://vtls-fix-warning.patch \ - file://CVE-2021-22898.patch \ - file://CVE-2021-22897.patch \ - file://CVE-2021-22925.patch \ - file://CVE-2021-22901.patch \ - file://CVE-2021-22924.patch \ - file://CVE-2021-22926.patch \ - file://CVE-2021-22945.patch \ - file://CVE-2021-22946.patch \ - file://CVE-2021-22947.patch \ -" +SRC_URI:remove = " \ + https://curl.se/download/${BP}.tar.xz \ + file://CVE-2022-22576.patch \ + file://CVE-2022-27775.patch \ + file://CVE-2022-27776.patch \ + file://CVE-2022-27774-1.patch \ + file://CVE-2022-27774-2.patch \ + file://CVE-2022-27774-3.patch \ + file://CVE-2022-27774-4.patch \ + file://CVE-2022-30115.patch \ + file://CVE-2022-27780.patch \ + file://CVE-2022-27781.patch \ + file://CVE-2022-27779.patch \ + file://CVE-2022-27782-1.patch \ + file://CVE-2022-27782-2.patch \ + file://0001-openssl-fix-CN-check-error-code.patch \ + file://CVE-2022-32205.patch \ + file://CVE-2022-32206.patch \ + file://CVE-2022-32207.patch \ + file://CVE-2022-32208.patch \ + file://CVE-2022-35252.patch \ + file://CVE-2022-32221.patch \ + file://CVE-2022-42916.patch \ + file://CVE-2022-42915.patch \ + file://CVE-2022-43551.patch \ + file://CVE-2022-43552.patch \ + file://CVE-2023-23914_5-1.patch \ + file://CVE-2023-23914_5-2.patch \ + file://CVE-2023-23914_5-3.patch \ + file://CVE-2023-23914_5-4.patch \ + file://CVE-2023-23914_5-5.patch \ + file://CVE-2023-23916.patch \ + file://CVE-2023-27533.patch \ + file://CVE-2023-27534.patch \ + file://CVE-2023-27535-pre1.patch \ + file://CVE-2023-27535_and_CVE-2023-27538.patch \ + file://CVE-2023-27536.patch \ + " # files, patches that come from openeuler # do not apply backport-0101-curl-7.32.0-multilib.patch due to failure "libcurl.pc failed sanity test" when doing QA staging "pkg-config libcurl" in this patch @@ -43,7 +65,7 @@ SRC_URI[sha256sum] = "2d61116e5f485581f6d59865377df4463f2e788677ac43222b496d4e49 LIC_FILES_CHKSUM = "file://COPYING;md5=190c514872597083303371684954f238" # the version 7.86.0 in install function add a sed command -do_install_append_class-target() { +do_install:append:class-target() { # cleanup buildpaths from curl-config sed -i \ -e 's|${@" ".join(d.getVar("DEBUG_PREFIX_MAP").split())}||g' \ @@ -51,7 +73,7 @@ do_install_append_class-target() { } # configure.ac in openEuler can't handle --without-libmetalink variable -EXTRA_OECONF_remove = " \ +EXTRA_OECONF:remove = " \ --without-libmetalink \ " @@ -61,13 +83,13 @@ PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl" PACKAGECONFIG[ssl] = "" PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd" -EXTRA_OECONF_append = " \ +EXTRA_OECONF:append = " \ ${@'--without-ssl' if (bb.utils.filter('PACKAGECONFIG', 'gnutls mbedtls nss openssl', d) == '') else ''} \ " # It is not safe to pack crt files in rootfs by default, if you sure what you want, comment these lines: -EXTRA_OECONF_remove += " \ +EXTRA_OECONF:remove = " \ --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ --without-libmetalink \ " -RRECOMMENDS_lib${BPN}_remove += "ca-certificates" +RRECOMMENDS_lib${BPN}:remove = "ca-certificates" diff --git a/meta-openeuler/recipes-support/db/db_%.bbappend b/meta-openeuler/recipes-support/db/db_%.bbappend index 3bfc3196695d679f629ea4724685c11cf261d37a..b637e49db789b483fa73216ce6a10cbe3be36924 100644 --- a/meta-openeuler/recipes-support/db/db_%.bbappend +++ b/meta-openeuler/recipes-support/db/db_%.bbappend @@ -4,7 +4,7 @@ OPENEULER_REPO_NAME = "libdb" # files, patches can't be applied in openeuler or conflict with openeuler # patches that apply fail: # 0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch -SRC_URI_remove = "file://0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch \ +SRC_URI:remove = "file://0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch \ " # files, patches that come from openeuler @@ -15,21 +15,23 @@ SRC_URI_remove = "file://0001-atomic-Rename-local-__atomic_compare_exchange-to-a # db-5.3.28-condition-variable-ppc.patch # db-5.3.28-rpm-lock-check.patch # add-check-for-device-number-in-__check_lock_fn.patch -SRC_URI_prepend = "file://libdb-multiarch.patch \ - file://db-4.6.21-1.85-compat.patch \ - file://db-4.5.20-jni-include-dir.patch \ - file://007-mt19937db.c_license.patch \ - file://java8-fix.patch \ - file://db-5.3.21-memp_stat-upstream-fix.patch \ - file://db-5.3.21-mutex_leak.patch \ - file://db-5.3.28-lemon_hash.patch \ - file://db-5.3.28-cwd-db_config.patch \ - file://libdb-5.3.21-region-size-check.patch \ - file://checkpoint-opd-deadlock.patch \ - file://db-5.3.28-atomic_compare_exchange.patch \ - file://backport-CVE-2019-2708-Resolved-data-store-execution-which-led-to-partial-DoS.patch \ - file://bugfix-fix-deadlock-on-mempool-file-locks.patch \ - file://libdb-limit-cpu.patch \ - file://fix-a-potential-infinite-loop.patch \ - file://db-5.3.28-sw.patch \ +SRC_URI:append = "\ + file://db-${PV}.tar.gz \ + file://libdb-multiarch.patch \ + file://db-4.6.21-1.85-compat.patch \ + file://db-4.5.20-jni-include-dir.patch \ + file://007-mt19937db.c_license.patch \ + file://java8-fix.patch \ + file://db-5.3.21-memp_stat-upstream-fix.patch \ + file://db-5.3.21-mutex_leak.patch \ + file://db-5.3.28-lemon_hash.patch \ + file://db-5.3.28-cwd-db_config.patch \ + file://libdb-5.3.21-region-size-check.patch \ + file://checkpoint-opd-deadlock.patch \ + file://db-5.3.28-atomic_compare_exchange.patch \ + file://backport-CVE-2019-2708-Resolved-data-store-execution-which-led-to-partial-DoS.patch \ + file://bugfix-fix-deadlock-on-mempool-file-locks.patch \ + file://libdb-limit-cpu.patch \ + file://fix-a-potential-infinite-loop.patch \ + file://db-5.3.28-sw.patch \ " diff --git a/meta-openeuler/recipes-support/debianutils/debianutils_%.bbappend b/meta-openeuler/recipes-support/debianutils/debianutils_%.bbappend index 59254320e93c8dcfe8c5ef5a2f93427bcedccd3c..4450468c4e684269635479c825fc2bc048a4a98d 100644 --- a/meta-openeuler/recipes-support/debianutils/debianutils_%.bbappend +++ b/meta-openeuler/recipes-support/debianutils/debianutils_%.bbappend @@ -1,12 +1,10 @@ -# main bbfile: yocto-poky/meta/recipes-support/debianutils/debianutils_4.11.2.bb - -# files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = " \ - http://snapshot.debian.org/archive/debian/20200929T025235Z/pool/main/d/${BPN}/${BPN}_${PV}.tar.xz \ -" +# main bbfile: yocto-poky/meta/recipes-support/debianutils/debianutils_5.7.bb # get extra tarball locally, because there is no debianutils src repository -FILESEXTRAPATHS_append := "${THISDIR}/files/:" -SRC_URI += " \ - file://${BPN}_${PV}.tar.xz \ -" +FILESEXTRAPATHS:append := "${THISDIR}/files/:" + +SRC_URI:remove = "git://salsa.debian.org/debian/debianutils.git;protocol=https;branch=master" + +SRC_URI += "file://${BP}.tar.gz" + +SRC_URI[sha256sum] = "e9cdbef160b5adfd34536bab4c7a3d460b754e464d8011a020140b7434e01d88" diff --git a/meta-openeuler/recipes-support/debianutils/files/debianutils-5.7.tar.gz b/meta-openeuler/recipes-support/debianutils/files/debianutils-5.7.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..1fe1107803d026bffb6db8187205173bd4ad1c16 Binary files /dev/null and b/meta-openeuler/recipes-support/debianutils/files/debianutils-5.7.tar.gz differ diff --git a/meta-openeuler/recipes-support/debianutils/files/debianutils_4.11.2.tar.xz b/meta-openeuler/recipes-support/debianutils/files/debianutils_4.11.2.tar.xz deleted file mode 100644 index f2df2a04858dba7a21e454ce1173d75020ef40cf..0000000000000000000000000000000000000000 Binary files a/meta-openeuler/recipes-support/debianutils/files/debianutils_4.11.2.tar.xz and /dev/null differ diff --git a/meta-openeuler/recipes-support/ethercat/ethercat_e1000e-5.10.bb b/meta-openeuler/recipes-support/ethercat/ethercat_e1000e-5.10.bb index 0a54cfbfd755c11c5bc5d6611bc2bd1e5cadac84..20403c1f447f0b385a1df2ce3fd3f9884a766128 100644 --- a/meta-openeuler/recipes-support/ethercat/ethercat_e1000e-5.10.bb +++ b/meta-openeuler/recipes-support/ethercat/ethercat_e1000e-5.10.bb @@ -23,26 +23,26 @@ do_configure[depends] += "virtual/kernel:do_shared_workdir" inherit autotools-brokensep pkgconfig module-base # disable the textrel check -INSANE_SKIP_${PN} = "textrel" +INSANE_SKIP:${PN} = "textrel" EXTRA_OECONF += "--with-linux-dir=${STAGING_KERNEL_BUILDDIR}" EXTRA_OECONF += "--with-module-dir=kernel/ethercat" -do_configure_prepend() { +do_configure:prepend() { # Fixes configure error # | Makefile.am: error: required file './ChangeLog' not found" touch ChangeLog } -do_compile_append() { +do_compile:append() { oe_runmake modules } -do_install_append() { +do_install:append() { oe_runmake MODLIB=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION} modules_install # Do distclean after installation to fix the error in the second compilation: # | error: .libs/libethercat_la-common.o: No such file or directory oe_runmake distclean } -FILES_${PN} += "${nonarch_base_libdir}/modules/${KERNEL_VERSION}" +FILES:${PN} += "${nonarch_base_libdir}/modules/${KERNEL_VERSION}" diff --git a/meta-openeuler/recipes-support/gdbm/gdbm_%.bbappend b/meta-openeuler/recipes-support/gdbm/gdbm_%.bbappend index 264416815aa7be6d0b5c13121f2aa38f5f997ef9..9ae0d13775cb745473667d1dffb3c2ff37665027 100644 --- a/meta-openeuler/recipes-support/gdbm/gdbm_%.bbappend +++ b/meta-openeuler/recipes-support/gdbm/gdbm_%.bbappend @@ -5,7 +5,7 @@ PV = "1.23" # files, patches can't be applied in openeuler or conflict with openeuler # ptest.patch, patch-fuzz warning -SRC_URI_remove = " \ +SRC_URI:remove = " \ ${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ file://ptest.patch \ " diff --git a/meta-openeuler/recipes-support/gmp/gmp_%.bbappend b/meta-openeuler/recipes-support/gmp/gmp_%.bbappend index 971e613297473a13700ea9cb834ceff69010758a..b0084be085ab4d250f669ba577987ac8e0a3a183 100644 --- a/meta-openeuler/recipes-support/gmp/gmp_%.bbappend +++ b/meta-openeuler/recipes-support/gmp/gmp_%.bbappend @@ -1,7 +1,7 @@ # use openeuler's cve patch -SRC_URI_remove += " \ +SRC_URI:remove = " \ file://cve-2021-43618.patch \ " -SRC_URI += "file://0001-CVE-2021-43618.patch \ +SRC_URI:prepend = "file://0001-CVE-2021-43618.patch \ " diff --git a/meta-openeuler/recipes-support/gnupg/gnupg_%.bbappend b/meta-openeuler/recipes-support/gnupg/gnupg_%.bbappend index 4e885897c4d1d4095a59b170536d5a59f8364a90..067edadb38a5a60a70d0814a34a34b4edb11f450 100644 --- a/meta-openeuler/recipes-support/gnupg/gnupg_%.bbappend +++ b/meta-openeuler/recipes-support/gnupg/gnupg_%.bbappend @@ -16,15 +16,15 @@ SRC_URI = " \ " # apply patches from poky -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += " \ file://0002-use-pkgconfig-instead-of-npth-config.patch \ file://0004-autogen.sh-fix-find-version-for-beta-checking.patch \ file://0001-Woverride-init-is-not-needed-with-gcc-9.patch \ " -SRC_URI_append_class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch \ +SRC_URI:append:class-native = " file://0001-configure.ac-use-a-custom-value-for-the-location-of-.patch \ file://relocate.patch" -SRC_URI_append_class-nativesdk = " file://relocate.patch" +SRC_URI:append:class-nativesdk = " file://relocate.patch" SRC_URI[sha256sum] = "21f7fe2fc5c2f214184ab050977ec7a8e304e58bfae2ab098fec69f8fabda9c1" diff --git a/meta-openeuler/recipes-support/gnutls/files/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch b/meta-openeuler/recipes-support/gnutls/files/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch new file mode 100644 index 0000000000000000000000000000000000000000..aba739cc02b91d947818e9a4a52d1172b27307b7 --- /dev/null +++ b/meta-openeuler/recipes-support/gnutls/files/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch @@ -0,0 +1,28 @@ +From b729a356538d499fe25e82bfc78ea663bdaca0a8 Mon Sep 17 00:00:00 2001 +From: Lei Maohui +Date: Mon, 23 May 2022 10:44:43 +0900 +Subject: [PATCH] Creating .hmac file should be excuted in target environment, + so deleted it from build process. + +Upstream-Status: Inappropriate [https://gitlab.com/gnutls/gnutls/-/issues/1373] +Signed-off-by: Lei Maohui +--- + lib/Makefile.am | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/lib/Makefile.am b/lib/Makefile.am +index 0b43ef9..cf263f0 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -206,8 +206,7 @@ hmac_files = .libs/.gnutls.hmac + + all-local: $(hmac_files) + +-.libs/.gnutls.hmac: libgnutls.la fipshmac +- $(AM_V_GEN) $(builddir)/fipshmac > $@-t && mv $@-t $@ ++.libs/.gnutls.hmac: + + CLEANFILES = $(hmac_files) + endif +-- +2.25.1 \ No newline at end of file diff --git a/meta-openeuler/recipes-support/gnutls/gnutls_%.bbappend b/meta-openeuler/recipes-support/gnutls/gnutls_%.bbappend index 018a66a7683906c881092986b5701725cea13a93..da86a0cd2f3983897a03e5ea8fee84176d7443c8 100644 --- a/meta-openeuler/recipes-support/gnutls/gnutls_%.bbappend +++ b/meta-openeuler/recipes-support/gnutls/gnutls_%.bbappend @@ -1,21 +1,44 @@ -# main bbfile: yocto-poky/meta/recipes-support/gnutls/gnutls_3.7.1.bb +# main bbfile: yocto-poky/meta/recipes-support/gnutls/gnutls_3.7.4.bb # version in openEuler PV = "3.7.8" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" + # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = " \ +SRC_URI:remove = " \ https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \ + file://CVE-2022-2509.patch \ + file://CVE-2023-0361.patch \ +" + +SRC_URI:append = " \ + file://0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch \ " # files, patches that come from openeuler -SRC_URI += " \ +SRC_URI:append = " \ file://${BP}.tar.xz \ file://fix-ipv6-handshake-failed.patch \ file://backport-01-CVE-2023-0361.patch \ file://backport-02-CVE-2023-0361.patch \ " -EXTRA_OECONF_remove = "--enable-local-libopts" +EXTRA_OECONF:remove = "--enable-local-libopts" SRC_URI[sha256sum] = "646e6c5a9a185faa4cea796d378a1ba8e1148dbb197ca6605f95986a25af2752" + +PACKAGECONFIG[fips] = "--enable-fips140-mode --with-libdl-prefix=${STAGING_BASELIBDIR}" +PACKAGES:append = " ${PN}-fips" + +pkg_postinst_ontarget:${PN}-fips () { + if test -x ${bindir}/fipshmac + then + mkdir ${sysconfdir}/gnutls + touch ${sysconfdir}/gnutls/config + ${bindir}/fipshmac ${libdir}/libgnutls.so.30.*.* > ${libdir}/.libgnutls.so.30.hmac + ${bindir}/fipshmac ${libdir}/libnettle.so.8.* > ${libdir}/.libnettle.so.8.hmac + ${bindir}/fipshmac ${libdir}/libgmp.so.10.*.* > ${libdir}/.libgmp.so.10.hmac + ${bindir}/fipshmac ${libdir}/libhogweed.so.6.* > ${libdir}/.libhogweed.so.6.hmac + fi +} diff --git a/meta-openeuler/recipes-support/gpgme/gpgme_%.bbappend b/meta-openeuler/recipes-support/gpgme/gpgme_%.bbappend index 74dfaf378d11537780287d05310b16ab483ace6a..afa66311975818229f505c726e1035a23f97d8c2 100644 --- a/meta-openeuler/recipes-support/gpgme/gpgme_%.bbappend +++ b/meta-openeuler/recipes-support/gpgme/gpgme_%.bbappend @@ -1,15 +1,15 @@ PV = "1.17.0" -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" # delete conflict patches of openeuler and poky # openeuler has add 0004 patch, not use it from poky -SRC_URI_remove = " \ +SRC_URI:remove = " \ file://0004-python-import.patch \ " # add patches from openeuler -SRC_URI_prepend = "\ +SRC_URI:prepend = "\ file://0001-don-t-add-extra-libraries-for-linking.patch \ file://gpgme-1.3.2-largefile.patch \ file://0001-fix-stupid-ax_python_devel.patch \ diff --git a/meta-openeuler/recipes-support/http-parser/http-parser_%.bbappend b/meta-openeuler/recipes-support/http-parser/http-parser_%.bbappend index 94897a4cbaf78f8532c7b2cfd248945bfec917fc..89a1bb8e654ca44e2036936cafc9dabf37ea8d25 100644 --- a/meta-openeuler/recipes-support/http-parser/http-parser_%.bbappend +++ b/meta-openeuler/recipes-support/http-parser/http-parser_%.bbappend @@ -1,9 +1,9 @@ # source bb: meta-networking/recipes-support/http-parser/http-parser_2.9.4.bb;branch=master -SRC_URI_remove = "git://github.com/nodejs/http-parser.git;branch=master;protocol=https" +SRC_URI:remove = "git://github.com/nodejs/http-parser.git;branch=master;protocol=https" # apply openeuler source and patch -SRC_URI_prepend = "file://${BP}.tar.gz \ +SRC_URI:prepend = "file://${BP}.tar.gz \ file://backport-url-treat-empty-port-as-default.patch \ " diff --git a/meta-openeuler/recipes-support/icu/icu_%.bbappend b/meta-openeuler/recipes-support/icu/icu_%.bbappend index 109a3b417ad6e9667fa75a13a1f8796be7765b68..3d57d13852e35657893588ca19a3bb5c39d08927 100644 --- a/meta-openeuler/recipes-support/icu/icu_%.bbappend +++ b/meta-openeuler/recipes-support/icu/icu_%.bbappend @@ -5,12 +5,17 @@ PV = "72.1" LIC_FILES_CHKSUM = "file://../LICENSE;md5=a89d03060ff9c46552434dbd1fe3ed1f" -SRC_URI_prepend = "file://${BPN}4c-${ICU_PV}-src.tgz \ - file://gennorm2-man.patch;striplevel=2 \ - file://icuinfo-man.patch;striplevel=2 \ - file://backport-remove-TestJitterbug6175.patch;striplevel=2 \ - file://0001-add-support-loongarch64.patch;striplevel=2 \ - file://icu-Add-sw64-architecture.patch;striplevel=2 \ - " +SRC_URI:prepend = " \ + file://${BPN}4c-${ICU_PV}-src.tgz \ + file://gennorm2-man.patch;striplevel=2 \ + file://icuinfo-man.patch;striplevel=2 \ + file://backport-remove-TestJitterbug6175.patch;striplevel=2 \ + file://0001-add-support-loongarch64.patch;striplevel=2 \ + file://icu-Add-sw64-architecture.patch;striplevel=2 \ +" SRC_URI[sha256sum] = "a2d2d38217092a7ed56635e34467f92f976b370e20182ad325edea6681a71d68" + +# EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE} --disable-icu-config" +# EXTRA_OECONF:class-native = "--disable-icu-config" +# EXTRA_OECONF:class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE} --disable-icu-config" diff --git a/meta-openeuler/recipes-support/iso-codes/iso-codes_%.bbappend b/meta-openeuler/recipes-support/iso-codes/iso-codes_%.bbappend index 635ca3f182cbe9147ead85c1d87e2d6e4cce7990..f8ce000d8a51ace7ce1521e85e269bf9e4e1a951 100644 --- a/meta-openeuler/recipes-support/iso-codes/iso-codes_%.bbappend +++ b/meta-openeuler/recipes-support/iso-codes/iso-codes_%.bbappend @@ -1,8 +1,9 @@ +# the main bb file: yocto-poky/meta/recipes-support/iso-codes/iso-codes_4.13.0.bb OPENEULER_SRC_URI_REMOVE = "https git http" PV = "4.7.0" -SRC_URI_prepend = "file://${BPN}-${BP}.tar.gz \ +SRC_URI = "file://${BPN}-${BP}.tar.gz \ " S = "${WORKDIR}/${BPN}-${BP}" diff --git a/meta-openeuler/recipes-support/libassuan/libassuan_%.bbappend b/meta-openeuler/recipes-support/libassuan/libassuan_%.bbappend index 51083d0110fa83148003260f09ec9ee440284c97..bffd7e5d78e600658f8f84ccab0a197f87fec04f 100644 --- a/meta-openeuler/recipes-support/libassuan/libassuan_%.bbappend +++ b/meta-openeuler/recipes-support/libassuan/libassuan_%.bbappend @@ -7,7 +7,7 @@ SRC_URI = "\ " # add patch from poky to fix gpgme configure error: cannot find libassuan -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += " \ file://libassuan-add-pkgconfig-support.patch \ " diff --git a/meta-openeuler/recipes-support/libcap-ng/libcap-ng_%.bbappend b/meta-openeuler/recipes-support/libcap-ng/libcap-ng_%.bbappend index 3a0eacb985864257ec7335121426cbc7c49109b1..711c9dbbfefba6db6cb609b9dc8dd6485736a30d 100644 --- a/meta-openeuler/recipes-support/libcap-ng/libcap-ng_%.bbappend +++ b/meta-openeuler/recipes-support/libcap-ng/libcap-ng_%.bbappend @@ -4,9 +4,9 @@ OPENEULER_SRC_URI_REMOVE = "https git" PV = "0.8.3" # determinism.patch no need for 0.8.3 -SRC_URI_remove += "file://determinism.patch" +SRC_URI:remove = "file://determinism.patch" -SRC_URI += " \ +SRC_URI:append = " \ file://libcap-ng-${PV}.tar.gz \ file://backport-Make-Python-test-script-compatible-with-Python2-and-Python3.patch \ " diff --git a/meta-openeuler/recipes-support/libcap/libcap_%.bbappend b/meta-openeuler/recipes-support/libcap/libcap_%.bbappend index 71afad4f4da631d23a40870794f9c50ce5f73998..7b119d3ccc5ed6770a445913cddd84980f904f25 100644 --- a/meta-openeuler/recipes-support/libcap/libcap_%.bbappend +++ b/meta-openeuler/recipes-support/libcap/libcap_%.bbappend @@ -8,16 +8,6 @@ SRC_URI = " \ file://${BPN}-${PV}.tar.gz \ file://libcap-buildflags.patch \ " -# patches from poky -SRC_URI += " \ - file://0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch \ -" - -# BUILD_GPERF is now reserved, please use USE_GPERF=yes or no instead. -EXTRA_OEMAKE_remove = "BUILD_GPERF=yes \ -" -EXTRA_OEMAKE_append = "USE_GPERF=yes \ -" # use cross compile objcopy # set lib dir, not use ldd to find, maybe fail diff --git a/meta-openeuler/recipes-support/libcheck/libcheck_%.bbappend b/meta-openeuler/recipes-support/libcheck/libcheck_%.bbappend index f02382984d4874f8d3e7dbda79f677816c1df44c..e658f71e9b9662cd16a1c478813a9809167906a3 100644 --- a/meta-openeuler/recipes-support/libcheck/libcheck_%.bbappend +++ b/meta-openeuler/recipes-support/libcheck/libcheck_%.bbappend @@ -1,7 +1,7 @@ PV = "0.15.2" OPENEULER_REPO_NAME = "check" -SRC_URI_remove = "https://github.com/${BPN}/check/releases/download/${PV}/check-${PV}.tar.gz \" -SRC_URI_prepend = "file://check-${PV}.tar.gz \ +SRC_URI:remove = "https://github.com/${BPN}/check/releases/download/${PV}/check-${PV}.tar.gz \" +SRC_URI:prepend = "file://check-${PV}.tar.gz \ file://check-0.11.0-fp.patch \ file://check-0.11.0-info-in-builddir.patch \ " diff --git a/meta-openeuler/recipes-support/libevdev/libevdev_%.bbappend b/meta-openeuler/recipes-support/libevdev/libevdev_%.bbappend index 2b960f20aba260bac4a6aaf856dd69c52d96c610..7461fecc6df3b70e8001832a2d99398e4580ed17 100644 --- a/meta-openeuler/recipes-support/libevdev/libevdev_%.bbappend +++ b/meta-openeuler/recipes-support/libevdev/libevdev_%.bbappend @@ -1,3 +1,5 @@ +# main bb file: yocto-poky/meta/recipes-support/libevdev/libevdev_1.12.1.bb + PV = "1.13.0" SRC_URI = "file://libevdev-${PV}.tar.xz" diff --git a/meta-openeuler/recipes-support/libevent/libevent_%.bbappend b/meta-openeuler/recipes-support/libevent/libevent_%.bbappend index cc61108334e36ed5e4a35d8521f55e8c1af4a82c..1c1d7d2e2e1dda1a45e6ca0c7d94430bee408948 100644 --- a/meta-openeuler/recipes-support/libevent/libevent_%.bbappend +++ b/meta-openeuler/recipes-support/libevent/libevent_%.bbappend @@ -1,4 +1,6 @@ -SRC_URI += " \ +# main bb file: yocto-poky/meta/recipes-support/libevdev/libevent_2.1.12.bb + +SRC_URI:append = "\ file://libevent-nonettests.patch \ file://http-add-callback-to-allow-server-to-decline-and-the.patch \ file://add-testcases-for-event.c-apis.patch \ diff --git a/meta-openeuler/recipes-support/libffi/libffi_%.bbappend b/meta-openeuler/recipes-support/libffi/libffi_%.bbappend index 3426a5a0389fd0b19352c93a1d9c0fa98fad8efb..68a4f5fad7ae9d0dd017438fb14e3ff953d94481 100644 --- a/meta-openeuler/recipes-support/libffi/libffi_%.bbappend +++ b/meta-openeuler/recipes-support/libffi/libffi_%.bbappend @@ -1,16 +1,5 @@ -PV = "3.4.4" +# the main bb file: yocto-poky/meta/recipes-support/libffi/libffi_3.4.4.bb -LIC_FILES_CHKSUM = "file://LICENSE;md5=32c0d09a0641daf4903e5d61cc8f23a8" - -# add not-win32.patch to fix libdir error -SRC_URI = " \ - file://${BPN}-${PV}.tar.gz \ - file://not-win32.patch \ -" - -#patches from openeuler -SRC_URI += " \ +SRC_URI:prepend = "file://backport-Fix-signed-vs-unsigned-comparison.patch \ + file://fix-AARCH64EB-support.patch \ " - -SRC_URI[md5sum] = "0da1a5ed7786ac12dcbaf0d499d8a049" -SRC_URI[sha256sum] = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676" diff --git a/meta-openeuler/recipes-support/libgcrypt/libgcrypt_%.bbappend b/meta-openeuler/recipes-support/libgcrypt/libgcrypt_%.bbappend index 2a1d86f37ddb43071ea54bdca01d3c6cf2d82f06..50d57dc9a4e0eeb04fc1c9c5830cd588c68d4e14 100644 --- a/meta-openeuler/recipes-support/libgcrypt/libgcrypt_%.bbappend +++ b/meta-openeuler/recipes-support/libgcrypt/libgcrypt_%.bbappend @@ -1,21 +1,19 @@ -# version in openEuler -PV = "1.9.4" +# the main bb file: yocto-poky/meta/recipes-support/libgcrypt/libgcrypt_1.9.4.bb # patches in openEuler -SRC_URI_prepend = "file://backport-libgcrypt-1.8.5-use-fipscheck.patch \ - file://backport-libgcrypt-1.8.4-fips-keygen.patch \ - file://backport-libgcrypt-1.8.4-tests-fipsmode.patch \ - file://backport-libgcrypt-1.7.3-fips-cavs.patch \ - file://backport-libgcrypt-1.8.4-use-poll.patch \ - file://backport-libgcrypt-1.6.1-mpicoder-gccopt.patch \ - file://backport-libgcrypt-1.7.3-ecc-test-fix.patch \ - file://backport-libgcrypt-1.8.3-fips-ctor.patch \ - file://backport-libgcrypt-1.8.5-getrandom.patch \ - file://backport-libgcrypt-1.8.3-fips-enttest.patch \ - file://backport-libgcrypt-1.8.3-md-fips-enforce.patch \ - file://backport-libgcrypt-1.8.5-intel-cet.patch \ - file://backport-libgcrypt-1.8.5-fips-module.patch \ +SRC_URI:prepend = " \ + file://libgcrypt-${PV}.tar.bz2 \ + file://backport-libgcrypt-1.8.5-use-fipscheck.patch \ + file://backport-libgcrypt-1.8.4-fips-keygen.patch \ + file://backport-libgcrypt-1.8.4-tests-fipsmode.patch \ + file://backport-libgcrypt-1.7.3-fips-cavs.patch \ + file://backport-libgcrypt-1.8.4-use-poll.patch \ + file://backport-libgcrypt-1.6.1-mpicoder-gccopt.patch \ + file://backport-libgcrypt-1.7.3-ecc-test-fix.patch \ + file://backport-libgcrypt-1.8.3-fips-ctor.patch \ + file://backport-libgcrypt-1.8.5-getrandom.patch \ + file://backport-libgcrypt-1.8.3-fips-enttest.patch \ + file://backport-libgcrypt-1.8.3-md-fips-enforce.patch \ + file://backport-libgcrypt-1.8.5-intel-cet.patch \ + file://backport-libgcrypt-1.8.5-fips-module.patch \ " - -# checksum changed -SRC_URI[sha256sum] = "ea849c83a72454e3ed4267697e8ca03390aee972ab421e7df69dfe42b65caaf7" diff --git a/meta-openeuler/recipes-support/libgpg-error/libgpg-error_%.bbappend b/meta-openeuler/recipes-support/libgpg-error/libgpg-error_%.bbappend index 78a80461c85394b3f827ffae1ff104d9f419b2e0..c9c28852a5e2d26c1d904fcff3b1130391ccdbe1 100644 --- a/meta-openeuler/recipes-support/libgpg-error/libgpg-error_%.bbappend +++ b/meta-openeuler/recipes-support/libgpg-error/libgpg-error_%.bbappend @@ -2,11 +2,11 @@ PV = "1.46" # apply source package in openEuler -SRC_URI_remove = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ +SRC_URI:remove = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \ file://pkgconfig.patch \ " -SRC_URI_prepend = "file://libgpg-error-${PV}.tar.gz \ +SRC_URI:prepend = "file://libgpg-error-${PV}.tar.gz \ file://libgpg-error-1.29-multilib.patch \ " @@ -15,7 +15,7 @@ SRC_URI_prepend = "file://libgpg-error-${PV}.tar.gz \ SRC_URI += "file://pkgconfig-fix.patch " # patch directary -FILESEXTRAPATHS_append := "${THISDIR}/files/:" +FILESEXTRAPATHS:append := "${THISDIR}/files/:" # checksum changed SRC_URI[sha256sum] = "5b724411231f40cb0454250379a9a659e1dda69c161ba8d69f89c7a39a847b7e" diff --git a/meta-openeuler/recipes-support/libical/libical_%.bbappend b/meta-openeuler/recipes-support/libical/libical_%.bbappend index 637dfd8dce6838520df3b85c1f7e63b7a2546408..7e1c1d47a8e7ef0128525d0777569ff3d6677a49 100644 --- a/meta-openeuler/recipes-support/libical/libical_%.bbappend +++ b/meta-openeuler/recipes-support/libical/libical_%.bbappend @@ -1,12 +1,4 @@ -# main bb yocto-poky/meta/recipes-support/libical/libical_3.0.9.bb +# main bb yocto-poky/meta/recipes-support/libical/libical_3.0.16.bb -# todo: The new version has some bbclass introductions and cmake changes, not clear the usefulness, and -# improve the BB file later - -# apply openeuler source package -PV = "3.0.16" - -SRC_URI = "\ - file://${BP}.tar.gz \ - file://libical-bugfix-timeout-found-by-fuzzer.patch \ +SRC_URI:prepend = "file://libical-bugfix-timeout-found-by-fuzzer.patch \ " diff --git a/meta-openeuler/recipes-support/libjitterentropy/libjitterentropy_%.bbappend b/meta-openeuler/recipes-support/libjitterentropy/libjitterentropy_%.bbappend index 9607f8161c3086a858b350b1fd96e14800f424e5..f3cdd3a24964ea2231ede6ce3c9a773eee272ff7 100644 --- a/meta-openeuler/recipes-support/libjitterentropy/libjitterentropy_%.bbappend +++ b/meta-openeuler/recipes-support/libjitterentropy/libjitterentropy_%.bbappend @@ -1,4 +1,4 @@ -# main bbfile: yocto-poky/meta/recipes-support/libjitterentropy_3.0.1.bb +# main bbfile: yocto-poky/meta/recipes-support/libjitterentropy_3.4.0.bb OPENEULER_REPO_NAME = "jitterentropy-library" diff --git a/meta-openeuler/recipes-support/libksba/libksba_%.bbappend b/meta-openeuler/recipes-support/libksba/libksba_%.bbappend index 73cff6ae2762c68d5ba2a77eff8b76aee344c199..93b83b74769545704d3f98a9d22d0a0ee1c93027 100644 --- a/meta-openeuler/recipes-support/libksba/libksba_%.bbappend +++ b/meta-openeuler/recipes-support/libksba/libksba_%.bbappend @@ -3,5 +3,5 @@ PV = "1.6.3" SRC_URI[sha256sum] = "3f72c68db30971ebbf14367527719423f0a4d5f8103fc9f4a1c01a9fa440de5c" # the patch ksba-add-pkgconfig-support.patch will result in error -SRC_URI_remove = "file://ksba-add-pkgconfig-support.patch \ +SRC_URI:remove = "file://ksba-add-pkgconfig-support.patch \ " diff --git a/meta-openeuler/recipes-support/libmpc/libmpc_%.bbappend b/meta-openeuler/recipes-support/libmpc/libmpc_%.bbappend index be5c6f6341ae2e46e6bd08d10b813da7bd72abcd..90943a90f07bcb63e1ee97ad2253a1743daf79fc 100644 --- a/meta-openeuler/recipes-support/libmpc/libmpc_%.bbappend +++ b/meta-openeuler/recipes-support/libmpc/libmpc_%.bbappend @@ -2,5 +2,5 @@ PV = "1.2.0" -SRC_URI_remove = "${GNU_MIRROR}/mpc/mpc-${PV}.tar.gz " -SRC_URI_prepend = "file://mpc-${PV}.tar.gz " +SRC_URI:remove = "${GNU_MIRROR}/mpc/mpc-${PV}.tar.gz " +SRC_URI:prepend = "file://mpc-${PV}.tar.gz " diff --git a/meta-openeuler/recipes-support/libnl/libnl_%.bbappend b/meta-openeuler/recipes-support/libnl/libnl_%.bbappend index 60d7dc0dcd4a6e854dbfec149c2e206d830e8b06..a77bb9f577655ca1a5f44f94b0005120327b99b8 100644 --- a/meta-openeuler/recipes-support/libnl/libnl_%.bbappend +++ b/meta-openeuler/recipes-support/libnl/libnl_%.bbappend @@ -1,5 +1,17 @@ +# the main bb file: yocto-poky/meta/recipes-support/libnl/ + OPENEULER_REPO_NAME = "libnl3" + PV = "3.7.0" +SRC_URI:remove = " \ + https://github.com/thom311/${BPN}/releases/download/${BPN}${@d.getVar('PV').replace('.','_')}/${BP}.tar.g \ + file://enable-serial-tests.patch \ +" + +SRC_URI:append = "\ + file://libnl-3.7.0.tar.gz \ +" + SRC_URI[md5sum] = "b381405afd14e466e35d29a112480333" SRC_URI[sha256sum] = "9fe43ccbeeea72c653bdcf8c93332583135cda46a79507bfd0a483bb57f65939" diff --git a/meta-openeuler/recipes-support/libpcre/libpcre2_%.bbappend b/meta-openeuler/recipes-support/libpcre/libpcre2_%.bbappend index fdb4d70adb342ea928ce65042881d35d3cee2a8a..8e762030f481b0dec8fe584a14b783fc13aa5848 100644 --- a/meta-openeuler/recipes-support/libpcre/libpcre2_%.bbappend +++ b/meta-openeuler/recipes-support/libpcre/libpcre2_%.bbappend @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=41bfb977e4933c506588724ce69bf5d2" OPENEULER_REPO_NAME = "pcre2" # use openeuler source -SRC_URI_prepend = "file://backport-pcre2-10.10-Fix-multilib.patch \ +SRC_URI:prepend = "file://backport-pcre2-10.10-Fix-multilib.patch \ file://backport-doc-avoid-nonexistent-PCRE2_ERROR_MEMORY-error-107.patch \ file://backport-Update-HTML-docs.patch \ file://backport-Fixed-race-condition-that-occurs-when-initializing-t.patch \ diff --git a/meta-openeuler/recipes-support/libpcre/libpcre_%.bbappend b/meta-openeuler/recipes-support/libpcre/libpcre_%.bbappend index 7bfe8be3e1e82600cb24ad74adc48e21c4cec8c1..8d9313f6bb428f02b9ec1d683156e852ac0e1b00 100644 --- a/meta-openeuler/recipes-support/libpcre/libpcre_%.bbappend +++ b/meta-openeuler/recipes-support/libpcre/libpcre_%.bbappend @@ -11,12 +11,12 @@ OPENEULER_REPO_NAME = "pcre" LIC_FILES_CHKSUM = "file://LICENCE;md5=b5d5d1a69a24ea2718263f1ff85a1c58" # remove conflict files from poky -SRC_URI_remove = " \ +SRC_URI:remove = " \ ${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \ " # bb name is libpcre, but we want pcre in openeuler -SRC_URI_prepend += " \ +SRC_URI:prepend = " \ file://pcre-${PV}.tar.bz2 \ " diff --git a/meta-openeuler/recipes-support/libunistring/libunistring_%.bbappend b/meta-openeuler/recipes-support/libunistring/libunistring_%.bbappend index f51f9d629f397f804bb7cf9fd762e3f3fb8d27c8..8bfef2c49771474274b5994bed76479cc07ec291 100644 --- a/meta-openeuler/recipes-support/libunistring/libunistring_%.bbappend +++ b/meta-openeuler/recipes-support/libunistring/libunistring_%.bbappend @@ -1,15 +1,9 @@ -# main bbfile: yocto-poky/meta/recipes-support/libunistring/libunistring_0.9.10.bb +# main bbfile: yocto-poky/meta/recipes-support/libunistring/libunistring_1.0.bb PV = "1.1" -# files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = " \ - ${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz \ - file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ -" - # files, patches that come from openeuler -SRC_URI += " \ +SRC_URI = " \ file://${BP}.tar.xz;name=tarball \ " diff --git a/meta-openeuler/recipes-support/libunwind/libunwind_%.bbappend b/meta-openeuler/recipes-support/libunwind/libunwind_%.bbappend index 7e7f8fa73668529246002f55fd97cf9cd00ea066..2a4fb392ee047c46ce66715da6d64b09db833d07 100644 --- a/meta-openeuler/recipes-support/libunwind/libunwind_%.bbappend +++ b/meta-openeuler/recipes-support/libunwind/libunwind_%.bbappend @@ -1,6 +1,4 @@ -# main bbfile: yocto-poky/meta/recipes-support/libunwind/libunwind_1.5.0.bb - -PV = "1.6.2" +# main bbfile: yocto-poky/meta/recipes-support/libunwind/libunwind_1.6.2.bb # do not apply poky's conflict patch SRC_URI = "file://${BP}.tar.gz \ diff --git a/meta-openeuler/recipes-support/liburcu/liburcu_%.bbappend b/meta-openeuler/recipes-support/liburcu/liburcu_%.bbappend index 395b3f38d089f5f3d824be13ba55ee6b244cff4f..1d345765f935002b68002f096bf2378f99c4d1e3 100644 --- a/meta-openeuler/recipes-support/liburcu/liburcu_%.bbappend +++ b/meta-openeuler/recipes-support/liburcu/liburcu_%.bbappend @@ -1,9 +1,14 @@ -# main bbfile: yocto-poky/meta/recipes-support/liburcu_0.12.2.bb +# main bbfile: yocto-poky/meta/recipes-support/liburcu_0.13.2.bb # version in openEuler -PV = "0.13.0" +PV = "0.13.2" OPENEULER_REPO_NAME = "userspace-rcu" -SRC_URI[md5sum] = "8cb75dbb05774c03e66c63cb3186dd59" -SRC_URI[sha256sum] = "cbb20dbe1a892c2a4d8898bac4316176e585392693d498766ccbbc68cf20ba20" +SRC_URI = "file://userspace-rcu-${PV}.tar.bz2 \ +" + +SRC_URI[md5sum] = "e76e7f8ddce0f229cbd870e7ff39193e" +SRC_URI[sha256sum] = "1213fd9f1b0b74da7de2bb74335b76098db9738fec5d3cdc07c0c524f34fc032" + +S = "${WORKDIR}/${OPENEULER_REPO_NAME}-${PV}" diff --git a/meta-openeuler/recipes-support/libusb/libusb1_%.bbappend b/meta-openeuler/recipes-support/libusb/libusb1_%.bbappend index 8144278f50fcdc09be1a778df46141e110d7ae32..2bb2957a17729fa37ec2838a107fda37a1629528 100644 --- a/meta-openeuler/recipes-support/libusb/libusb1_%.bbappend +++ b/meta-openeuler/recipes-support/libusb/libusb1_%.bbappend @@ -1,8 +1,16 @@ -PV = "1.0.26" +# the main bb file: yocto-poky/meta/recipes-support/libusb/libusb1_1.0.26.bb + OPENEULER_REPO_NAME = "libusbx" -# no uedev in openeuler -PACKAGECONFIG_class-target_remove += "udev" +# no udev in openeuler +PACKAGECONFIG_class-target:remove = "udev" + +SRC_URI:remove = "https://github.com/libusb/libusb/releases/download/v${PV}/libusb-${PV}.tar.bz2 \ +" + +SRC_URI:append = " \ + file://libusb-${PV}.tar.bz2 \ +" SRC_URI[md5sum] = "9c75660dfe1d659387c37b28c91e3160" SRC_URI[sha256sum] = "12ce7a61fc9854d1d2a1ffe095f7b5fac19ddba095c259e6067a46500381b5a5" diff --git a/meta-openeuler/recipes-support/libxslt/libxslt_%.bbappend b/meta-openeuler/recipes-support/libxslt/libxslt_%.bbappend index 55d27c35deb02d2a647e9c1deb71a9cc1ba3691a..a5e6b79fdeb0cbf56bb6db07d099a69a52f3e144 100644 --- a/meta-openeuler/recipes-support/libxslt/libxslt_%.bbappend +++ b/meta-openeuler/recipes-support/libxslt/libxslt_%.bbappend @@ -1,9 +1,12 @@ +# the main bb file: yocto-poky/meta/recipes-support/libxslt/libxslt_1.1.35.bb + PV = "1.1.37" -SRC_URI_prepend = "file://CVE-2015-9019.patch \ +SRC_URI = " \ + file://${BP}.tar.gz \ " SRC_URI[md5sum] = "43dee91d34fb76ec9e0a02a65e09c5ab" SRC_URI[sha256sum] = "3a4f58957cd0755b0188a17393c701cbd3e7812d236db185bceee77e52906580" -EXTRA_OECONF_remove = "--with-html-subdir=${BPN}" +EXTRA_OECONF:remove = "--with-html-subdir=${BPN}" diff --git a/meta-openeuler/recipes-support/lz4/lz4_%.bbappend b/meta-openeuler/recipes-support/lz4/lz4_%.bbappend index 52efe633504cbf11eb01447cd991a12442685d00..f159dafd646f91314f05168cf3ca70d039168876 100644 --- a/meta-openeuler/recipes-support/lz4/lz4_%.bbappend +++ b/meta-openeuler/recipes-support/lz4/lz4_%.bbappend @@ -15,7 +15,7 @@ PV = "1.9.4" S = "${WORKDIR}/${BPN}-${PV}" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = " \ +SRC_URI:remove = " \ file://CVE-2021-3520.patch \ " diff --git a/meta-openeuler/recipes-support/lzo/lzo_%.bbappend b/meta-openeuler/recipes-support/lzo/lzo_%.bbappend index f6bedcf34c6c5145ebbf4252c84b9e54c4713488..25ad563ac7d08f2385c9b572c5b10581a1500ff1 100644 --- a/meta-openeuler/recipes-support/lzo/lzo_%.bbappend +++ b/meta-openeuler/recipes-support/lzo/lzo_%.bbappend @@ -6,7 +6,7 @@ OPENEULER_SRC_URI_REMOVE = "https git http" PV = "2.10" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = " \ +SRC_URI:remove = " \ " SRC_URI += " \ diff --git a/meta-openeuler/recipes-support/mpfr/mpfr_%.bbappend b/meta-openeuler/recipes-support/mpfr/mpfr_%.bbappend index 1f508dcf93cf0a2ee8b4fba0914e84427f2a1912..7cd4c39a0e6cc6d13ee3c652150e01a6b6af3d33 100644 --- a/meta-openeuler/recipes-support/mpfr/mpfr_%.bbappend +++ b/meta-openeuler/recipes-support/mpfr/mpfr_%.bbappend @@ -1,5 +1,5 @@ # main bb file: yocto-poky/meta/recipes-support/mpfr/mpfr_4.1.0.bb PV = "4.1.0" -SRC_URI_remove = "https://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.xz " -SRC_URI_prepend = "file://${BPN}-${PV}.tar.xz " +SRC_URI:remove = "https://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.xz " +SRC_URI:prepend = "file://${BPN}-${PV}.tar.xz " diff --git a/meta-openeuler/recipes-support/nettle/nettle_%.bbappend b/meta-openeuler/recipes-support/nettle/nettle_%.bbappend index 76b9314020911837663743c35b4b7a055c724f67..138c5421bb15de6efe7af5397615046564260f1c 100644 --- a/meta-openeuler/recipes-support/nettle/nettle_%.bbappend +++ b/meta-openeuler/recipes-support/nettle/nettle_%.bbappend @@ -4,7 +4,7 @@ PV = "3.8.1" # files, patches can't be applied in openeuler or conflict with openeuler -SRC_URI_remove = " \ +SRC_URI:remove = " \ ${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ " diff --git a/meta-openeuler/recipes-support/nlopt/nlopt_2.7.1.bb b/meta-openeuler/recipes-support/nlopt/nlopt_2.7.1.bb index 3408ed8c9d960e4751031fc92f9605771a276d2d..baec4cdd527a4fb7e52379d81272f67267c906e5 100644 --- a/meta-openeuler/recipes-support/nlopt/nlopt_2.7.1.bb +++ b/meta-openeuler/recipes-support/nlopt/nlopt_2.7.1.bb @@ -17,7 +17,7 @@ SRC_URI = "file://nlopt-${PV}.tar.gz" SRC_URI[md5sum] = "ed1a3000a1c8c248d51df126dfcfaa78" SRC_URI[sha256sum] = "db88232fa5cef0ff6e39943fc63ab6074208831dc0031cf1545f6ecd31ae2a1a" -RPROVIDES_${PN} = "nlopt" +RPROVIDES:${PN} = "nlopt" inherit cmake EXTRA_OECMAKE += "-DCMAKE_SKIP_RPATH=TRUE" diff --git a/meta-openeuler/recipes-support/npth/npth_%.bbappend b/meta-openeuler/recipes-support/npth/npth_%.bbappend index 641afc4765f1f46989cc403fd95118c6a0899f71..e344f27ca0d389ed263ec268f98a7357908664f0 100644 --- a/meta-openeuler/recipes-support/npth/npth_%.bbappend +++ b/meta-openeuler/recipes-support/npth/npth_%.bbappend @@ -6,7 +6,7 @@ SRC_URI = " \ " # patches from poky -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += " \ file://pkgconfig.patch \ file://0001-Revert-Fix-problem-with-regression-tests-on-recent-g.patch \ diff --git a/meta-openeuler/recipes-support/popt/popt_%.bbappend b/meta-openeuler/recipes-support/popt/popt_%.bbappend index 0a13745280024e8d5b2e5f60df0c5aa461ada902..b1e90e736704915fd5845ef33d798ed514b8d4a9 100644 --- a/meta-openeuler/recipes-support/popt/popt_%.bbappend +++ b/meta-openeuler/recipes-support/popt/popt_%.bbappend @@ -2,14 +2,15 @@ PV = "1.19" -# files, patches that come from openeuler -OPENEULER_SRC_URI_REMOVE = "https git http" -SRC_URI += " \ - file://${BPN}-${PV}.tar.gz \ - file://fix-obscure-iconv-mis-call-error-path-could-lead-to-.patch \ - file://fix-handle-newly-added-asset-.-call-like-elsewhere.patch \ - file://fix-permit-reading-aliases-remove-left-over-goto-exi.patch \ - file://fix-coverity-CID-1057440-Unused-pointer-value-UNUSED.patch \ +SRC_URI:remove = "http://ftp.rpm.org/popt/releases/popt-1.x/${BP}.tar.gz \ + file://0001-popt-test-output-format-for-ptest.patch \ +" + +SRC_URI:prepend = "file://${BPN}-${PV}.tar.gz \ + file://fix-obscure-iconv-mis-call-error-path-could-lead-to-.patch \ + file://fix-handle-newly-added-asset-.-call-like-elsewhere.patch \ + file://fix-permit-reading-aliases-remove-left-over-goto-exi.patch \ + file://fix-coverity-CID-1057440-Unused-pointer-value-UNUSED.patch \ file://revert-fix-memory-leak-regressions-in-popt.patch \ " diff --git a/meta-openeuler/recipes-support/rng-tools/rng-tools_%.bbappend b/meta-openeuler/recipes-support/rng-tools/rng-tools_%.bbappend index 4d2dbb52a2090f96ded935260484ea33cebfcc29..0a374cc20b45d6bb3fcc4f39b0438ca8dd9033dc 100644 --- a/meta-openeuler/recipes-support/rng-tools/rng-tools_%.bbappend +++ b/meta-openeuler/recipes-support/rng-tools/rng-tools_%.bbappend @@ -6,10 +6,10 @@ OPENEULER_SRC_URI_REMOVE = "https git http" PV = "6.16" # remove git protocol -SRC_URI_remove = "\ +SRC_URI:remove = "\ " -SRC_URI_prepend = "\ +SRC_URI:prepend = "\ file://v${PV}.tar.gz \ " diff --git a/meta-openeuler/recipes-support/sqlite/sqlite3_%.bbappend b/meta-openeuler/recipes-support/sqlite/sqlite3_%.bbappend index 66724d4af88015fcd98f3c1f20cf7ff913a43e8c..ccc724c32cb27a1eabce9f9194c266aff4ea8256 100644 --- a/meta-openeuler/recipes-support/sqlite/sqlite3_%.bbappend +++ b/meta-openeuler/recipes-support/sqlite/sqlite3_%.bbappend @@ -1,4 +1,4 @@ -# main bb file: yocto-poky/meta/recipes-support/sqlite/sqlite3_3.35.0.bb +# main bb file: yocto-poky/meta/recipes-support/sqlite/sqlite3_3.38.5.bb # openEuler repo name OPENEULER_REPO_NAME = "sqlite" @@ -6,7 +6,7 @@ OPENEULER_REPO_NAME = "sqlite" PV = "3.37.2" # patches in src-openEuler are ready for sqlite-src -SRC_URI_remove = "file://CVE-2021-36690.patch \ +SRC_URI:remove = "file://CVE-2021-36690.patch \ " SRC_URI[sha256sum] = "4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8" diff --git a/meta-openeuler/recipes-support/tbb/tbb_%.bbappend b/meta-openeuler/recipes-support/tbb/tbb_%.bbappend index 62e74fbcc910d9c655f57351a2ac14db18daf9ae..a3398b1034518a008248f9abcae970b8df0ef38d 100644 --- a/meta-openeuler/recipes-support/tbb/tbb_%.bbappend +++ b/meta-openeuler/recipes-support/tbb/tbb_%.bbappend @@ -2,7 +2,7 @@ # main bb from: # http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/tbb?id=11562e889d485118ed377ef0dac17b7e95689281 -FILESEXTRAPATHS_prepend := "${THISDIR}/files/:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files/:" OPENEULER_SRC_URI_REMOVE = "https git http" OPENEULER_BRANCH = "master" @@ -11,7 +11,7 @@ OPENEULER_BRANCH = "master" PV = "2020.3" # files, patches that come from openeuler -SRC_URI_prepend = " \ +SRC_URI:prepend = " \ file://tbb-${PV}.tar.gz \ file://bugfix-tbb-fix-__TBB_machine_fetchadd4-was-not-declared-on-.patch \ " diff --git a/meta-openeuler/recipes-tensorflow-lite/tensorflow-lite/files/fix-to-cmake.patch b/meta-openeuler/recipes-tensorflow-lite/tensorflow-lite/files/fix-to-cmake.patch index 0542c6d6c2371b187328b290b4a5a472df6cef3d..bd3bbbdb91c31c22d5b4d50ae23e209d782c6b7d 100755 --- a/meta-openeuler/recipes-tensorflow-lite/tensorflow-lite/files/fix-to-cmake.patch +++ b/meta-openeuler/recipes-tensorflow-lite/tensorflow-lite/files/fix-to-cmake.patch @@ -63,7 +63,7 @@ index f5cc9b97924..4d1c6d79e31 100644 + + _recursively_collect_dependencies(${tgt_name}) + -+ list(REMOVE_DUPLICATES static_libs) ++ list(remove:DUPLICATES static_libs) + + set(bundled_tgt_full_name + ${CMAKE_BINARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${bundled_tgt_name}${CMAKE_STATIC_LIBRARY_SUFFIX}) diff --git a/meta-openeuler/recipes-tensorflow-lite/tensorflow-lite/tensorflow-lite_%.bbappend b/meta-openeuler/recipes-tensorflow-lite/tensorflow-lite/tensorflow-lite_%.bbappend index 95c6d503f33d1e64a7b44b829d8a47601fcbdda8..f881eeca092d1d8bbb1541fd0695d496f26e7e23 100644 --- a/meta-openeuler/recipes-tensorflow-lite/tensorflow-lite/tensorflow-lite_%.bbappend +++ b/meta-openeuler/recipes-tensorflow-lite/tensorflow-lite/tensorflow-lite_%.bbappend @@ -5,9 +5,9 @@ PV = "2.10.0" OPENEULER_BRANCH = "master" OPENEULER_REPO_NAME = "tensorflow" -DEPENDS_remove = "libgfortran" +DEPENDS:remove = "libgfortran" -SRC_URI_remove = " \ +SRC_URI:remove = " \ git://github.com/tensorflow/tensorflow.git;branch=r2.9;rev=${SRCREV};protocol=https \ file://fix-to-cmake-2.9.1.patch \ file://tensorflow2-lite.pc.in \ @@ -51,6 +51,6 @@ do_install() { } -FILES_${PN}-staticdev += "${libdir}/*" -FILES_${PN}-dev += "${libdir}/*" +FILES:${PN}-staticdev += "${libdir}/*" +FILES:${PN}-dev += "${libdir}/*" diff --git a/rtos/meta-freertos/conf/layer.conf b/rtos/meta-freertos/conf/layer.conf index d0cc1adbfb28a873372b174546669bb85774a9a9..4b829704b538e38ead9f7f2d3f5b806bf904c8d7 100644 --- a/rtos/meta-freertos/conf/layer.conf +++ b/rtos/meta-freertos/conf/layer.conf @@ -13,7 +13,7 @@ BBFILE_PRIORITY_freertosproject = "25" # cause compatibility issues with other layers LAYERVERSION_freertosproject = "1" -LAYERDEPENDS_freertosproject = "core meta-python" +LAYERDEPENDS:freertosproject = "core meta-python" -LAYERSERIES_COMPAT_freertosproject = "hardknott" +LAYERSERIES_COMPAT_freertosproject = "kirkstone" diff --git a/rtos/meta-freertos/recipes-jailhouse/README.md b/rtos/meta-freertos/recipes-jailhouse/README.md index 775f8e9b77a618b12c86bfb1e11cfd0add81342e..b717ce419b1aba3fdca22477b61be61703266105 100644 --- a/rtos/meta-freertos/recipes-jailhouse/README.md +++ b/rtos/meta-freertos/recipes-jailhouse/README.md @@ -19,7 +19,7 @@ layers: vim src/yocto-meta-openeuler/meta-openeuler/recipes-core/packagegroups/packagegroup-mcs.bb # 在jailhouse后面追加 jailhouse-freertos，如下： -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ ${@bb.utils.contains('MCS_FEATURES', 'jailhouse', 'jailhouse jailhouse-freertos', '', d)} \ " ``` diff --git a/rtos/meta-freertos/recipes-jailhouse/freertos/jailhouse-freertos.bb b/rtos/meta-freertos/recipes-jailhouse/freertos/jailhouse-freertos.bb index 400d437336709bf26fb5a34f9821be51a9e407f0..3e36c0f5e4655d4e8e3e6018ca24c7e208f5d6f9 100644 --- a/rtos/meta-freertos/recipes-jailhouse/freertos/jailhouse-freertos.bb +++ b/rtos/meta-freertos/recipes-jailhouse/freertos/jailhouse-freertos.bb @@ -21,4 +21,4 @@ do_install() { cp ${S}/FreeRTOS.bin ${D}/Jailhouse_FreeRTOS_demo/ } -FILES_${PN} = "Jailhouse_FreeRTOS_demo" +FILES:${PN} = "Jailhouse_FreeRTOS_demo" diff --git a/rtos/meta-openeuler-rtos/conf/layer.conf b/rtos/meta-openeuler-rtos/conf/layer.conf index ac83ae6ec13081f5f048a7199b86858aa7309e86..ed082d8691464aa9cd31d0a7950c5c2b6b1a867b 100644 --- a/rtos/meta-openeuler-rtos/conf/layer.conf +++ b/rtos/meta-openeuler-rtos/conf/layer.conf @@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "openeuler-rtos" BBFILE_PATTERN_openeuler-rtos = "^${LAYERDIR}/" BBFILE_PRIORITY_openeuler-rtos = "25" -LAYERSERIES_COMPAT_openeuler-rtos = "hardknott" +LAYERSERIES_COMPAT_openeuler-rtos = "kirkstone" #no bb file under meta-openeuler-rtos, set it to 1 to ignore "No bb files" warning BBFILE_PATTERN_IGNORE_EMPTY_openeuler-rtos = "1" diff --git a/rtos/meta-rtthread/conf/layer.conf b/rtos/meta-rtthread/conf/layer.conf index b2b64650fd42cafae4b3e98fad7583381f044173..e016ff5494ec2c5f048827268bf049a8d6977c7f 100644 --- a/rtos/meta-rtthread/conf/layer.conf +++ b/rtos/meta-rtthread/conf/layer.conf @@ -11,9 +11,9 @@ BBFILE_PRIORITY_rtthread = "24" LAYERVERSION_rtthread = "1" -LAYERDEPENDS_rtthread = "core" +LAYERDEPENDS:rtthread = "core" -LAYERSERIES_COMPAT_rtthread = "hardknott" +LAYERSERIES_COMPAT_rtthread = "kirkstone" # rtthread is built with scons -HOSTTOOLS_append = " scons" +HOSTTOOLS:append = " scons" diff --git a/rtos/meta-rtthread/recipes-kernel/rt-thread.inc b/rtos/meta-rtthread/recipes-kernel/rt-thread.inc index 8f3904ffb0489796ec699e516c3c75537211a25f..5cb6805fd7dfb08c2d176f695eb97b15d80b7248 100644 --- a/rtos/meta-rtthread/recipes-kernel/rt-thread.inc +++ b/rtos/meta-rtthread/recipes-kernel/rt-thread.inc @@ -19,7 +19,7 @@ INHIBIT_DEFAULT_DEPS = "1" ### Build metadata: SRC_URI, SRCDATA, S, B, FILESEXTRAPATHS.... SRC_URI = "file://rt-thread/${BPN}-v${PV}.tar.gz " -SRC_URI_append_qemu-aarch64 = "file://0001-bsp-modify-the-rtconfig.py-for-openeuler.patch" +SRC_URI:append:qemu-aarch64 = "file://0001-bsp-modify-the-rtconfig.py-for-openeuler.patch" S = "${WORKDIR}/${BPN}-v${PV}" @@ -77,7 +77,7 @@ PROVIDES += "rtthread" ### Runtime metadata PACKAGES = "${PN}" ### Package metadata -FILES_${PN} = " \ +FILES:${PN} = " \ /firmware \ " ### Tasks for package diff --git a/rtos/meta-zephyr/conf/layer.conf b/rtos/meta-zephyr/conf/layer.conf index 0b79beb69affc1606aa50bcd5eae5354ee8467f3..a95bb56524c39ac1ba3f7859115ba157240dd1cd 100644 --- a/rtos/meta-zephyr/conf/layer.conf +++ b/rtos/meta-zephyr/conf/layer.conf @@ -13,7 +13,7 @@ BBFILE_PRIORITY_zephyrproject = "6" # cause compatibility issues with other layers LAYERVERSION_zephyrproject = "1" -LAYERDEPENDS_zephyrproject = "core meta-python" +LAYERDEPENDS:zephyrproject = "core meta-python" -LAYERSERIES_COMPAT_zephyrproject = "hardknott" +LAYERSERIES_COMPAT_zephyrproject = "kirkstone" diff --git a/scripts/autobbappend/autobbappend.py b/scripts/autobbappend/autobbappend.py index 1d2c456f93b2d517abdd946b06cd486d7274d6d4..08b8f121b7d1a34b66107e75ad962e1f6f6b0bce 100644 --- a/scripts/autobbappend/autobbappend.py +++ b/scripts/autobbappend/autobbappend.py @@ -120,12 +120,12 @@ def search_bb_file(repo_name): return bb_dir -def generate_bbappend_path(bb_dir): +def generate_bbappend:path(bb_dir): (bbfile_path, name) = os.path.split(bb_dir) (bbfilefolder_path, bbfilefolder_name) = os.path.split(bbfile_path) (recipes_xxx_path, recipes_xxx_name) = os.path.split(bbfilefolder_path) - bbappend_path = yocto_meta_openeuler_meta_openeuler_path+'/'+recipes_xxx_name+'/'+bbfilefolder_name - return bbappend_path + bbappend:path = yocto_meta_openeuler_meta_openeuler_path+'/'+recipes_xxx_name+'/'+bbfilefolder_name + return bbappend:path def notes_bb_dir(bb_dir): @@ -349,7 +349,7 @@ class BuildData: spec_dir = search_specfile(args.spec) package_dir = search_package(spec_dir) bb_dir = search_bb_file(read_name(spec_dir)) - bbappend_path = generate_bbappend_path(bb_dir) + bbappend:path = generate_bbappend:path(bb_dir) pn = vars_from_file(bb_dir,bb_dir)[0] global pv pv = read_oldPV(vars_from_file(bb_dir,bb_dir)[1],bb_dir) @@ -383,8 +383,8 @@ class BuildData: )) # Write code to file - if not os.path.exists(bbappend_path):os.makedirs(bbappend_path) - filePath = bbappend_path+'/'+bpn+'_%.bbappend' + if not os.path.exists(bbappend:path):os.makedirs(bbappend:path) + filePath = bbappend:path+'/'+bpn+'_%.bbappend' filePath = inspect_existing_files(filePath) class_file = open(secure_filename(filePath), 'w') class_file.writelines(mycode) diff --git a/scripts/autobbappend/bbappend.tmpl b/scripts/autobbappend/bbappend.tmpl index de349ec80aa9e31fc24954eecf7f17cfd401196f..dc8f1e7126d0601fb8ac651f0e68ec16c7a95a63 100644 --- a/scripts/autobbappend/bbappend.tmpl +++ b/scripts/autobbappend/bbappend.tmpl @@ -4,10 +4,10 @@ OPENEULER_REPO_NAME = "${NAME}" PV = "${VERSION}" -SRC_URI_remove = "${ORIG_SRC} \ +SRC_URI:remove = "${ORIG_SRC} \ " -SRC_URI_prepend = "${PACKAGE} \ +SRC_URI:prepend = "${PACKAGE} \ ${PATCH} \ "