Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package post-build-checks for
openSUSE:Factory checked in at 2022-01-31 22:56:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/post-build-checks (Old)
and /work/SRC/openSUSE:Factory/.post-build-checks.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "post-build-checks"
Mon Jan 31 22:56:40 2022 rev:104 rq:949707 version:84.87+git20220128.77a97b9
Changes:
--------
--- /work/SRC/openSUSE:Factory/post-build-checks/post-build-checks.changes
2021-04-22 18:03:48.674492368 +0200
+++
/work/SRC/openSUSE:Factory/.post-build-checks.new.1898/post-build-checks.changes
2022-01-31 22:56:43.109825345 +0100
@@ -1,0 +2,19 @@
+Fri Jan 28 15:00:55 UTC 2022 - r...@suse.de
+
+- Update to version 84.87+git20220128.77a97b9:
+ * change cross build detection logic to be more robust
+ * kill useless use of cat awards
+
+-------------------------------------------------------------------
+Fri Jan 28 12:47:49 UTC 2022 - r...@suse.de
+
+- Update to version 84.87+git20220128.2a04ecb:
+ * keep package that provides /usr/bin/sh
+
+-------------------------------------------------------------------
+Mon May 17 09:24:00 UTC 2021 - r...@suse.de
+
+- Update to version 84.87+git20210517.d960568:
+ * support cross builds
+
+-------------------------------------------------------------------
Old:
----
post-build-checks-84.87+git20210304.df696a0.tar.xz
New:
----
post-build-checks-84.87+git20220128.77a97b9.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ post-build-checks.spec ++++++
--- /var/tmp/diff_new_pack.rzl61U/_old 2022-01-31 22:56:43.745821064 +0100
+++ /var/tmp/diff_new_pack.rzl61U/_new 2022-01-31 22:56:43.749821036 +0100
@@ -1,7 +1,7 @@
#
# spec file for package post-build-checks
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,15 +16,17 @@
#
-%define version_unconverted 84.87+git20210304.df696a0
+%define version_unconverted 84.87+git20220128.77a97b9
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+git20210304.df696a0
+Version: 84.87+git20220128.77a97b9
Release: 0
-PreReq: aaa_base permissions sed
+PreReq: aaa_base
+PreReq: permissions
+PreReq: sed
Requires: aaa_base-malloccheck
Requires: gawk
URL: https://github.com/openSUSE/post-build-checks
@@ -48,8 +50,6 @@
/etc/sysconfig/security:PERMISSION_SECURITY="secure"
/etc/sysconfig/clock:TIMEZONE="UTC"
-
-
%prep
%setup -q
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.rzl61U/_old 2022-01-31 22:56:43.801820686 +0100
+++ /var/tmp/diff_new_pack.rzl61U/_new 2022-01-31 22:56:43.805820660 +0100
@@ -1,7 +1,7 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/openSUSE/post-build-checks.git</param>
- <param
name="changesrevision">df696a02bd9972972eb1048ef41c6fdbce30c274</param></service>
+ <param
name="changesrevision">9a72096c56008474c812a087e25d6e84eb357297</param></service>
</servicedata>
(No newline at EOF)
++++++ post-build-checks-84.87+git20210304.df696a0.tar.xz ->
post-build-checks-84.87+git20220128.77a97b9.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/post-build-checks-84.87+git20210304.df696a0/checks/00-check-install-rpms
new/post-build-checks-84.87+git20220128.77a97b9/checks/00-check-install-rpms
---
old/post-build-checks-84.87+git20210304.df696a0/checks/00-check-install-rpms
2021-03-04 11:25:13.000000000 +0100
+++
new/post-build-checks-84.87+git20220128.77a97b9/checks/00-check-install-rpms
2022-01-28 16:00:03.000000000 +0100
@@ -20,6 +20,13 @@
ADDITIONAL_PARAMS=
test "$ABUILD_INIT_WITH_IGNORE_ARCH" = true &&
ADDITIONAL_PARAMS="$ADDITIONAL_PARAMS --ignorearch"
+
+test -n "$(rpm --eval '%{?cross_sysroot}')" && {
+ echo "skipping installation due to cross_sysroot being set."
+ touch $BUILD_ROOT/skipped-install-cross
+ exit 0
+}
+
chroot $BUILD_ROOT rpm $ADDITIONAL_PARAMS --force --nodeps -Uv
${RPM_FILE_LIST[*]#$BUILD_ROOT} || {
echo 'failed to install rpms, aborting build'
test -n "$BUILD_ROOT" && touch $BUILD_ROOT/not-ready
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/post-build-checks-84.87+git20210304.df696a0/checks/50-check-installtest
new/post-build-checks-84.87+git20220128.77a97b9/checks/50-check-installtest
--- old/post-build-checks-84.87+git20210304.df696a0/checks/50-check-installtest
2021-03-04 11:25:13.000000000 +0100
+++ new/post-build-checks-84.87+git20220128.77a97b9/checks/50-check-installtest
2022-01-28 16:00:03.000000000 +0100
@@ -1,5 +1,10 @@
#!/bin/bash
+test -e $BUILD_ROOT/skipped-install-cross && {
+ echo 'skipping pre/post install checks, install was skipped'
+ exit 0
+}
+
echo "... testing for pre/postinstall scripts that are not idempotent"
TOPDIR=/usr/src/packages
test -d $BUILD_ROOT/.build.packages && TOPDIR=/.build.packages
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/post-build-checks-84.87+git20210304.df696a0/checks/99-check-remove-rpms
new/post-build-checks-84.87+git20220128.77a97b9/checks/99-check-remove-rpms
--- old/post-build-checks-84.87+git20210304.df696a0/checks/99-check-remove-rpms
2021-03-04 11:25:13.000000000 +0100
+++ new/post-build-checks-84.87+git20220128.77a97b9/checks/99-check-remove-rpms
2022-01-28 16:00:03.000000000 +0100
@@ -20,9 +20,9 @@
chroot $BUILD_ROOT bash -c "cd ${RPMCACHEDIR#$BUILD_ROOT} && rpm -Uvv
--force --nodeps --test $REORDER_HAVE" 2>&1 | sed -n -e 's/-[^- ]*-[^- ]* / /'
-e 's/^D: package: \([^ ]*\) .*/\1/p' > $BUILD_ROOT/.reorder/.list
fi
REORDER_HAVE=
- for PKG in `cat $BUILD_ROOT/.reorder/.list`; do
+ for PKG in $(<$BUILD_ROOT/.reorder/.list); do
test -e $BUILD_ROOT/.reorder/$PKG || continue
- REORDER_HAVE="$REORDER_HAVE `cat $BUILD_ROOT/.reorder/$PKG`"
+ REORDER_HAVE="$REORDER_HAVE $(<$BUILD_ROOT/.reorder/$PKG)"
rm $BUILD_ROOT/.reorder/$PKG
done
for RPM in "$@" ; do
@@ -35,23 +35,25 @@
rm $BUILD_ROOT/.reorder/$PKG
done
echo $REORDER_HAVE
-}
+}
#make sure it is mounted
test -d $BUILD_ROOT/proc/sys || { echo "proc is not mounted"; exit 1; }
+test -e $BUILD_ROOT/skipped-install-cross && {
+ echo 'skipping removal of rpms, install was skipped'
+ rm -f $BUILD_ROOT/skipped-install-cross
+ exit 0
+}
+
# test package removal
echo "... removing all built rpms"
export YAST_IS_RUNNING="instsys"
RPM_ERASE_LIST=
RPM_FILE_LIST=(`find $BUILD_ROOT$TOPDIR/RPMS -type f -name "*.rpm"`)
-coreutils=`chroot $BUILD_ROOT rpm --qf '%{NAME}\n' -qf
/usr/bin/{date,cat,rm,chown}|sort -u`
-utillinux=`chroot $BUILD_ROOT rpm --qf '%{NAME}\n' -qf /usr/bin/su|sort -u`
-findutils=`chroot $BUILD_ROOT rpm --qf '%{NAME}\n' -qf /usr/bin/find|sort -u`
-gzip=`chroot $BUILD_ROOT rpm --qf '%{NAME}\n' -qf /usr/bin/gzip|sort -u`
-cpio=`chroot $BUILD_ROOT rpm --qf '%{NAME}\n' -qf /usr/bin/cpio|sort -u`
-shell=`chroot $BUILD_ROOT rpm --qf '%{NAME}\n' -qf /usr/bin/sh|sort -u`
+# essential deps that are needed by the build script to finish
+ESSENTIAL_PKG_TO_KEEP=" $(chroot $BUILD_ROOT rpm --qf '%{NAME}\n' -qf
/usr/bin/{date,cat,rm,chown,find,su,gzip,cpio,sh} $(readlink -f
/usr/bin/sh)|sort -u|xargs) "
for RPM in `reorder "${RPM_FILE_LIST[@]}"`; do
PKG=${RPM##*/}
@@ -72,21 +74,26 @@
echo "(keeping $PKG because of $N)"
continue
fi
- # Do not remove libgcc/libstdc++/libgomp variants or rpm/rpm-build/rpm-ndb
- case ${PKG} in
- libgcc*|libgomp*|libstdc++*)
- ;;
- $coreutils|$utillinux|$shell|$findutils|$gzip|$cpio)
- ;;
- bash-legacybin*|glibc-usrmerge-bootstrap-helper)
- ;;
- pam_unix*)
- ;;
- rpm|rpm-build|rpm-ndb)
- ;;
+
+ # do not remove essential packages
+ case "$ESSENTIAL_PKG_TO_KEEP" in
+ *" $PKG "*)
+ ;;
*)
- RPM_ERASE_LIST="$RPM_ERASE_LIST $PKG"
- ;;
+ # Do not remove libgcc/libstdc++/libgomp variants or
rpm/rpm-build/rpm-ndb
+ case ${PKG} in
+ libgcc*|libgomp*|libstdc++*)
+ ;;
+ bash-legacybin*|glibc-usrmerge-bootstrap-helper)
+ ;;
+ pam_unix*)
+ ;;
+ rpm|rpm-build|rpm-ndb)
+ ;;
+ *)
+ RPM_ERASE_LIST="$RPM_ERASE_LIST $PKG"
+ ;;
+ esac
esac
done
test -z "$REORDER_MISSED" || echo " (reorder missed ${REORDER_MISSED% })"
