diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-11-25 17:40:59 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-11-25 17:41:09 +0300 |
commit | 8410d61f39efb52ffab1dc89efb05ca3ae837907 (patch) | |
tree | 3fd23d8e51ed9b3e9c4aa01514aaf778674cad14 /meta-openembedded/meta-oe/recipes-extended/sanlock | |
parent | 1065cc2853e5509b7e5dd07a87fec8dc22b7c970 (diff) | |
download | openbmc-8410d61f39efb52ffab1dc89efb05ca3ae837907.tar.xz |
meta-openembedded: subtree update:53d431639a..e4ac09169d
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 <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended/sanlock')
2 files changed, 63 insertions, 2 deletions
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 <raj.khem@gmail.com> +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 <raj.khem@gmail.com> +--- + 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}" |