From 222948b073fffe04d394ff421204d2f064368fbc145a22a3910cf0f8ad5e90c1 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 18 Mar 2010 15:22:34 +0000 Subject: [PATCH 1/4] Updating link to change in openSUSE:Factory/post-build-checks revision 30.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/post-build-checks?expand=0&rev=3bb8ab25278a53986439ed0319e09216 --- ready | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 ready diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 From 53f92906996d9d3ecd2bfa5f20f2c070e740b172cb5f904d38968de1a232bd75 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Wed, 7 Apr 2010 15:19:50 +0000 Subject: [PATCH 2/4] Accepting request 37245 from home:oertel:branches:openSUSE:Factory Copy from home:oertel:branches:openSUSE:Factory/post-build-checks via accept of submit request 37245 revision 3. Request was accepted with message: forward OBS-URL: https://build.opensuse.org/request/show/37245 OBS-URL: https://build.opensuse.org/package/show/Base:System/post-build-checks?expand=0&rev=20 --- post-build-checks-nosrsc-nodebug.patch | 32 ++++++++++++++++++++++++++ post-build-checks.changes | 9 ++++++++ post-build-checks.spec | 2 ++ 3 files changed, 43 insertions(+) create mode 100644 post-build-checks-nosrsc-nodebug.patch diff --git a/post-build-checks-nosrsc-nodebug.patch b/post-build-checks-nosrsc-nodebug.patch new file mode 100644 index 0000000..644ca3a --- /dev/null +++ b/post-build-checks-nosrsc-nodebug.patch @@ -0,0 +1,32 @@ +--- checks/01-check-debuginfo ++++ checks/01-check-debuginfo +@@ -5,11 +5,29 @@ + fast= + test -x /usr/lib/rpm/rpmi && fast="--nodigest --nosignature" + ++NOSOURCE=0 ++SRPMS=`find $BUILD_ROOT/usr/src/packages/SRPMS -name "*.nosrc.rpm"` ++#grep -qE "^NoSource:|^NoPatch:" $BUILD_ROOT/usr/src/packages/SOURCES/$PNAME.spec && NOSOURCE=1 ++test -n "$SRPMS" && NOSOURCE=1 ++grep -qE "^#KEEP NOSOURCE DEBUGINFO" $BUILD_ROOT/usr/src/packages/SOURCES/$PNAME.spec && NOSOURCE=0 ++case $PNAME in ++ kernel*|java*|texlive-bin*|glibc*) NOSOURCE=0 ;; ++esac ++ + RPMS=`find $BUILD_ROOT/usr/src/packages/RPMS -name "*-debuginfo-*.rpm" -o -name "*-debugsource-*.rpm"` + test -z "$RPMS" && exit 0 + for rpm in $RPMS ; do + HAS_DEBUG= + HAS_SRC= ++ if test "$NOSOURCE" = "1" ; then ++ echo '!' ++ echo "! $rpm: specfile is nosource, deleting" ++ echo "! to disable have a line \"#KEEP NOSOURCE DEBUGINFO\" in your specfile" ++ echo '!' ++ rm -f "$rpm" ++ continue ++ fi ++ + for l in `rpm -qpl $fast "$rpm"` ; do + case "$l" in + /usr/lib/debug/*) HAS_DEBUG=true ;; diff --git a/post-build-checks.changes b/post-build-checks.changes index 05a8241..2935ec4 100644 --- a/post-build-checks.changes +++ b/post-build-checks.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Apr 7 16:48:52 CEST 2010 - ro@suse.de + +- remove debuginfo packages for nosrc rpms unless + package is either kernel or java or texlive-bin or glibc + or removal is disabled in specfile by adding a line + #KEEP NOSOURCE DEBUGINFO + to the specfile (bnc#572695) + ------------------------------------------------------------------- Tue Feb 23 12:21:52 CET 2010 - ro@suse.de diff --git a/post-build-checks.spec b/post-build-checks.spec index 7fde763..af6ac54 100644 --- a/post-build-checks.spec +++ b/post-build-checks.spec @@ -31,6 +31,7 @@ Source1: suse-buildsystem.sh Patch0: %{name}-umount.patch Patch1: %{name}-parrot.patch Patch2: post-build-checks-nonvoid_new.patch +Patch3: post-build-checks-nosrsc-nodebug.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -50,6 +51,7 @@ it may not be a good idea to install this to a running system: %patch0 -p1 %patch1 %patch2 +%patch3 %build # nothing to do From ce25ab2d896d794384fec485000d9ccead75b833143f8a1e78c70916e4499242 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 13 Apr 2010 20:39:10 +0000 Subject: [PATCH 3/4] Accepting request 37252 from Base:System checked in (request 37252) OBS-URL: https://build.opensuse.org/request/show/37252 OBS-URL: https://build.opensuse.org/package/show/Base:System/post-build-checks?expand=0&rev=21 --- post-build-checks-nosrsc-nodebug.patch | 32 -------------------------- post-build-checks.changes | 9 -------- post-build-checks.spec | 2 -- 3 files changed, 43 deletions(-) delete mode 100644 post-build-checks-nosrsc-nodebug.patch diff --git a/post-build-checks-nosrsc-nodebug.patch b/post-build-checks-nosrsc-nodebug.patch deleted file mode 100644 index 644ca3a..0000000 --- a/post-build-checks-nosrsc-nodebug.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- checks/01-check-debuginfo -+++ checks/01-check-debuginfo -@@ -5,11 +5,29 @@ - fast= - test -x /usr/lib/rpm/rpmi && fast="--nodigest --nosignature" - -+NOSOURCE=0 -+SRPMS=`find $BUILD_ROOT/usr/src/packages/SRPMS -name "*.nosrc.rpm"` -+#grep -qE "^NoSource:|^NoPatch:" $BUILD_ROOT/usr/src/packages/SOURCES/$PNAME.spec && NOSOURCE=1 -+test -n "$SRPMS" && NOSOURCE=1 -+grep -qE "^#KEEP NOSOURCE DEBUGINFO" $BUILD_ROOT/usr/src/packages/SOURCES/$PNAME.spec && NOSOURCE=0 -+case $PNAME in -+ kernel*|java*|texlive-bin*|glibc*) NOSOURCE=0 ;; -+esac -+ - RPMS=`find $BUILD_ROOT/usr/src/packages/RPMS -name "*-debuginfo-*.rpm" -o -name "*-debugsource-*.rpm"` - test -z "$RPMS" && exit 0 - for rpm in $RPMS ; do - HAS_DEBUG= - HAS_SRC= -+ if test "$NOSOURCE" = "1" ; then -+ echo '!' -+ echo "! $rpm: specfile is nosource, deleting" -+ echo "! to disable have a line \"#KEEP NOSOURCE DEBUGINFO\" in your specfile" -+ echo '!' -+ rm -f "$rpm" -+ continue -+ fi -+ - for l in `rpm -qpl $fast "$rpm"` ; do - case "$l" in - /usr/lib/debug/*) HAS_DEBUG=true ;; diff --git a/post-build-checks.changes b/post-build-checks.changes index 2935ec4..05a8241 100644 --- a/post-build-checks.changes +++ b/post-build-checks.changes @@ -1,12 +1,3 @@ -------------------------------------------------------------------- -Wed Apr 7 16:48:52 CEST 2010 - ro@suse.de - -- remove debuginfo packages for nosrc rpms unless - package is either kernel or java or texlive-bin or glibc - or removal is disabled in specfile by adding a line - #KEEP NOSOURCE DEBUGINFO - to the specfile (bnc#572695) - ------------------------------------------------------------------- Tue Feb 23 12:21:52 CET 2010 - ro@suse.de diff --git a/post-build-checks.spec b/post-build-checks.spec index af6ac54..7fde763 100644 --- a/post-build-checks.spec +++ b/post-build-checks.spec @@ -31,7 +31,6 @@ Source1: suse-buildsystem.sh Patch0: %{name}-umount.patch Patch1: %{name}-parrot.patch Patch2: post-build-checks-nonvoid_new.patch -Patch3: post-build-checks-nosrsc-nodebug.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -51,7 +50,6 @@ it may not be a good idea to install this to a running system: %patch0 -p1 %patch1 %patch2 -%patch3 %build # nothing to do From d984fa028315e5ceb42a827fc131f43c05aeb653e2f979bbfa7c5b7a77b65953 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 13 Apr 2010 20:39:11 +0000 Subject: [PATCH 4/4] Updating link to change in openSUSE:Factory/post-build-checks revision 31.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/post-build-checks?expand=0&rev=d2c4160ca1e180930f30801c25c3c1ce --- post-build-checks-nosrsc-nodebug.patch | 32 ++++++++++++++++++++++++++ post-build-checks.changes | 9 ++++++++ post-build-checks.spec | 4 +++- 3 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 post-build-checks-nosrsc-nodebug.patch diff --git a/post-build-checks-nosrsc-nodebug.patch b/post-build-checks-nosrsc-nodebug.patch new file mode 100644 index 0000000..644ca3a --- /dev/null +++ b/post-build-checks-nosrsc-nodebug.patch @@ -0,0 +1,32 @@ +--- checks/01-check-debuginfo ++++ checks/01-check-debuginfo +@@ -5,11 +5,29 @@ + fast= + test -x /usr/lib/rpm/rpmi && fast="--nodigest --nosignature" + ++NOSOURCE=0 ++SRPMS=`find $BUILD_ROOT/usr/src/packages/SRPMS -name "*.nosrc.rpm"` ++#grep -qE "^NoSource:|^NoPatch:" $BUILD_ROOT/usr/src/packages/SOURCES/$PNAME.spec && NOSOURCE=1 ++test -n "$SRPMS" && NOSOURCE=1 ++grep -qE "^#KEEP NOSOURCE DEBUGINFO" $BUILD_ROOT/usr/src/packages/SOURCES/$PNAME.spec && NOSOURCE=0 ++case $PNAME in ++ kernel*|java*|texlive-bin*|glibc*) NOSOURCE=0 ;; ++esac ++ + RPMS=`find $BUILD_ROOT/usr/src/packages/RPMS -name "*-debuginfo-*.rpm" -o -name "*-debugsource-*.rpm"` + test -z "$RPMS" && exit 0 + for rpm in $RPMS ; do + HAS_DEBUG= + HAS_SRC= ++ if test "$NOSOURCE" = "1" ; then ++ echo '!' ++ echo "! $rpm: specfile is nosource, deleting" ++ echo "! to disable have a line \"#KEEP NOSOURCE DEBUGINFO\" in your specfile" ++ echo '!' ++ rm -f "$rpm" ++ continue ++ fi ++ + for l in `rpm -qpl $fast "$rpm"` ; do + case "$l" in + /usr/lib/debug/*) HAS_DEBUG=true ;; diff --git a/post-build-checks.changes b/post-build-checks.changes index 05a8241..2935ec4 100644 --- a/post-build-checks.changes +++ b/post-build-checks.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Apr 7 16:48:52 CEST 2010 - ro@suse.de + +- remove debuginfo packages for nosrc rpms unless + package is either kernel or java or texlive-bin or glibc + or removal is disabled in specfile by adding a line + #KEEP NOSOURCE DEBUGINFO + to the specfile (bnc#572695) + ------------------------------------------------------------------- Tue Feb 23 12:21:52 CET 2010 - ro@suse.de diff --git a/post-build-checks.spec b/post-build-checks.spec index 7fde763..e38392a 100644 --- a/post-build-checks.spec +++ b/post-build-checks.spec @@ -24,13 +24,14 @@ Group: Development/Tools/Building AutoReqProv: on Summary: post checks for build after rpms have been created Version: 1.0 -Release: 70 +Release: 71 PreReq: aaa_base permissions sed Source0: %{name}-%{version}.tar.bz2 Source1: suse-buildsystem.sh Patch0: %{name}-umount.patch Patch1: %{name}-parrot.patch Patch2: post-build-checks-nonvoid_new.patch +Patch3: post-build-checks-nosrsc-nodebug.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -50,6 +51,7 @@ it may not be a good idea to install this to a running system: %patch0 -p1 %patch1 %patch2 +%patch3 %build # nothing to do