Author: wiget Date: Tue Mar 29 14:34:26 2011 GMT Module: packages Tag: rpm-4_9 ---- Log message: - rpm-new-debuginfo.patch partialy applied upstream, rest splitted into - debuginfo-builddir.patch - canonical RPM_BUILD_DIR - debuginfo-nostrip.patch - don't strip when extracting debuginfo - debuginfo-strict.patch - fail if no source for compiled objects
---- Files affected: packages/rpm: rpm.spec (1.837.2.42.2.49.2.100.2.1 -> 1.837.2.42.2.49.2.100.2.2) , debuginfo-builddir.patch (NONE -> 1.1.2.1) (NEW), debuginfo-nostrip.patch (NONE -> 1.1.2.1) (NEW), debuginfo-strict.patch (NONE -> 1.1.2.1) (NEW), rpm-new-debuginfo.patch (1.1.2.4 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/rpm/rpm.spec diff -u packages/rpm/rpm.spec:1.837.2.42.2.49.2.100.2.1 packages/rpm/rpm.spec:1.837.2.42.2.49.2.100.2.2 --- packages/rpm/rpm.spec:1.837.2.42.2.49.2.100.2.1 Fri Mar 25 10:57:47 2011 +++ packages/rpm/rpm.spec Tue Mar 29 16:34:20 2011 @@ -85,7 +85,6 @@ # http://svn.pld-linux.org/banner.sh/ Source18: banner.sh Source19: %{name}-macros.gstreamer -Patch1000: %{name}-new-debuginfo.patch Patch1067: %{name}-disable-features.patch Patch1070: %{name}-rpmrc-ac.patch #Patch0: %{name}-pl.po.patch @@ -176,14 +175,19 @@ Patch95: %{name}-gid-uucp.patch Patch96: %{name}-disable-hkp.patch Patch97: %{name}-sigpad.patch -Patch98: %{name}-debugdir.patch Patch99: %{name}-pkgconfig.patch Patch100: %{name}-rpm5-debugedit.patch Patch101: %{name}-builddir-readlink.patch Patch102: pythondeps-speedup.patch Patch103: %{name}-lua-exit-chroot-correctly.patch Patch104: %{name}-glob.patch -Patch2000: lua51.patch + +Patch2001: lua51.patch +Patch2002: %{name}-debugdir.patch +Patch2003: debuginfo-strict.patch +Patch2004: debuginfo-nostrip.patch +Patch2005: debuginfo-builddir.patch + URL: http://www.rpm.org/ BuildRequires: autoconf >= 2.57 BuildRequires: automake >= 1.4 @@ -705,7 +709,6 @@ %prep %setup -q -#patch1000 -p1 #%patch0 -p1 #patch1 -p1 #patch2 -p1 @@ -807,7 +810,6 @@ #patch95 -p1 #patch96 -p1 #patch97 -p1 -#patch98 -p1 #patch99 -p1 #patch53 -p1 #patch100 -p1 @@ -835,7 +837,11 @@ #patch1070 -p1 %endif -%patch2000 -p1 +%patch2001 -p1 +%patch2002 -p1 +%patch2003 -p1 +%patch2004 -p1 +%patch2005 -p1 # generate Group translations to *.po awk -f %{SOURCE6} %{SOURCE1} @@ -1529,6 +1535,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.837.2.42.2.49.2.100.2.2 2011/03/29 14:34:20 wiget +- rpm-new-debuginfo.patch partialy applied upstream, rest splitted into + - debuginfo-builddir.patch - canonical RPM_BUILD_DIR + - debuginfo-nostrip.patch - don't strip when extracting debuginfo + - debuginfo-strict.patch - fail if no source for compiled objects + Revision 1.837.2.42.2.49.2.100.2.1 2011/03/25 09:57:47 wiget - start play with rpm 4.9.0 ================================================================ Index: packages/rpm/debuginfo-builddir.patch diff -u /dev/null packages/rpm/debuginfo-builddir.patch:1.1.2.1 --- /dev/null Tue Mar 29 16:34:26 2011 +++ packages/rpm/debuginfo-builddir.patch Tue Mar 29 16:34:20 2011 @@ -0,0 +1,14 @@ +--- rpm-4.9.0/scripts/find-debuginfo.sh.wiget 2011-03-25 18:57:10.367956883 +0100 ++++ rpm-4.9.0/scripts/find-debuginfo.sh 2011-03-25 19:05:58.372477326 +0100 +@@ -28,6 +28,11 @@ strip_g=false + # Barf on missing build IDs. + strict=false + ++# canon RPM_BUILD_DIR, the DW_AT_comp_dir in ELF objects is real a real path ++# and debugedit will ignore them as they are out of build dir. ++RPM_BUILD_DIR=$(readlink -f "$RPM_BUILD_DIR") ++echo "RPM_BUILD_DIR=$RPM_BUILD_DIR" ++ + BUILDDIR=. + out=debugfiles.list + nout=0 ================================================================ Index: packages/rpm/debuginfo-nostrip.patch diff -u /dev/null packages/rpm/debuginfo-nostrip.patch:1.1.2.1 --- /dev/null Tue Mar 29 16:34:26 2011 +++ packages/rpm/debuginfo-nostrip.patch Tue Mar 29 16:34:20 2011 @@ -0,0 +1,16 @@ +--- rpm-4.9.0/scripts/find-debuginfo.sh.wiget 2011-03-25 18:57:10.367956883 +0100 ++++ rpm-4.9.0/scripts/find-debuginfo.sh 2011-03-25 19:05:58.372477326 +0100 +@@ -89,10 +94,13 @@ debugdir="${RPM_BUILD_ROOT}/usr/lib/debu + strip_to_debug() + { + local g= ++ local t=$(mktemp "/tmp/rpm.stripped.XXXXXX") + $strip_g && case "$(file -bi "$2")" in + application/x-sharedlib*) g=-g ;; + esac + eu-strip --remove-comment $g -f "$1" "$2" || exit ++ eu-strip --remove-comment $g -f "$1" "$2" -o "$t" || exit ++ rm -f "$t" + chmod 444 "$1" || exit + } + ================================================================ Index: packages/rpm/debuginfo-strict.patch diff -u /dev/null packages/rpm/debuginfo-strict.patch:1.1.2.1 --- /dev/null Tue Mar 29 16:34:26 2011 +++ packages/rpm/debuginfo-strict.patch Tue Mar 29 16:34:20 2011 @@ -0,0 +1,14 @@ +--- rpm-4.9.0/scripts/find-debuginfo.sh.wiget 2011-03-25 18:57:10.367956883 +0100 ++++ rpm-4.9.0/scripts/find-debuginfo.sh 2011-03-25 19:05:58.372477326 +0100 +@@ -207,6 +215,11 @@ while read nlinks inum f; do + $strict && exit 2 + fi + ++ if [ ! -s "$SOURCEFILE" ]; then ++ echo >&2 "*** ${strict_error}: no sources found for $f (stripped without sourcefile information?)" ++ $strict && exit 2 ++ fi ++ + [ -x /usr/bin/gdb-add-index ] && /usr/bin/gdb-add-index "$f" > /dev/null 2>&1 + + # A binary already copied into /usr/lib/debug doesn't get stripped, ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm.spec?r1=1.837.2.42.2.49.2.100.2.1&r2=1.837.2.42.2.49.2.100.2.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
