projects
/
releases.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix comment, check for missing files. Back-port improvements from 2.6.2[56] to 2...
[releases.git]
/
deblob-main
diff --git
a/deblob-main
b/deblob-main
index 3d8d5f5192b01fa64cb7ff473659ec20e9ba5d35..ba716c2ef3277ada225371371dcd858209276870 100755
(executable)
--- a/
deblob-main
+++ b/
deblob-main
@@
-147,6
+147,8
@@
fi
trap "status=$?; echo cleaning up...; rm -rf orig-linux-$kver linux-$kver linux-$kver-$libre linux-$kver.tar linux-$kver-$libre.tar linux-$kver-$libre.tar.bz2 linux-$kver-$libre.patch linux-$kver-$libre.xdelta; (exit $status); exit" 0 1 2 15
trap "status=$?; echo cleaning up...; rm -rf orig-linux-$kver linux-$kver linux-$kver-$libre linux-$kver.tar linux-$kver-$libre.tar linux-$kver-$libre.tar.bz2 linux-$kver-$libre.patch linux-$kver-$libre.xdelta; (exit $status); exit" 0 1 2 15
+set -e
+
echo Uncompressing linux-$kver.tar.bz2 into linux-$kver.tar
rm -rf linux-$kver linux-$kver.tar
bunzip2 < linux-$kver.tar.bz2 > linux-$kver.tar
echo Uncompressing linux-$kver.tar.bz2 into linux-$kver.tar
rm -rf linux-$kver linux-$kver.tar
bunzip2 < linux-$kver.tar.bz2 > linux-$kver.tar
@@
-155,22
+157,25
@@
echo Extracing linux-$kver.tar into linux-$kver
tar -xf linux-$kver.tar
rm -rf linux-$kver-$libre linux-$kver-$libre.tar
tar -xf linux-$kver.tar
rm -rf linux-$kver-$libre linux-$kver-$libre.tar
-echo Copying linux-$kver to linux-$kver-$libre
.tar
+echo Copying linux-$kver to linux-$kver-$libre
cp linux-$kver.tar linux-$kver-$libre.tar
cp -lR linux-$kver/. linux-$kver-$libre
echo Deblobbing within linux-$kver-$libre
cp linux-$kver.tar linux-$kver-$libre.tar
cp -lR linux-$kver/. linux-$kver-$libre
echo Deblobbing within linux-$kver-$libre
-(cd linux-$kver-$libre && /bin/sh ../$deblob)
+(cd linux-$kver-$libre && /bin/sh ../$deblob)
|| exit 1
rm -f linux-$kver-$libre.patch
rm -f linux-$kver-$libre.patch
+# Do not copy these scripts for now, deblob-check regards itself as a blog.
+# cp -p $0 $deblob deblob-check linux-$kver-$libre
+
echo Generating linux-$kver-$libre.patch
echo Generating linux-$kver-$libre.patch
-diff -druN linux-$kver linux-$kver-$libre > linux-$kver-$libre.patch
+diff -druN linux-$kver linux-$kver-$libre > linux-$kver-$libre.patch
|| :
echo Removing removed or modified files from linux-$kver-$libre.tar
diff -rq linux-$kver linux-$kver-$libre |
sed -n "
echo Removing removed or modified files from linux-$kver-$libre.tar
diff -rq linux-$kver linux-$kver-$libre |
sed -n "
- s,^Only in \
(linux-$kver/.*\): \(.*\),\1/\2
,p;
- s,^Files \
(linux-$kver/.*\) and libre-\1 differ,\1
,p;
+ s,^Only in \
\(linux-$kver\\(/.*\\)\\?\\): \\(.*\\),\1/\3
,p;
+ s,^Files \
\(linux-$kver\\)/\\(.*\\) and \\1-$libre/\\2 differ,\\1/\\2
,p;
" |
xargs tar --delete -f linux-$kver-$libre.tar
" |
xargs tar --delete -f linux-$kver-$libre.tar
@@
-180,8
+185,8
@@
mv linux-$kver orig-linux-$kver
mv linux-$kver-$libre linux-$kver
diff -rq orig-linux-$kver linux-$kver |
sed -n "
mv linux-$kver-$libre linux-$kver
diff -rq orig-linux-$kver linux-$kver |
sed -n "
- s,^Files orig-\
(linux-$kver/.*\) and \1 differ,
\1,p;
- s,^Only in \
(linux-$kver/.*\): \(.*\),\1/\2
,p;
+ s,^Files orig-\
\(linux-$kver/.*\\) and \\1 differ,\
\1,p;
+ s,^Only in \
\(linux-$kver\\(/.*\\)\\?\\): \\(.*\\),\\1/\\3
,p;
" |
xargs tar --append -f linux-$kver-$libre.tar
" |
xargs tar --append -f linux-$kver-$libre.tar
@@
-189,11
+194,11
@@
echo Wiping out extracted trees
rm -rf linux-$kver orig-linux-$kver
echo Creating xdelta between linux-$kver.tar and linux-$kver-$libre.tar
rm -rf linux-$kver orig-linux-$kver
echo Creating xdelta between linux-$kver.tar and linux-$kver-$libre.tar
-xdelta delta -0 linux-$kver.tar linux-$kver-$libre.tar linux-$kver-$libre.xdelta
+xdelta delta -0 linux-$kver.tar linux-$kver-$libre.tar linux-$kver-$libre.xdelta
|| :
-echo Compressing linux-$kver-$libre.tar
+echo Compressing linux-$kver-$libre.tar
and linux-$kver-$libre.xdelta
rm -f linux-$kver.tar
rm -f linux-$kver.tar
-bzip2 -9 linux-$kver-$libre.tar
+bzip2 -9 linux-$kver-$libre.tar
linux-$kver-$libre.xdelta
trap "status=$?; (exit $status); exit" 0 1 2 15
trap "status=$?; (exit $status); exit" 0 1 2 15
@@
-201,6
+206,9
@@
echo Done except for signing, feel free to interrupt
gpg -a --detach-sign linux-$kver-$libre.tar.bz2
mv linux-$kver-$libre.tar.bz2.asc linux-$kver-$libre.tar.bz2.sign
gpg -a --detach-sign linux-$kver-$libre.tar.bz2
mv linux-$kver-$libre.tar.bz2.asc linux-$kver-$libre.tar.bz2.sign
+gpg -a --detach-sign linux-$kver-$libre.xdelta.bz2
+mv linux-$kver-$libre.xdelta.bz2.asc linux-$kver-$libre.xdelta.bz2.sign
+
echo All set, please review linux-$kver-$libre.patch
exit 0
echo All set, please review linux-$kver-$libre.patch
exit 0