From 8410d61f39efb52ffab1dc89efb05ca3ae837907 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Mon, 25 Nov 2019 09:40:59 -0500 Subject: meta-openembedded: subtree update:53d431639a..e4ac09169d MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Andreas Müller (9): file-roller: add gsettings to inherit tracker: add gsettings to inherit nautilus: add gsettings to inherit libgweather: add gsetings & upstream-version-is-even to inherit gnome-settings-daemon: add gsettings to inherit gnome-terminal: add gsettings to inherit parole: upgrade 1.0.4 -> 1.0.5 exo: upgrade 0.12.8 -> 0.12.9 gedit: add gsettings to inherit Changqing Li (1): dnsmasq.conf: fix dnsmasq path Denys Dmytriyenko (1): recipes: rename distro_features_check to features_check Jan Luebbe (6): openct: merge do_install and do_install_append pcsc-lite: add support for native builds opensc: use pcsc-lite instead of openct by default opensc: add support for native builds libp11: add support for native builds softhsm: add recipe Kai Kang (1): mariadb: replace dependency readline with libedit Khem Raj (6): dlm: Drop -fstack-clash-protection for clang ruli: Fix install step and build samples too libkcapi: Update patch to upstream submitted one sanlock: Use python3 and add sanlock user/group sanlock: Replace cp -a with cp -R --no-dereference nodejs: libatomic patch should be target specific Lei YU (1): googletest: move to release 1.10.0 Nicola Lunghi (4): python3-importlib-metadata: fix class-target overriding default dependencies python-configparser: Add native and nativesdk to BBCLASSEXTEND python-contextlib2: Add native and nativesdk to BBCLASSEXTEND python-scandir: Add native and nativesdk to BBCLASSEXTEND Paul Barker (1): liblockfile: Rename patch Qi.Chen@windriver.com (1): python-jsonschema: add missing dependency Ross Burton (1): python-babel: add BBCLASSEXTEND for native/nativesdk Rouven Czerwinski (1): python-pyelftools: add recipes Stefan Agner (2): haveged: use the Fedora service file available from upstream networkmanager: do not deploy unnecessary udev rule file Wang Mingyu (3): mcelog: upgrade 1.65 -> 1.66 hwdata: upgrade 0.328 -> 0.329 libdev-checklib-perl: upgrade 1.13 -> 1.14 Zang Ruochen (17): python-zopeinterface: upgrade 4.6.0 -> 4.7.1 python-yappi: upgrade 0.98 -> 1.0 python-xstatic: upgrade 1.0.1 -> 1.0.2 python-xlrd: upgrade 1.1.0 -> 1.2.0 python-urllib3: upgrade 1.25.6 -> 1.25.7 python-tzlocal: upgrade 1.5.1 -> 2.0.0 python-twitter: upgrade 3.7.0 -> 3.8.0 python-twisted: upgrade 19.7.0 -> 19.10.0 python3-meh: upgrade 0.47 -> 0.48 python-pyephem: upgrade 3.7.6.0 -> 3.7.7.0 python3-pykickstart: upgrade 3.20 -> 3.22 python-pyparted: upgrade 3.11.2 -> 3.11.3 libextutils-cppguess-perl: upgrade 0.12 -> 0.20 libmoo-perl: upgrade 2.003004 -> 2.003006 libdbd-sqlite-perl: upgrade 1.62 -> 1.64 libclass-method-modifiers-perl: upgrade 2.12 -> 2.13 librole-tiny-perl: upgrade 2.000006 -> 2.001004 niko.mauno@vaisala.com (2): gitpkgv.bbclass: Use --git-dir option gitpkgv.bbclass: Support also lightweight tags Change-Id: I00fb24df7bb3849ed0c9337a66623d9b4cba5999 Signed-off-by: Brad Bishop --- .../recipes-extended/boinc/boinc-client_7.12.bb | 2 +- .../recipes-extended/gnuplot/gnuplot_5.2.2.bb | 2 +- .../recipes-extended/haveged/haveged_1.9.6.bb | 2 +- .../meta-oe/recipes-extended/icewm/icewm_1.5.5.bb | 2 +- .../recipes-extended/libgxim/libgxim_0.5.0.bb | 2 +- .../0001-Makefile.in-install-nfslock-libs.patch | 31 +++++++++++++ ...le.in-install-nfslock.so-and-nfslock.so.0.patch | 31 ------------- .../liblockfile/liblockfile_1.14.bb | 2 +- .../recipes-extended/libreport/libreport_2.10.0.bb | 2 +- .../recipes-extended/libwmf/libwmf_0.2.8.4.bb | 2 +- .../meta-oe/recipes-extended/mozjs/mozjs_60.5.2.bb | 2 +- .../recipes-extended/openwsman/openwsman_2.6.11.bb | 2 +- .../recipes-extended/pam/pam-plugin-ccreds_11.bb | 2 +- .../recipes-extended/pam/pam-plugin-ldapdb_1.3.bb | 2 +- .../pam/pam-ssh-agent-auth_0.10.3.bb | 2 +- .../recipes-extended/polkit/polkit-group-rule.inc | 2 +- .../recipes-extended/polkit/polkit_0.116.bb | 2 +- ...lace-cp-a-with-cp-R-no-dereference-preser.patch | 51 ++++++++++++++++++++++ .../recipes-extended/sanlock/sanlock_3.8.0.bb | 14 +++++- .../sblim-sfcb/sblim-sfcb_1.4.9.bb | 2 +- 20 files changed, 110 insertions(+), 49 deletions(-) create mode 100644 meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock-libs.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch (limited to 'meta-openembedded/meta-oe/recipes-extended') diff --git a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.12.bb b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.12.bb index e505bb4c5..d472d3269 100644 --- a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.12.bb +++ b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.12.bb @@ -37,7 +37,7 @@ SRC_URI = "git://github.com/BOINC/boinc;protocol=https;branch=${BRANCH} \ file://gtk-configure.patch \ " -inherit gettext autotools pkgconfig distro_features_check systemd +inherit gettext autotools pkgconfig features_check systemd REQUIRED_DISTRO_FEATURES += "opengl" diff --git a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb index f9fd8ae88..898627bc1 100644 --- a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb @@ -7,7 +7,7 @@ LICENSE = "gnuplot" LIC_FILES_CHKSUM = "file://Copyright;md5=243a186fc2fd3b992125d60d5b1bab8f" DEPENDS = "${BPN}-native virtual/libx11 gd readline" -inherit autotools distro_features_check +inherit autotools features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb index a2f0d07f2..e5b9bc947 100644 --- a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb @@ -22,7 +22,7 @@ EXTRA_OECONF = "\ " PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[systemd] = "--enable-init=service.redhat --enable-initdir=${systemd_system_unitdir}, --enable-init=sysv.redhat, systemd" +PACKAGECONFIG[systemd] = "--enable-init=service.fedora --enable-initdir=${systemd_system_unitdir}, --enable-init=sysv.redhat, systemd" INITSCRIPT_PACKAGES = "${PN}" INITSCRIPT_NAME = "haveged" diff --git a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_1.5.5.bb b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_1.5.5.bb index 63fca1dd1..fe6de008f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_1.5.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_1.5.5.bb @@ -8,7 +8,7 @@ SRC_URI = "https://github.com/ice-wm/${BPN}/releases/download/${PV}/${BPN}-${PV} SRC_URI[md5sum] = "6eba94a7935a0531d2c14eeb1426aeef" SRC_URI[sha256sum] = "f1c1344b20a9e8635143f70ee27930b55f813c15ca61f84d77584d311b6ac027" -inherit autotools pkgconfig gettext perlnative distro_features_check qemu +inherit autotools pkgconfig gettext perlnative features_check qemu REQUIRED_DISTRO_FEATURES = "x11" EXTRA_OECONF += "--with-libdir=${datadir}/icewm \ diff --git a/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb b/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb index 7e4c330a1..8a2886b8c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb @@ -26,6 +26,6 @@ file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" EXTRA_OECONF = " --disable-static --disable-rebuilds --enable-compile-warnings=minimum" DEPENDS += "gtk+ glib-2.0 glib-2.0-native ruby-native intltool-native gnome-common-native" -inherit distro_features_check autotools pkgconfig gettext +inherit features_check autotools pkgconfig gettext REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock-libs.patch b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock-libs.patch new file mode 100644 index 000000000..a6b297b59 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock-libs.patch @@ -0,0 +1,31 @@ +From 631d46efff2a6d8970e202ba5422ebedd17a8d2f Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Thu, 19 Jul 2018 01:00:10 -0700 +Subject: [PATCH] Makefile.in: install nfslock.so and nfslock.so.0 + +* install the missing soname library + +Upstream-Status: Pending + +Signed-off-by: Jackie Huang +Signed-off-by: Mingli Yu +--- + Makefile.in | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Makefile.in b/Makefile.in +index 1e4130e..0f1b506 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -77,6 +77,8 @@ install_common: + install_nfslib: nfslib + install -d -m 755 -g root -p $(nfslockdir) + install -m 755 nfslock.so.$(NFSVER) $(nfslockdir) ++ ln -sf nfslock.so.$(NFSVER) $(libdir)/nfslock.so ++ ln -sf nfslock.so.$(NFSVER) $(libdir)/nfslock.so.0 + if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi + + clean: +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch deleted file mode 100644 index a6b297b59..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 631d46efff2a6d8970e202ba5422ebedd17a8d2f Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Thu, 19 Jul 2018 01:00:10 -0700 -Subject: [PATCH] Makefile.in: install nfslock.so and nfslock.so.0 - -* install the missing soname library - -Upstream-Status: Pending - -Signed-off-by: Jackie Huang -Signed-off-by: Mingli Yu ---- - Makefile.in | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Makefile.in b/Makefile.in -index 1e4130e..0f1b506 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -77,6 +77,8 @@ install_common: - install_nfslib: nfslib - install -d -m 755 -g root -p $(nfslockdir) - install -m 755 nfslock.so.$(NFSVER) $(nfslockdir) -+ ln -sf nfslock.so.$(NFSVER) $(libdir)/nfslock.so -+ ln -sf nfslock.so.$(NFSVER) $(libdir)/nfslock.so.0 - if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi - - clean: --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb index de2c1e36d..10d88a3b5 100644 --- a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb +++ b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb @@ -8,7 +8,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.14.orig.tar.gz \ ${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.14-1.debian.tar.bz2;name=1.14-1 \ file://configure.patch \ file://0001-Makefile.in-add-DESTDIR.patch \ - file://0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch \ + file://0001-Makefile.in-install-nfslock-libs.patch \ file://liblockfile-fix-install-so-to-man-dir.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb b/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb index e50226e27..4276c4917 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb @@ -23,7 +23,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" S = "${WORKDIR}/git" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "systemd" inherit gettext autotools python3native pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb b/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb index 2c31a21c0..401c2c4da 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb @@ -12,7 +12,7 @@ DEPENDS = "freetype libpng jpeg expat gtk+" BBCLASSEXTEND = "native" -inherit distro_features_check autotools pkgconfig +inherit features_check autotools pkgconfig REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.5.2.bb b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.5.2.bb index 33142d6fe..41a79daf4 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.5.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.5.2.bb @@ -31,7 +31,7 @@ SRC_URI[sha256sum] = "f51039c997415fd0f13f8e01966b4a8ff80cbf90deb8b14c18827104a3 inherit autotools pkgconfig perlnative pythonnative -inherit distro_features_check +inherit features_check CONFLICT_DISTRO_FEATURES_mipsarchn32 = "ld-is-gold" DEPENDS += "nspr zlib python-six-native python-pytoml-native \ diff --git a/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb b/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb index 16a83a4be..9d5a2307e 100644 --- a/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb +++ b/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb @@ -12,7 +12,7 @@ SECTION = "Applications/System" DEPENDS = "curl libxml2 openssl libpam" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "pam" SRCREV = "d8eba6cb6682b59d84ca1da67a523520b879ade6" diff --git a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb index 95d879dc6..9838e75ef 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libpam openssl db" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "pam" SRCREV = "e2145df09469bf84878e4729b4ecd814efb797d1" diff --git a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb index 2fdadcbc9..6864cc317 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=41ab94182d94be9bb35e2a8b933f1e7d" DEPENDS = "libpam openldap" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "pam" SRCREV = "84d7b260f1ae6857ae36e014c9a5968e8aa1cbe8" diff --git a/meta-openembedded/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb b/meta-openembedded/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb index ac7fa4bbf..41b4d0d30 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb @@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "3c53d358d6eaed1b211239df017c27c6f9970995d14102ae67bae16d4f DEPENDS += "libpam openssl" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "pam" # This gets us ssh-agent, which we are almost certain to want. diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule.inc b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule.inc index 8ced8abe5..e38e344c1 100644 --- a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule.inc +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule.inc @@ -1,7 +1,7 @@ # polkit must prepare polkitd group DEPENDS += "polkit" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "polkit" inherit useradd diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.116.bb b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.116.bb index 8754383ef..ad1973b13 100644 --- a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.116.bb +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.116.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \ DEPENDS = "expat glib-2.0 intltool-native mozjs" -inherit autotools gtk-doc pkgconfig useradd systemd gobject-introspection distro_features_check +inherit autotools gtk-doc pkgconfig useradd systemd gobject-introspection features_check REQUIRED_DISTRO_FEATURES = "polkit" diff --git a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch new file mode 100644 index 000000000..a0b721c46 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch @@ -0,0 +1,51 @@ +From 78a9cffb1c760466933bbbcbae7ecb9b30a3e6a5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 21 Nov 2019 13:47:42 -0800 +Subject: [PATCH] sanlock: Replace "cp -a" with "cp -R --no-dereference + --preserve=mode, links" + +Using "cp -a" leaks UID of user running the builds + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + src/Makefile | 8 ++++---- + wdmd/Makefile | 4 ++-- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 533dd79..2fc9ba5 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -127,9 +127,9 @@ install: all + $(INSTALL) -c -m 755 $(LIBSO_CLIENT_TARGET) $(DESTDIR)/$(LIBDIR) + $(INSTALL) -c -m 644 $(LIBPC_ENTIRE_TARGET) $(DESTDIR)/$(LIBDIR)/pkgconfig + $(INSTALL) -c -m 644 $(LIBPC_CLIENT_TARGET) $(DESTDIR)/$(LIBDIR)/pkgconfig +- cp -a $(LIB_ENTIRE_TARGET).so $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_CLIENT_TARGET).so $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_ENTIRE_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_CLIENT_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_ENTIRE_TARGET).so $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_CLIENT_TARGET).so $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_ENTIRE_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_CLIENT_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) + $(INSTALL) -c -m 644 $(HEADER_TARGET) $(DESTDIR)/$(HEADIR) + $(INSTALL) -m 644 $(MAN_TARGET) $(DESTDIR)/$(MANDIR)/man8/ +diff --git a/wdmd/Makefile b/wdmd/Makefile +index 5849efc..4894517 100644 +--- a/wdmd/Makefile ++++ b/wdmd/Makefile +@@ -68,7 +68,7 @@ install: all + $(INSTALL) -d $(DESTDIR)/$(MANDIR)/man8 + $(INSTALL) -c -m 755 $(CMD_TARGET) $(DESTDIR)/$(BINDIR) + $(INSTALL) -c -m 755 $(SHLIB_TARGET) $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_TARGET).so $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_TARGET).so $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) + $(INSTALL) -c -m 644 $(HEADER_TARGET) $(DESTDIR)/$(HEADIR) + $(INSTALL) -m 644 $(MAN_TARGET) $(DESTDIR)/$(MANDIR)/man8 +-- +2.24.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb index 9f7ce9c57..bf7eaf411 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb @@ -11,13 +11,15 @@ SECTION = "utils" LICENSE = "LGPLv2+ & GPLv2 & GPLv2+" LIC_FILES_CHKSUM = "file://README.license;md5=60487bf0bf429d6b5aa72b6d37a0eb22" -SRC_URI = "git://pagure.io/sanlock.git;protocol=http" +SRC_URI = "git://pagure.io/sanlock.git;protocol=http \ + file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch \ + " SRCREV = "7afe0e66f5c7f24894896fad20ffa6f39733d80f" S = "${WORKDIR}/git" DEPENDS = "libaio util-linux" -inherit distutils +inherit distutils3 useradd do_configure[noexec] = "1" @@ -32,3 +34,11 @@ do_install_prepend () { oe_runmake -C src DESTDIR=${D} LIBDIR=${libdir} install cd ${S}/python } + +SANLOCKGROUP ?= "sanlock" +SANLOCKUSER ?= "sanlock" +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM_${PN} = "--system ${SANLOCKGROUP}" +USERADD_PARAM_${PN} = "--system -g ${SANLOCKGROUP} -G disk \ + --home-dir /run/${SANLOCKUSER} --no-create-home \ + --shell /sbin/nologin ${SANLOCKUSER}" diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb index 91c50027d..a527f773a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb @@ -11,7 +11,7 @@ LICENSE = "EPL-1.0" LIC_FILES_CHKSUM = "file://COPYING;md5=f300afd598546add034364cd0a533261" DEPENDS = "curl libpam openssl sblim-sfc-common unzip-native" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "pam" SRC_URI = "http://downloads.sourceforge.net/sblim/${BP}.tar.bz2 \ -- cgit v1.2.3