diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-12-02 20:30:20 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-12-02 20:30:20 +0100 |
| commit | 536a66c180f3c645134fd451423ac99a2bb278ab (patch) | |
| tree | 7dee62a037d6f6d3c6f3e873ae91873bfcbbb5b3 /scripts/combine.sh | |
| parent | 7f2a5096bbb32210509209ee3189a091729c71ee (diff) | |
| parent | aa92e83bbbe79026d32233778371a7fb1ed6c5d1 (diff) | |
| download | kernel-536a66c180f3c645134fd451423ac99a2bb278ab.tar.gz kernel-536a66c180f3c645134fd451423ac99a2bb278ab.tar.xz kernel-536a66c180f3c645134fd451423ac99a2bb278ab.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.5.0-0.rc0.git3.1.vanilla.knurd.1.fc32kernel-5.5.0-0.rc0.git3.1.vanilla.knurd.1.fc31kernel-5.5.0-0.rc0.git3.1.vanilla.knurd.1.fc30kernel-5.5.0-0.rc0.git3.1.vanilla.knurd.1.fc29
Diffstat (limited to 'scripts/combine.sh')
| -rwxr-xr-x | scripts/combine.sh | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/scripts/combine.sh b/scripts/combine.sh deleted file mode 100755 index 86a68d302..000000000 --- a/scripts/combine.sh +++ /dev/null @@ -1,34 +0,0 @@ -#! /bin/sh - -# combine a set of quilt patches - -# $1 : base dir (source tree) -# $2 : quilt dir (patches to apply) -# $3 : pre-patch to apply first (optional) - -# e.g.: -# combine.sh /home/user/fedora/trunk/kernel/F-11/kernel-2.6.30/vanilla-2.6.30 \ -# /home/user/git/stable-queue/queue-2.6.30 \ -# /home/user/fedora/trunk/kernel/F-11/patch-2.6.30.5.bz2 - -if [ $# -lt 2 ] ; then - exit 1 -fi - -TD="combine_temp.d" - -cd $1 || exit 1 -cd .. -[ -d $TD ] && rm -Rf $TD -mkdir $TD || exit 1 -cd $TD - -cp -al ../$(basename $1) work.d -cd work.d -[ "$3" ] && bzcat $3 | patch -p1 -s -ln -s $2 patches -[ -h patches ] || exit 1 -quilt snapshot -quilt upgrade -quilt push -a -q -quilt diff --snapshot >../combined.patch |