Author: glen Date: Tue Jan 29 22:32:37 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- line counts stright
- no need to scan kernel modules dir for executables
- striping kernel modules message lacked filecount
---- Files affected:
SOURCES:
rpm.macros (1.417 -> 1.418)
---- Diffs:
================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.417 SOURCES/rpm.macros:1.418
--- SOURCES/rpm.macros:1.417 Fri Jan 25 01:23:25 2008
+++ SOURCES/rpm.macros Tue Jan 29 23:32:31 2008
@@ -353,32 +353,32 @@
modulelist=$(find $RPM_BUILD_ROOT/lib/modules -name '*o' -type
f -print); \
modulecount=$(echo -n "$modulelist" | wc -l); \
if [ "$modulecount" -gt 0 ]; then \
- printf "Stripping %d kernel modules..."; \
+ printf "Stripping %d kernel modules..." $modulecount; \
echo "$modulelist" | xargs -l512 chmod u+w; \
echo "$modulelist" | xargs -l512 %{__strip}
--strip-unneeded --remove-section=.comment --remove-section=.note.GNU-stack; \
echo "DONE"; \
fi; \
fi; \
- filelist=`find $RPM_BUILD_ROOT -type f ! -regex
".*/usr/lib[0-9]*/debug/.*\.debug" ! -regex ".*%{_docdir}/.*" ! -regex
".*%{_includedir}/.*" %{?_noautostrip:! -regex "%{_noautostrip}"}
%{?_autostripall:! -regex "%{_autostripall}"} %{?_autostripunneeded:! -regex
"%{_autostripunneeded}"} %{?_autostripdebug:! -regex "%{_autostripdebug}"}`; \
+ filelist=`find $RPM_BUILD_ROOT -type f ! -regex
".*/usr/lib[0-9]*/debug/.*\.debug" ! -regex ".*/lib/modules/.*" ! -regex
".*%{_docdir}/.*" ! -regex ".*%{_includedir}/.*" %{?_noautostrip:! -regex
"%{_noautostrip}"} %{?_autostripall:! -regex "%{_autostripall}"}
%{?_autostripunneeded:! -regex "%{_autostripunneeded}"} %{?_autostripdebug:!
-regex "%{_autostripdebug}"}`; \
if [ -n "$filelist" ]; then \
filetypes=`echo "$filelist" | xargs -r -d'\\n' file`; \
elfexelist=`echo "$filetypes" | awk -F: '/ELF.*executable/
{print $1}'`; \
elfsharedlist=`echo "$filetypes" | awk -F: '/LF.*shared object/
{print $1}'`; \
archiveslist=`echo "$filetypes" | awk -F: '/current ar archive/
{print $1}'`; \
if [ -n "$elfexelist" ]; then \
- printf "Stripping %d ELF executables..." $(echo
"$elfexelist" | wc -l); \
+ printf "Stripping %d ELF executables..." $(echo -n
"$elfexelist" | wc -l); \
chmod u+w $elfexelist; \
%{__strip} --remove-section=.note
--remove-section=.comment $elfexelist; \
echo "DONE"; \
fi; \
if [ -n "$elfsharedlist" ]; then \
- printf "Stripping %d ELF shared libraries..." $(echo
"$elfsharedlist" | wc -l); \
+ printf "Stripping %d ELF shared libraries..." $(echo -n
"$elfsharedlist" | wc -l); \
chmod u+w $elfsharedlist; \
%{__strip} --strip-unneeded --remove-section=.note
--remove-section=.comment $elfsharedlist; \
echo "DONE"; \
fi; \
if [ -n "$archiveslist" ]; then \
- printf "Stripping %d ar archives..." $(echo
"$archiveslist" | wc -l); \
+ printf "Stripping %d ar archives..." $(echo -n
"$archiveslist" | wc -l); \
chmod u+w $archiveslist; \
%{__strip} --strip-debug --remove-section=.note
--remove-section=.comment $archiveslist; \
echo "DONE"; \
@@ -388,19 +388,19 @@
filelist_unneeded=%{?_autostripunneeded:`find $RPM_BUILD_ROOT -type f
-regex "%{_autostripunneeded}"`}; \
filelist_debug=%{?_autostripdebug:`find $RPM_BUILD_ROOT -type f -regex
"%{_autostripdebug}"`}; \
if [ -n "$filelist_all" ]; then \
- printf "Stripping everything from %d additional files..."
$(echo "$filelist_all" | wc -l); \
+ printf "Stripping everything from %d additional files..."
$(echo -n "$filelist_all" | wc -l); \
chmod u+w $filelist_all; \
%{__strip} --remove-section=.note --remove-section=.comment
$filelist_all; \
echo "DONE"; \
fi; \
if [ -n "$filelist_unneeded" ]; then \
- printf "Stripping unneeded from %d additional files..." $(echo
"$filelist_unneeded" | wc -l); \
+ printf "Stripping unneeded from %d additional files..." $(echo
-n "$filelist_unneeded" | wc -l); \
chmod u+w $filelist_unneeded; \
%{__strip} --strip-unneeded --remove-section=.note
--remove-section=.comment $filelist_unneeded; \
echo "DONE"; \
fi; \
if [ -n "$filelist_debug" ]; then \
- printf "Stripping debuginfo from %d additional files..." $(echo
"$filelist_debug" | wc -l); \
+ printf "Stripping debuginfo from %d additional files..." $(echo
-n "$filelist_debug" | wc -l); \
chmod u+w $filelist_debug; \
%{__strip} --strip-debug --remove-section=.note
--remove-section=.comment $filelist_debug; \
echo "DONE"; \
@@ -425,7 +425,7 @@
fi
#"
if [ -n "$objs" ]; then \
- printf "Remove RPATH from %d executable binaries and shared
object files.\n" $(echo "$objs" | wc -l); \
+ printf "Remove RPATH from %d executable binaries and shared
object files.\n" $(echo -n "$objs" | wc -l); \
echo "$objs" | \
while read file; do \
rpath= ; \
@@ -460,7 +460,7 @@
echo "Compress kernel modules"; \
q=$(find $RPM_BUILD_ROOT/lib/modules -name '*o' -type f
-print); \
echo "$q" | xargs -r %{__gzip} -9nf; \
- printf "%d modules compressed\n" $(echo "$q" | wc -l); \
+ printf "%d modules compressed\n" $(echo -n "$q" | wc -l); \
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.417&r2=1.418&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
