Commits

Christos Nouskas  committed 3e7a4d2

3.6.12-1
Add option to keep patchlevel in kernver

  • Participants
  • Parent commits d3bc8ee

Comments (0)

Files changed (1)

 _basekernel=${_major}.${_minor}
 _srcname=linux-${_major}.${_minor}
 pkgbase=linux-pf
-_pfrel=11
+_pfrel=12
 _kernelname=-pf
 _pfpatchhome="http://pf.natalenko.name/sources/${_basekernel}/"
 _pfpatchname="patch-${_basekernel}.${_pfrel}${_kernelname}"
 	'logo_linux_clut224.ppm.bz2'		#
 	'logo_linux_mono.pbm.bz2'		# the Arch Linux boot logos
 	'logo_linux_vga16.ppm.bz2'		#
-	"interactive-governor.tar.gz::https://gist.github.com/gists/1172524/download"
 	'change-default-console-loglevel.patch'
 	'http://www.linuxforge.net/linux/kernel/kernel-33-gcc47-0.patch'
 	"${_pfpatchhome}${_pfpatchname}.bz2")	# the -pf patchset
   echo "    <X> make xconfig (needs qt)"
   echo "    <O> make oldconfig"
   echo "    <L> make localyesconfig"
-  echo "    <ENTER> to skip configuration and start compiling"
+  echo "    <ENTER> to skip configuration and use stock -ARCH defaults"
   read answer
   case "$answer" in
    m) make menuconfig
     echo
     msg "Hit <G>     :  to create a generic package named linux-pf"
     msg "Hit <ENTER> :  to create a package named after the selected CPU"
-    echo "                   (linux-pf-$lcpu - recommended)"
+    echo "                   (linux-pf-${lcpu} - recommended default)"
     echo
     msg "This option affects ONLY the package name. Whether or not the"
     msg "kernel is optimized was determined at the previous config step."
     if [[ "$answer" != "g" ]]; then
        export _PKGOPT=y
     fi
+    msg "Hit <P>     :  to include the patchlevel number in kernver"
+    if [[ ${_PKGOPT} != "y" ]]; then
+       msg "               (i.e. linux-pf-${_basekernel}.${_pfrel})"
+    else
+       msg "               (i.e. linux-pf-${lcpu}-${_basekernel}.${_pfrel})"
+    fi
+    msg "Hit <ENTER> :  to remove  the patchlevel number from kernver (default)"
+    if [[ ${_PKGOPT} != "y" ]]; then
+       msg "               (i.e. linux-pf-${_basekernel})"
+    else
+       msg "               (i.e. linux-pf-${lcpu}-${_basekernel})"
+    fi
+    read answer
+    shopt -s nocasematch
+    if [[ "$answer" = "p" || "$answer" = "s" ]]; then
+       export _SUBLEVEL=y
+    fi
   fi
 fi	# batch check ends here
 export CPU
   # Remove the sublevel from Makefile
   # This ensures our kernel version is always 3.X-pf
   # This way, minor kernel updates will not break external modules
-  sed -ri 's|^(SUBLEVEL =).*|\1|' Makefile
+  if [ "${_SUBLEVEL}" != "y" ]; then
+     sed -ri 's|^(SUBLEVEL =).*|\1|' Makefile
+  fi
 
   # Don't run depmod on 'make install'. We'll do this ourselves in packaging
   sed -i '2iexit 0' scripts/depmod.sh
 pkgdesc="Linux kernel and modules with the pf-kernel patch [-ck patchset (BFS included), TuxOnIce, BFQ] and aufs3"
 
 # makepkg -g >>PKGBUILD
+
 sha256sums=('4ab9a6ef1c1735713f9f659d67f92efa7c1dfbffb2a2ad544005b30f9791784f'
             '991b88a87b39e32d99f7b66e4274628ef01f2c8298066d42f813a95441557144'
             'edf142d38c13ebdd810cb39e4785591a3e59e3642f8d48318bbdace0f2975daf'
             '03ed4eb4a35d42ae6beaaa5e6fdbada4244ed6c343944bba6462defaa6fed0bf'
             '51ea665cfec42d9f9c7796af2b060b7edbdeb367e42811f8c02667ad729f6b19'
             '9e1e81d80afac6f316e53947e1b081017090081cd30e6c4c473420b77af4b52b'
-            'd537a358c9f8b9cbcad34ba99f88af070f54d99c66d3e5d3d4734576ed2fb6e1'
             'b9d79ca33b0b51ff4f6976b7cd6dbb0b624ebf4fbf440222217f8ffc50445de4'
             '8f2dad5b89dac8c76c3dd3ad902928d6032ec2c6ada41d873d752bad5586b154'
-            '14cbce82b2da7571112a4804b11d83ae27fe31c41f8914d6347284830786e029')
+            '7f6faacebc171cba80aaeb2e040501df32ca06afcea85e90a64a976bfe9d5dbf')