diff options
| author | Jeremy Cline <jcline@redhat.com> | 2019-05-06 16:48:38 +0000 |
|---|---|---|
| committer | Jeremy Cline <jcline@redhat.com> | 2019-05-07 14:02:01 +0000 |
| commit | 6f9babcb28ce9b8ecfc1afb612361d26c9ec34a7 (patch) | |
| tree | b65513d62661f81b4ca9edbcc33abf0e15c88ab9 /scripts | |
| parent | 2d62e0d70f99987e98fedec648a10a286000eab0 (diff) | |
| download | kernel-6f9babcb28ce9b8ecfc1afb612361d26c9ec34a7.tar.gz kernel-6f9babcb28ce9b8ecfc1afb612361d26c9ec34a7.tar.xz kernel-6f9babcb28ce9b8ecfc1afb612361d26c9ec34a7.zip | |
Initial v5.1 rebase
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/check-configs.pl | 4 | ||||
| -rwxr-xr-x | scripts/create_headers_tarball.sh | 4 | ||||
| -rwxr-xr-x | scripts/generate-git-snapshot.sh | 2 | ||||
| -rwxr-xr-x | scripts/rawhide-rc.sh | 11 |
4 files changed, 12 insertions, 9 deletions
diff --git a/scripts/check-configs.pl b/scripts/check-configs.pl index 10282aa74..c74acf1d4 100644 --- a/scripts/check-configs.pl +++ b/scripts/check-configs.pl @@ -70,11 +70,11 @@ sub main { } } - foreach my $shipped (glob("config-*")) { + foreach my $shipped (glob("*.config")) { my (@tmp) = parse_shipped( $shipped ); foreach my $ref ( @tmp ) { say( STDERR "$shipped:$ref->[0]: No Kconfig symbol matches 'CONFIG_$ref->[1]'" ) - unless (grep( /$ref->[1]/, keys( %configs ))); + unless (grep( /^$ref->[1]$/, keys( %configs ))); } } diff --git a/scripts/create_headers_tarball.sh b/scripts/create_headers_tarball.sh index 575b2bb8e..5105f790c 100755 --- a/scripts/create_headers_tarball.sh +++ b/scripts/create_headers_tarball.sh @@ -7,6 +7,8 @@ # Author: Herton R. Krzesinski <herton@redhat.com> # Author: Justin M. Forbes <jforbes@redhat.com> +set -e + # Location of kernel-headers checkout CURRENTDIR=`pwd` PKGLOC='kernel-headers' @@ -17,7 +19,7 @@ if [ ! -f $PKGLOC/kernel-headers.spec ]; then fi # Kernel version information taken from kernel.spec and change to prepared sources directory -MAJORVER='4' +MAJORVER='5' RELEASED=`grep "%global released_kernel" kernel.spec| cut -d ' ' -f 3` BASERELEASE=`cat kernel.spec | grep "%global baserelease" | cut -d ' ' -f 3` BASE=`grep "%define base_sublevel" kernel.spec| cut -d ' ' -f 3` diff --git a/scripts/generate-git-snapshot.sh b/scripts/generate-git-snapshot.sh index 242200ef6..2ad6a5f06 100755 --- a/scripts/generate-git-snapshot.sh +++ b/scripts/generate-git-snapshot.sh @@ -20,7 +20,7 @@ VER=$(grep patch sources | head -n1 | awk '{ print $2 }' | sed s/patch-// | sed if [ -z "$VER" ] ; then - VER=$(grep linux sources | head -1 | awk '{ print $2 }' | sed s/linux-// | sed s/.tar.xz// | sed s/[\(\)]//g) + VER=$(grep linux sources | head -1 | awk '{ print $2 }' | sed s/linux-// | sed s/.tar.gz// | sed s/[\(\)]//g) fi OLDGIT=$(grep gitrev kernel.spec | head -n1 | sed s/%define\ gitrev\ //) diff --git a/scripts/rawhide-rc.sh b/scripts/rawhide-rc.sh index ba8b467b2..a4e15820a 100755 --- a/scripts/rawhide-rc.sh +++ b/scripts/rawhide-rc.sh @@ -22,19 +22,20 @@ BASE=`grep "%define base_sublevel" kernel.spec| cut -d ' ' -f 3` OLDBASE=$BASE # See comment in kernel.spec about the base numbering BASE=$(($BASE+1)) +MAJORVER=5 # Kill all patches awk '!/patch/ { print $0 }' < sources > sources.tmp mv sources.tmp sources # Grab the tarball -if [ ! -f patch-4.$BASE-rc$RC.xz ]; then - wget -O patch-4.$BASE-rc$RC https://git.kernel.org/torvalds/p/v4.$BASE-rc$RC/v4.$OLDBASE +if [ ! -f patch-$MAJORVER.$BASE-rc$RC.xz ]; then + wget -O patch-$MAJORVER.$BASE-rc$RC https://git.kernel.org/torvalds/p/v$MAJORVER.$BASE-rc$RC/v$MAJORVER.$OLDBASE if [ ! $? -eq 0 ]; then exit 1 fi - xz -9 patch-4.$BASE-rc$RC - fedpkg upload patch-4.$BASE-rc$RC.xz + xz -9 patch-$MAJORVER.$BASE-rc$RC + fedpkg upload patch-$MAJORVER.$BASE-rc$RC.xz fi # bump rcrev in the spec and set git snapshot to 0 @@ -44,6 +45,6 @@ perl -p -i -e 's|%define gitrev.*|%define gitrev 0|' kernel.spec perl -p -i -e 's|%global baserelease.*|%global baserelease 0|' kernel.spec -rpmdev-bumpspec -c "Linux v4.$BASE-rc$RC" kernel.spec +rpmdev-bumpspec -c "Linux v$MAJORVER.$BASE-rc$RC" kernel.spec echo "Don't forget to bump kernel-tools" |