From 641b06856c2d217cc18ce20a5359e6129661c8b2 Mon Sep 17 00:00:00 2001 From: alichinese Date: Mon, 31 Jul 2023 19:12:37 +0800 Subject: [PATCH 1/2] ros: apt ros image building * ros layer version now is noly upgrade to honister, but poky version is kirkstone, adapt poky version Signed-off-by: lixinyu --- meta-openeuler/classes/alter_setup.bbclass | 13 +++++++++++++ meta-openeuler/classes/ros_distro_humble.bbclass | 2 +- .../recipes-ros/python/python3-empy_%.bbappend | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 meta-openeuler/classes/alter_setup.bbclass diff --git a/meta-openeuler/classes/alter_setup.bbclass b/meta-openeuler/classes/alter_setup.bbclass new file mode 100644 index 00000000000..8c2f11302bf --- /dev/null +++ b/meta-openeuler/classes/alter_setup.bbclass @@ -0,0 +1,13 @@ +# the bbclass is to alter setup.py about pytho package, when poky upgrade to 4.0, distutils functional has move to +# setuptools, so if there has `from distutil.core import setup`, it will occure error "invalid command 'bdist_wheel'" +# so in order to fix this error, we replace distutil.core to setuptools + +do_replace_distutils() { + if [[ -f ${S}/setup.py ]];then + pushd ${S} + sed -i 's/from distutils.core import setup/from setuptools import setup/g' setup.py + popd + fi +} + +addtask do_replace_distutils after do_patch before do_compile diff --git a/meta-openeuler/classes/ros_distro_humble.bbclass b/meta-openeuler/classes/ros_distro_humble.bbclass index 8bc2766133d..89d7d3355d3 100644 --- a/meta-openeuler/classes/ros_distro_humble.bbclass +++ b/meta-openeuler/classes/ros_distro_humble.bbclass @@ -20,7 +20,7 @@ addhandler ros_libdir_set ros_libdir_set[eventmask] = "bb.event.RecipePreFinalise" # some depend pkgs may not inherit this class, it may under lib64 of oldroslibdir. -PKG_CONFIG_PATH:append:class-target += ":${PKG_CONFIG_SYSROOT_DIR}/${oldroslibdir}/pkgconfig" +PKG_CONFIG_PATH:append:class-target = " :${PKG_CONFIG_SYSROOT_DIR}/${oldroslibdir}/pkgconfig" # fix _sysconfigdata not found error, after inherit setuptools3, see yocto-poky/meta/classes/python3targetconfig.bbclass do_install:remove:class-target() { 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 450a3c5352c..1bea38bc4c7 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 @@ -2,6 +2,8 @@ OPENEULER_LOCAL_NAME = "python3-empy" +inherit alter_setup + PV = "3.3.4" LIC_FILES_CHKSUM = "file://README;md5=10d1c4f6d15ab0aa52e80cc7d6ca0959" -- Gitee From b7f28d255f4cc38838a158ee4a1e9734a9bea7f5 Mon Sep 17 00:00:00 2001 From: alichinese Date: Tue, 1 Aug 2023 14:51:37 +0800 Subject: [PATCH 2/2] libpwquality: alter pam path * use /lib64 instead of /usr/lib64 about pam path Signed-off-by: lixinyu --- .../recipes-extended/libpwquality/libpwquality_%.bbappend | 8 ++++++++ 1 file changed, 8 insertions(+) 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 3ea5481c4b6..77b4fd9db0d 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 @@ -25,3 +25,11 @@ EXTRA_OECONF:remove = "--with-python-rev=${PYTHON_BASEVERSION} \ " EXTRA_OECONF += "--enable-python-bindings=no \ " + +EXTRA_OECONF += "--with-securedir=${base_libdir}/security \ +" +# we use lib64 instead of /usr/lib64 about pam path +FILES:${PN} += "${base_libdir}/security/pam_pwquality.so" +FILES:${PN}-dbg += "${base_libdir}/security/.debug" +FILES:${PN}-staticdev += "${base_libdir}/security/pam_pwquality.a" +FILES:${PN}-dev += "${base_libdir}/security/pam_pwquality.la" -- Gitee