commit post-build-checks for openSUSE:Factory
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-10-01 17:41:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/post-build-checks (Old)
and /work/SRC/openSUSE:Factory/.post-build-checks.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "post-build-checks"
Sat Oct 1 17:41:42 2022 rev:107 rq:1006325 version:84.87+git20220922.95e4f0a
Changes:
--------
--- /work/SRC/openSUSE:Factory/post-build-checks/post-build-checks.changes 2022-04-06 21:51:12.307763183 +0200
+++ /work/SRC/openSUSE:Factory/.post-build-checks.new.2275/post-build-checks.changes 2022-10-01 17:41:46.593519227 +0200
@@ -1,0 +2,13 @@
+Fri Sep 23 11:06:44 UTC 2022 - dimstar@opensuse.org
+
+- Update to version 84.87+git20220922.95e4f0a:
+ * Follow symlinks to infer which packages to keep
+ * Convert egrep/fgrep calls to grep -E/-F, respectively
+ * code cleanup
+ * update 50-check-kernel-build-id for compression and location of kernels
+ * reduce work in installtest script
+ * use predictable C locale for rpm listing
+ * Speedup check-lanana
+ * 50-check-kernel-build-id: handle riscv64
+
+-------------------------------------------------------------------
Old:
----
post-build-checks-84.87+git20220325.f46ef3c.tar.xz
New:
----
post-build-checks-84.87+git20220922.95e4f0a.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ post-build-checks.spec ++++++
--- /var/tmp/diff_new_pack.Ob2p1t/_old 2022-10-01 17:41:47.161520263 +0200
+++ /var/tmp/diff_new_pack.Ob2p1t/_new 2022-10-01 17:41:47.165520270 +0200
@@ -16,13 +16,13 @@
#
-%define version_unconverted 84.87+git20220325.f46ef3c
+%define version_unconverted 84.87+git20220922.95e4f0a
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+git20220325.f46ef3c
+Version: 84.87+git20220922.95e4f0a
Release: 0
PreReq: aaa_base
PreReq: permissions
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.Ob2p1t/_old 2022-10-01 17:41:47.213520358 +0200
+++ /var/tmp/diff_new_pack.Ob2p1t/_new 2022-10-01 17:41:47.217520365 +0200
@@ -4,6 +4,6 @@
<param name="changesrevision">9a72096c56008474c812a087e25d6e84eb357297</param></service>
<service name="tar_scm">
<param name="url">https://github.com/openSUSE/post-build-checks.git</param>
- <param name="changesrevision">f4238540a348d642f437244dd09d80fe7f3490ff</param></service></servicedata>
+ <param name="changesrevision">95e4f0a9f98a0e41845eb42aff87c8b35af05113</param></service></servicedata>
(No newline at EOF)
++++++ post-build-checks-84.87+git20220325.f46ef3c.tar.xz -> post-build-checks-84.87+git20220922.95e4f0a.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/post-build-checks-84.87+git20220325.f46ef3c/checks/50-check-installtest new/post-build-checks-84.87+git20220922.95e4f0a/checks/50-check-installtest
--- old/post-build-checks-84.87+git20220325.f46ef3c/checks/50-check-installtest 2022-03-25 17:59:14.000000000 +0100
+++ new/post-build-checks-84.87+git20220922.95e4f0a/checks/50-check-installtest 2022-09-22 22:35:25.000000000 +0200
@@ -18,48 +18,53 @@
export YAST_IS_RUNNING="instsys"
for i in $(find $BUILD_ROOT$TOPDIR/RPMS -type f -name "*.rpm" | sort) ; do
- pre_p=$($RPM -qp --qf '%{PREINPROG}' ${i#$BUILD_ROOT})
- post_p=$($RPM -qp --qf '%{POSTINPROG}' ${i#$BUILD_ROOT})
- preun_p=$($RPM -qp --qf '%{PREUNPROG}' ${i#$BUILD_ROOT})
- postun_p=$($RPM -qp --qf '%{POSTUNPROG}' ${i#$BUILD_ROOT})
- pre=$($RPM -qp --qf '%{PREIN}' ${i#$BUILD_ROOT})
- post=$($RPM -qp --qf '%{POSTIN}' ${i#$BUILD_ROOT})
- preun=$($RPM -qp --qf '%{PREUN}' ${i#$BUILD_ROOT})
- postun=$($RPM -qp --qf '%{POSTUN}' ${i#$BUILD_ROOT})
- test "$pre" = "(none)" -a "$post" = "(none)" -a "$preun" = "(none)" -a "$postun" = "(none)" && continue
+ set -- $($RPM --macros=/dev/null -qp --qf '%{PREINPROG} %{POSTINPROG} %{PREUNPROG} %{POSTUNPROG}' ${i#$BUILD_ROOT})
+ pre_p="$1"
+ post_p="$2"
+ preun_p="$3"
+ postun_p="$4"
+ test "$pre_p" = "(none)" -a "$post_p" = "(none)" -a "$preun_p" = "(none)" -a "$postun_p" = "(none)" && continue
$RPM -Vp --nodeps ${i#$BUILD_ROOT} > $BUILD_ROOT/.build_patchrpmcheck1
- if test "$pre" != "(none)" -a "$pre_p" != "<lua>" ; then
- echo "$pre" > $BUILD_ROOT/.build_patchrpmcheck_scr
- chroot $BUILD_ROOT sh $SCRIPT_ARG /.build_patchrpmcheck_scr 2 || {
- echo "preinstall script of ${i##*/} failed"
- touch $BUILD_ROOT/not-ready
- exit 1
- }
+ if test "${pre_p: -2}" = "sh" ; then
+ $RPM --macros=/dev/null -qp --qf '%{PREIN}' ${i#$BUILD_ROOT} > $BUILD_ROOT/.build_patchrpmcheck_scr
+ if test "$(<$BUILD_ROOT/.build_patchrpmcheck_scr)" != "(none)" ; then
+ if ! chroot $BUILD_ROOT ${pre_p} $SCRIPT_ARG /.build_patchrpmcheck_scr 2 ; then
+ echo "preinstall script of ${i##*/} failed"
+ touch $BUILD_ROOT/not-ready
+ exit 1
+ fi
+ fi
fi
- if test "$post" != "(none)" -a "$post_p" != "<lua>" ; then
- echo "$post" > $BUILD_ROOT/.build_patchrpmcheck_scr
- chroot $BUILD_ROOT sh $SCRIPT_ARG /.build_patchrpmcheck_scr 2 || {
- echo "postinstall script of ${i##*/} failed"
- touch $BUILD_ROOT/not-ready
- exit 1
- }
+ if test "${post_p: -2}" = "sh" ; then
+ $RPM --macros=/dev/null -qp --qf '%{POSTIN}' ${i#$BUILD_ROOT} > $BUILD_ROOT/.build_patchrpmcheck_scr
+ if test "$(<$BUILD_ROOT/.build_patchrpmcheck_scr)" != "(none)" ; then
+ if ! chroot $BUILD_ROOT ${post_p} $SCRIPT_ARG /.build_patchrpmcheck_scr 2 ; then
+ echo "postinstall script of ${i##*/} failed"
+ touch $BUILD_ROOT/not-ready
+ exit 1
+ fi
+ fi
fi
- if test "$preun" != "(none)" -a "$preun_p" != "<lua>" ; then
- echo "$preun" > $BUILD_ROOT/.build_patchrpmcheck_scr
- chroot $BUILD_ROOT sh $SCRIPT_ARG /.build_patchrpmcheck_scr 1 || {
- echo "preuninstall script of ${i##*/} failed"
- touch $BUILD_ROOT/not-ready
- exit 1
- }
+ if test "${preun_p: -2}" = "sh" ; then
+ $RPM --macros=/dev/null -qp --qf '%{PREUN}' ${i#$BUILD_ROOT} > $BUILD_ROOT/.build_patchrpmcheck_scr
+ if test "$(<$BUILD_ROOT/.build_patchrpmcheck_scr)" != "(none)" ; then
+ if ! chroot $BUILD_ROOT ${preun_p} $SCRIPT_ARG /.build_patchrpmcheck_scr 1 ; then
+ echo "preuninstall script of ${i##*/} failed"
+ touch $BUILD_ROOT/not-ready
+ exit 1
+ fi
+ fi
fi
- if test "$postun" != "(none)" -a "$postun_p" != "<lua>" ; then
- echo "$postun" > $BUILD_ROOT/.build_patchrpmcheck_scr
- chroot $BUILD_ROOT sh $SCRIPT_ARG /.build_patchrpmcheck_scr 1 || {
- echo "postuninstall script of ${i##*/} failed"
- touch $BUILD_ROOT/not-ready
- exit 1
- }
+ if test "${postun_p: -2}" = "sh" ; then
+ $RPM --macros=/dev/null -qp --qf '%{POSTUN}' ${i#$BUILD_ROOT} > $BUILD_ROOT/.build_patchrpmcheck_scr
+ if test "$(<$BUILD_ROOT/.build_patchrpmcheck_scr)" != "(none)" ; then
+ if ! chroot $BUILD_ROOT ${postun_p} $SCRIPT_ARG /.build_patchrpmcheck_scr 1 ; then
+ echo "postuninstall script of ${i##*/} failed"
+ touch $BUILD_ROOT/not-ready
+ exit 1
+ fi
+ fi
fi
$RPM -Vp --nodeps ${i#$BUILD_ROOT} > $BUILD_ROOT/.build_patchrpmcheck2
if ! cmp -s $BUILD_ROOT/.build_patchrpmcheck1 $BUILD_ROOT/.build_patchrpmcheck2; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/post-build-checks-84.87+git20220325.f46ef3c/checks/50-check-invalid-provides new/post-build-checks-84.87+git20220922.95e4f0a/checks/50-check-invalid-provides
--- old/post-build-checks-84.87+git20220325.f46ef3c/checks/50-check-invalid-provides 2022-03-25 17:59:14.000000000 +0100
+++ new/post-build-checks-84.87+git20220922.95e4f0a/checks/50-check-invalid-provides 2022-09-22 22:35:25.000000000 +0200
@@ -4,22 +4,22 @@
TOPDIR=/usr/src/packages
test -d $BUILD_ROOT/.build.packages && TOPDIR=/.build.packages
-export UNVALID_FILE_FOUND=false
+export INVALID_FILE_FOUND=false
-for package in `find $BUILD_ROOT$TOPDIR/RPMS -name "*.rpm"` ; do
- if rpm -qp --provides --nodigest --nosignature $package \
- | grep -q -E "^$(rpm -qp --nodigest --nosignature --queryformat='%{NAME}' $package)[[:space:]]*$"; then
+RPM="env LC_ALL=C rpm --macros=/dev/null --nodigest --nosignature"
+for package in `find $BUILD_ROOT$TOPDIR/RPMS -type f -name "*.rpm"` ; do
+ if $RPM -qp --provides $package | grep -q -E "^$($RPM -qp --qf='%{NAME}' $package)[[:space:]]*$"; then
echo ""
echo "ERROR: ${package##$BUILD_ROOT}"
echo " has an unversioned self-provide. "
echo " Remove it, self-provides are done automatically."
echo " If you don't understand this error message, contact dmueller@suse.de"
echo ""
- UNVALID_FILE_FOUND=true
+ INVALID_FILE_FOUND=true
fi
done
-test $UNVALID_FILE_FOUND = true && exit 1
+test $INVALID_FILE_FOUND = true && exit 1
exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/post-build-checks-84.87+git20220325.f46ef3c/checks/50-check-invalid-requires new/post-build-checks-84.87+git20220922.95e4f0a/checks/50-check-invalid-requires
--- old/post-build-checks-84.87+git20220325.f46ef3c/checks/50-check-invalid-requires 2022-03-25 17:59:14.000000000 +0100
+++ new/post-build-checks-84.87+git20220922.95e4f0a/checks/50-check-invalid-requires 2022-09-22 22:35:25.000000000 +0200
@@ -9,7 +9,7 @@
FORBIDDEN_REQ=`find $BUILD_ROOT$TOPDIR/RPMS -name "*.rpm" | \
xargs --no-run-if-empty rpm -qp --requires| \
- egrep "/usr/local/|/usr/share/bin"`
+ grep -E "/usr/local/|/usr/share/bin"`
for LINE in $FORBIDDEN_REQ; do
case "$LINE" in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/post-build-checks-84.87+git20220325.f46ef3c/checks/50-check-kernel-build-id new/post-build-checks-84.87+git20220922.95e4f0a/checks/50-check-kernel-build-id
--- old/post-build-checks-84.87+git20220325.f46ef3c/checks/50-check-kernel-build-id 2022-03-25 17:59:14.000000000 +0100
+++ new/post-build-checks-84.87+git20220922.95e4f0a/checks/50-check-kernel-build-id 2022-09-22 22:35:25.000000000 +0200
@@ -38,7 +38,6 @@
cpioflags="-icd --quiet"
have_debugi=1
image_name=""
-vmlinux_compression_suffix=""
warnonly=0
# only check for these flavors
@@ -57,37 +56,33 @@
# look for which arch was built, since this is kernel specific, there are
# no biarch issues
-karchs="i586 i686 x86_64 ppc ppc64 ppc64le s390 s390x armv6l armv7l aarch64"
+karchs="i586 i686 x86_64 ppc ppc64 ppc64le s390 s390x armv6l armv7l aarch64 riscv64"
rpm_prov_arch=""
for arch in ${karchs}; do
if [ -d ${TOPDIR}/RPMS/${arch} ] ;then
case ${arch} in
"i586"|"i686") rpm_prov_arch="x86-32"
- vmlinux_compression_suffix=".gz"
image_name="vmlinuz";;
"x86_64") rpm_prov_arch="x86-64";
- vmlinux_compression_suffix=".gz"
image_name="vmlinuz";;
"ppc") rpm_prov_arch="ppc-32";;
"ppc64"|"ppc64le") rpm_prov_arch="ppc-64";;
"s390") rpm_prov_arch="s390-32"
- vmlinux_compression_suffix=".gz"
#has Image but not ELF
;;
"s390x") rpm_prov_arch="s390-64"
- vmlinux_compression_suffix=".gz"
#has Image but not ELF
;;
"armv6l") rpm_prov_arch="armv6hl-32"
- vmlinux_compression_suffix=".gz"
#has Image but not ELF
;;
"armv7l") rpm_prov_arch="armv7hl-32"
- vmlinux_compression_suffix=".gz"
#has Image but not ELF
;;
"aarch64") rpm_prov_arch="aarch-64"
- vmlinux_compression_suffix=".gz"
+ #has Image but not ELF
+ ;;
+ "riscv64") rpm_prov_arch="riscv-64"
#has Image but not ELF
;;
*) err "karchs does not match case statement, please fixme!" ;;
@@ -115,16 +110,33 @@
_tmpdir=`mktemp -d`
[ -d "${_tmpdir}" ] || err "Unable to make tempdir"
-vmlinux="./boot/vmlinux-${kernversion}-${flavor}${vmlinux_compression_suffix}"
-image=""
-have_image && image="./boot/${image_name}-${kernversion}-${flavor}"
-rpm2cpio ${krpm} | (cd ${_tmpdir} ; cpio ${cpioflags} ${vmlinux} ${image})
+oldpath=./boot/
+newpath=./usr/lib/modules/${kernversion}-${flavor}/
+rpm2cpio ${krpm} | (cd ${_tmpdir} ; cpio ${cpioflags} ${oldpath}vmlinux* ${newpath}${image_name}*)
+
+oldvmlinux=${oldpath}vmlinux-${kernversion}-${flavor}
+newvmlinux=${newpath}vmlinux
+
+for vmlinux_cand in ${oldvmlinux} ${newvmlinux} ; do
+ for compext in zst xz gz ; do
+ test -f ${_tmpdir}/${vmlinux_cand}.${compext} && vmlinux=${vmlinux_cand}.${compext}
+ done
+done
+
+if have_image ; then
+ oldimage=${oldpath}${image_name}-${kernversion}-${flavor}
+ newimage=${newpath}${image_name}
+ image=""
+ for image_cand in ${oldimage} ${newimage} ; do
+ test -f ${_tmpdir}/${image_cand} && image=${image_cand}
+ done
+fi
[ ! -f ${_tmpdir}/${vmlinux} ] && err "Unable to extract ${vmlinux} from ${krpm}"
vmlinux_id=`buildid ${_tmpdir}/${vmlinux}`
mismatch=0
-if have_image ;then
+if have_image ; then
[ ! -f ${_tmpdir}/${image} ] && err "Unable to extract ${image} from ${krpm}"
image_id=`buildid ${_tmpdir}/${image}`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/post-build-checks-84.87+git20220325.f46ef3c/checks/50-check-lanana new/post-build-checks-84.87+git20220922.95e4f0a/checks/50-check-lanana
--- old/post-build-checks-84.87+git20220325.f46ef3c/checks/50-check-lanana 2022-03-25 17:59:14.000000000 +0100
+++ new/post-build-checks-84.87+git20220922.95e4f0a/checks/50-check-lanana 2022-09-22 22:35:25.000000000 +0200
@@ -10,15 +10,11 @@
INITD_DATA=$BUILD_ROOT/usr/lib/build/checks-data/initd.txt
CRON_DATA=$BUILD_ROOT/usr/lib/build/checks-data/cron.txt
+RPM="chroot $BUILD_ROOT env LC_ALL=C rpm --macros=/dev/null --nodigest --nosignature"
-ALL_RPMS=`find $BUILD_ROOT$TOPDIR/RPMS -name "*.rpm"`
-
-if [ ! -z "$ALL_RPMS" ] ; then
-
- for RPM in $ALL_RPMS; do
- RPM_NAME=`rpm -qp --qf "%{NAME}" $RPM`
- ALL_RPM_LINES=`rpm -qpl $RPM | sed -e "s@ @_@g"`
- for LINE in $ALL_RPM_LINES; do
+for rpm_package in $(find $BUILD_ROOT$TOPDIR/RPMS -type f -name "*.rpm" | LC_ALL=C sort) ; do
+ RPM_NAME=$($RPM -qp --qf "%{NAME}" $rpm_package)
+ $RPM -qpl --nofiledigest $rpm_package | sed -e "s@ @_@g" | while read LINE; do
case "$LINE" in
/etc/init.d/*)
SCRIPTNAME=`basename $LINE`
@@ -27,10 +23,9 @@
novell*)
;;
*)
- grep ^"$SCRIPTNAME " $INITD_DATA > /dev/null
- if [ $? -eq 1 ]; then
- echo $RPM_NAME: Name of init script \""$SCRIPTNAME"\" is not LSB conform
- #INVALID_FILE_FOUND=true
+ if ! grep -q -E ^"$SCRIPTNAME " $INITD_DATA ; then
+ echo $($RPM -qp --qf "%{NAME}" $rpm_package): Name of init script \""$SCRIPTNAME"\" is not LSB conform
+ # INVALID_FILE_FOUND=true
fi
;;
esac
@@ -47,10 +42,9 @@
novell*)
;;
*)
- grep ^"$SCRIPTNAME\$" $CRON_DATA > /dev/null
- if [ $? -eq 1 ]; then
- echo $RPM_NAME: Name of cron script \""$SCRIPTNAME"\" is not LSB conform
- #INVALID_FILE_FOUND=true
+ if ! grep -q -E ^"$SCRIPTNAME\$" $CRON_DATA > /dev/null ; then
+ echo $($RPM -qp --qf "%{NAME}" $rpm_package): Name of cron script \""$SCRIPTNAME"\" is not LSB conform
+ # INVALID_FILE_FOUND=true
fi
;;
esac
@@ -60,8 +54,7 @@
;;
esac
done
- done
-fi
+done
test $INVALID_FILE_FOUND = true && exit 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/post-build-checks-84.87+git20220325.f46ef3c/checks/50-check-libtool-deps new/post-build-checks-84.87+git20220922.95e4f0a/checks/50-check-libtool-deps
--- old/post-build-checks-84.87+git20220325.f46ef3c/checks/50-check-libtool-deps 2022-03-25 17:59:14.000000000 +0100
+++ new/post-build-checks-84.87+git20220922.95e4f0a/checks/50-check-libtool-deps 2022-09-22 22:35:25.000000000 +0200
@@ -3,6 +3,7 @@
# Check dependencies required by libtool to use .la files.
#
# Copyright (C) 2005 Stanislav Brabec
participants (1)
-
Source-Sync