Author: glen Date: Wed Jan 30 00:27:37 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- skip chrpath lookup from kernel modules dir
- compress kernel modules message cosmetics
---- Files affected:
SOURCES:
rpm.macros (1.418 -> 1.419)
---- Diffs:
================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.418 SOURCES/rpm.macros:1.419
--- SOURCES/rpm.macros:1.418 Tue Jan 29 23:32:31 2008
+++ SOURCES/rpm.macros Wed Jan 30 01:27:32 2008
@@ -419,11 +419,10 @@
%__spec_install_post_chrpath {%{!?debug: \
%{!?no_install_post_chrpath: __spec_install_post_chrpath() { \
if [ -d "$RPM_BUILD_ROOT" ]; then \
- files=`find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*" !
-regex ".*/usr/lib[0-9]*/debug/.*" ! -regex ".*%{_docdir}/.*" ! -regex
".*%{_includedir}/.*" %{?_noautochrpath:! -regex "%{_noautochrpath}"}`; \
+ files=`find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*" !
-regex ".*/usr/lib[0-9]*/debug/.*" ! -regex ".*/lib/modules/.*" ! -regex
".*%{_docdir}/.*" ! -regex ".*%{_includedir}/.*" %{?_noautochrpath:! -regex
"%{_noautochrpath}"}`; \
if [ -n "$files" ]; then \
objs=`echo "$files" | xargs -r -d'\\n' file | awk -F:
'/ELF.*(executable.*dynamically linked|shared object)/ {print $1}'`; \
- fi
- #"
+ fi; \
if [ -n "$objs" ]; then \
printf "Remove RPATH from %d executable binaries and shared
object files.\n" $(echo -n "$objs" | wc -l); \
echo "$objs" | \
@@ -457,10 +456,10 @@
%__spec_install_post_compress_modules { \
%{!?no_install_post_compress_modules: __spec_install_post_compress_modules() {
\
if [ -d $RPM_BUILD_ROOT/lib/modules ]; then \
- echo "Compress kernel modules"; \
q=$(find $RPM_BUILD_ROOT/lib/modules -name '*o' -type f
-print); \
+ printf "Compress %d kernel modules..." $(echo -n "$q" | wc -l);
\
echo "$q" | xargs -r %{__gzip} -9nf; \
- printf "%d modules compressed\n" $(echo -n "$q" | wc -l); \
+ echo "DONE"; \
find $RPM_BUILD_ROOT/lib/modules -name '*o' -type l -printf "%p
%l\n" | \
while read a b; do ln -sf $b.gz $a.gz; rm -f $a; done; \
fi; \
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm.macros?r1=1.418&r2=1.419&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
