From 59c311f19de431329b7d52517783c261c892d80163b9cb1c89e67597a2e49a17 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Wed, 16 Sep 2020 11:19:59 +0000 Subject: [PATCH] Accepting request 834881 from home:oertel:branches:Base:System - Update to version 84.87+git20200916.d341ab0: * add finalize-system hacks * 01-add_abuild_user_to_trusted_group * also create abuild user if needed * 02-set_timezone_to_utc * 11-hack_uname_version_to_kernel_version * 98-revert-uname-hack * add cleanup as check script - drop all pre/post scripts this is now all done by hooks inside the buildsystem, the package install scripts will not do any harm now and we do not depend on the install sequence any more (revisited boo#1159963) OBS-URL: https://build.opensuse.org/request/show/834881 OBS-URL: https://build.opensuse.org/package/show/Base:System/post-build-checks?expand=0&rev=155 --- _servicedata | 2 +- ...ld-checks-84.87+git20200819.5847424.tar.xz | 3 -- ...ld-checks-84.87+git20200916.d341ab0.tar.xz | 3 ++ post-build-checks.changes | 16 +++++++ post-build-checks.spec | 42 ++----------------- 5 files changed, 24 insertions(+), 42 deletions(-) delete mode 100644 post-build-checks-84.87+git20200819.5847424.tar.xz create mode 100644 post-build-checks-84.87+git20200916.d341ab0.tar.xz diff --git a/_servicedata b/_servicedata index 3888a78..3b7de28 100644 --- a/_servicedata +++ b/_servicedata @@ -1,5 +1,5 @@ git://github.com/openSUSE/post-build-checks.git - 584742418b33de1237c278f8ba746f25b419d9cd + d341ab0ee0ea0b174a510858674162129ddd30f0 \ No newline at end of file diff --git a/post-build-checks-84.87+git20200819.5847424.tar.xz b/post-build-checks-84.87+git20200819.5847424.tar.xz deleted file mode 100644 index de2f693..0000000 --- a/post-build-checks-84.87+git20200819.5847424.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:888dd4445ab6860925e31275e67c0151aeb089d590491ec1914b3343e3e8e5c9 -size 31572 diff --git a/post-build-checks-84.87+git20200916.d341ab0.tar.xz b/post-build-checks-84.87+git20200916.d341ab0.tar.xz new file mode 100644 index 0000000..781790e --- /dev/null +++ b/post-build-checks-84.87+git20200916.d341ab0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37deb10f1624562f84bbf3e5cd6a4045871f285c9969fce8d1589e454aee4028 +size 32124 diff --git a/post-build-checks.changes b/post-build-checks.changes index 6276815..f6f9ed9 100644 --- a/post-build-checks.changes +++ b/post-build-checks.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Sep 16 10:12:53 UTC 2020 - ro@suse.de + +- Update to version 84.87+git20200916.d341ab0: + * add finalize-system hacks + * 01-add_abuild_user_to_trusted_group + * also create abuild user if needed + * 02-set_timezone_to_utc + * 11-hack_uname_version_to_kernel_version + * 98-revert-uname-hack + * add cleanup as check script +- drop all pre/post scripts this is now all done by hooks + inside the buildsystem, the package install scripts will + not do any harm now and we do not depend on the install + sequence any more (revisited boo#1159963) + ------------------------------------------------------------------- Mon Aug 24 16:17:32 CEST 2020 - ro@suse.de diff --git a/post-build-checks.spec b/post-build-checks.spec index 470e76a..a70d626 100644 --- a/post-build-checks.spec +++ b/post-build-checks.spec @@ -16,13 +16,13 @@ # -%define version_unconverted 84.87+git20200819.5847424 +%define version_unconverted 84.87+git20200916.d341ab0 Name: post-build-checks Summary: post checks for build after rpms have been created License: GPL-2.0-or-later Group: Development/Tools/Building -Version: 84.87+git20200819.5847424 +Version: 84.87+git20200916.d341ab0 Release: 0 PreReq: aaa_base permissions sed Requires: aaa_base-malloccheck @@ -61,49 +61,15 @@ it may not be a good idea to install this to a running system: install -d $RPM_BUILD_ROOT/usr/lib/build/checks install -d $RPM_BUILD_ROOT/usr/lib/build/checks-data install -d $RPM_BUILD_ROOT/usr/lib/build/helper +install -d $RPM_BUILD_ROOT/usr/lib/build/finalize-system install -m 755 checks/* $RPM_BUILD_ROOT/usr/lib/build/checks install -m 644 checks-data/* $RPM_BUILD_ROOT/usr/lib/build/checks-data install -m 755 helper/* $RPM_BUILD_ROOT/usr/lib/build/helper +install -m 755 finalize-system/* $RPM_BUILD_ROOT/usr/lib/build/finalize-system install -m 644 -D suse-buildsystem.sh $RPM_BUILD_ROOT/etc/profile.d/suse-buildsystem.sh install -m 644 -D suse-ignored-rpaths.conf $RPM_BUILD_ROOT/etc/suse-ignored-rpaths.conf chmod 755 $RPM_BUILD_ROOT/usr/lib/build/checks-data/check* -%post -# do nothing when not in a build chroot -if ! test -e /.buildenv; then - exit 0 -fi -# change the PERMISSION set to "secure" -sed -i -e "s@^PERMISSION_SECURITY=.*@PERMISSION_SECURITY=\"secure\"@" /etc/sysconfig/security -# add the abuild user to the trusted group so that fusermount works -usermod -G trusted -a abuild || true -# set the timezone to UTC -if [ -f /etc/sysconfig/clock ] ; then -sed -i -e "s@^TIMEZONE=.*@TIMEZONE=\"UTC\"@" /etc/sysconfig/clock -fi -# and add the ugly workaround to override the output of uname -v -# to match the installed kernel sources -UNAME=/bin/uname -if test -f /usr/bin/uname ; then - UNAME=/usr/bin/uname -fi -if test -f $UNAME -a ! -L $UNAME ; then - mv $UNAME $UNAME.bin - ln -s /usr/lib/build/helper/uname.sh $UNAME -fi - -%preun -if ! test -e /.buildenv; then - exit 0 -fi -UNAME=/bin/uname -if test -f /usr/bin/uname.bin ; then - UNAME=/usr/bin/uname -fi -if test "$1" = 0 -a -f $UNAME.bin ; then - mv $UNAME.bin $UNAME -fi - %files %defattr(-, root, root) %license COPYING