diff options
| author | Alexandre Oliva <lxoliva@fsfla.org> | 2008-05-18 23:48:18 +0000 |
|---|---|---|
| committer | Alexandre Oliva <lxoliva@fsfla.org> | 2008-05-18 23:48:18 +0000 |
| commit | 8c0451e7a460c2b97446f957488b4a114bf0d755 (patch) | |
| tree | d7cf6544f9e3f941c1c70b85533cd66bdd98a29e /scripts/deblob-main | |
| parent | 85d3a78606d7d5548b60ba8a0bf7dd3c4a30b310 (diff) | |
| download | linux-libre-raptor-8c0451e7a460c2b97446f957488b4a114bf0d755.tar.gz linux-libre-raptor-8c0451e7a460c2b97446f957488b4a114bf0d755.zip | |
Fix removal of modified files from tarball. Handle top-level files. Add deblob* scripts to the tarball. Compress the xdelta.
Diffstat (limited to 'scripts/deblob-main')
| -rwxr-xr-x | scripts/deblob-main | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/scripts/deblob-main b/scripts/deblob-main index 3d8d5f519..12e5374e1 100755 --- a/scripts/deblob-main +++ b/scripts/deblob-main @@ -163,14 +163,16 @@ echo Deblobbing within linux-$kver-$libre (cd linux-$kver-$libre && /bin/sh ../$deblob) rm -f linux-$kver-$libre.patch +cp $0 $deblob deblob-check linux-$kver-$libre + echo Generating 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 " - s,^Only in \(linux-$kver/.*\): \(.*\),\1/\2,p; - s,^Files \(linux-$kver/.*\) and libre-\1 differ,\1,p; + s,^Only in \(linux-$kver/\?.*\): \(.*\),\1/\2,p; + s,^Files \(linux-$kver\)/\(.*\) and \1-$libre/\2 differ,\1/\2,p; " | xargs tar --delete -f linux-$kver-$libre.tar @@ -181,7 +183,7 @@ 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,^Only in \(linux-$kver/?.*\): \(.*\),\1/\2,p; " | xargs tar --append -f linux-$kver-$libre.tar @@ -191,9 +193,9 @@ 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 -echo Compressing linux-$kver-$libre.tar +echo Compressing linux-$kver-$libre.tar and linux-$kver-$libre.xdelta 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 @@ -201,6 +203,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.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 |
