Commits

Christos Nouskas committed 2514554

3.2-3
Also, new README for maintainers.

Comments (0)

Files changed (4)

 pkgname=('linux-pf')
 true && pkgname=('linux-pf' 'linux-pf-headers')
 pkgver=${_basekernel}.${_pfrel}
-pkgrel=1
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://pf.natalenko.name/"
 license=('GPL2')
 	channel-negative-one-maxim.patch	# hopefully fix "channel -1" aireplay-ng error
 	interactive-governor.tar.gz::https://gist.github.com/gists/1172524/download
 	change-default-console-loglevel.patch
+	i915-gpu-finish.patch
 	i915-fix-ghost-tv-output.patch
-#	i915-fix-incorrect-error-message.patch
 	usb-add-reset-resume-quirk-for-several-webcams.patch
 	${_pfpatchhome}${_pfpatchname})	# the -pf patchset
 
   # add latest fixes from stable queue, if needed
   # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
 
+  # fix FS#27883
+  # drm/i915: Only clear the GPU domains upon a successful finish
+  patch -Np1 -i "${srcdir}/i915-gpu-finish.patch"
+
   # Some chips detect a ghost TV output
   # mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html
   # Arch Linux bug report: FS#19234
   # needed.
   patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch"
 
-  # In 3.1.1, a DRM_DEBUG message is falsely declared as DRM_ERROR. This
-  # worries users, as this message is displayed even at loglevel 4. Fix
-  # this.
-#  patch -Np1 -i "${srcdir}/i915-fix-incorrect-error-message.patch"
-
   # Add the USB_QUIRK_RESET_RESUME for several webcams
   # FS#26528
   patch -Np1 -i "${srcdir}/usb-add-reset-resume-quirk-for-several-webcams.patch"
   # remove this when a Kconfig knob is made available by upstream
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
- 
+
    msg "Patching for restless souls"
    patch -Np1 < ${srcdir}/channel-negative-one-maxim.patch
 
   echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--pf}/version"
 
   ###
-  # Our own line
+  # Trick the AUR parser to accept split PKGBUILD
   true && pkgname="${pkgnameopt}"
 }
 
 
 # makepkg -g >>PKGBUILD
 sha256sums=('dd96ed02b53fb5d57762e4b1f573460909de472ca588f81ec6660e4a172e7ba7'
-            '0acec6193282ddaeb28838db3ef4dc93d724314cd27c3e0edd23973ae2be326e'
-            '1400697849b8c10953d7e9fed3efdb150f9f5f590447e3bb64ef7b6688aa27d6'
+            'ca7da9043beba0c982fed388107fc1250dadccc376cce9f512d8c74cb1309f7d'
+            'f48a4f07f03b00af4cf0399771fecebc9ea9587996da809cbf9916e1484e9295'
             '82d660caa11db0cd34fd550a049d7296b4a9dcd28f2a50c81418066d6e598864'
             '03ed4eb4a35d42ae6beaaa5e6fdbada4244ed6c343944bba6462defaa6fed0bf'
             '51ea665cfec42d9f9c7796af2b060b7edbdeb367e42811f8c02667ad729f6b19'
             '19f7fc0753636c32026e444e23bd101bd21cfeb59661284678bf157dc35212f2'
             'd537a358c9f8b9cbcad34ba99f88af070f54d99c66d3e5d3d4734576ed2fb6e1'
             '2fc60ad91d7afe5b1e7c7a0cac7555a2dddf2b9fc1f7a044e211904991e10e83'
+            'f0ab8d5f2c1ab29b5bcc1d7be251f36796489bae2f6486fac49595fa4c895770'
             '4bc5a3fc40bf60bd4b362b519219cae56141a9f209bd2cf6bed25c1bd434e2cc'
             '549a33278c17af6aa9ca5d3cf2abe3a0b1010d7c66e53d2a357a38ace25f8ea1'
             '847981649407470de69dc989e8a1a5b44eae75c5403d46e863ce6bacd47c25fb')

README.maintainers

+How-to maintain this PKGBUILD
+
+* On minor bumps only, i.e. 3.1.x --> 3.2: Check the stock -ARCH kernel package
+  (http://projects.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/linux):
+  1) Copy both config and config.x86_64 into our package to ensure mimimum
+     deviation from the main distro kernel.
+  2) Copy any new *.patch files. Remove (if any) not longer in mainline.
+  3) Make sure the respective patch commands are added/removed from the PKGBUILD.
+  4) Compare the package_linux() and package_linux-pf() sections, especially from
+     'KARCH=x86' and below. They should be almost identical, with -ARCH replaced
+     by -pf.
+  5) Compare the package_linux-headers() with package_linux-headers-pf() sections.
+     They should be identical, except for the provides/conflicts/replaces.
+  6) Run makepkg. All patches should apply cleanly, otherwise resolve. When asked,
+     configure the kernel. What needs to be changed is:
+
+     a) General Setup  --->  Kernel compression mode (LZMA)
+     b) -*- Enable the block layer  ---> IO Schedulers  --->
+	<M> Deadline I/O scheduler
+	<M> CFQ I/O scheduler
+	[*]   CFQ Group Scheduling
+	<*> BFQ I/O scheduler
+	[*]   BFQ hierarchical scheduling support
+	Default I/O scheduler (BFQ)
+     c) Processor type and features  --->  Timer frequency (1000 HZ)
+     d) Power management and ACPI options  ---> <*> Enhanced Hibernation (TuxOnIce)  --->
+	<M>   File Allocator
+	<M>   Swap Allocator
+	<M>   Compression support
+	<M>   Userspace User Interface support
+	(/usr/sbin/tuxoniceui) Default userui program location
+	[*]   Replace swsusp by default
+	(7000) Default extra pages allowance
+    e) File systems  --->  -*- Miscellaneous filesystems  --->
+       <M>   Aufs (Advanced multi layered unification filesystem) support
+       Select ([*]) everything, except 'Debug aufs'
+
+  7. Exit config and save. Break with CTRL-C at the next step. A file named config.local
+     is created, which is the new config for this version. Copy it over config.x86_64 or
+     config, depending on the arch you currently are. Do this for BOTH i686 and x86_64.
+  8. Change the $_minor and $_pfrel numbers to the new ones. Reset $pkgrel to 1.
+  9. Delete the sha256sums lines at the end of PKGBUILD. Run 'makepkg -g >>PKGBUILD'.
+ 10. Test on both i686 and x86_64. If all is well, commit and push to the repo.
+
+* On patchlevel bumps, things are simpler. Just update the $_pfrel number and reset $pkgrel
+  to 1. Then go through steps 9-10 of the previous section.
+
+* The $pkgrel variable should only change if:
+  1. Current PKGBUILD breaks compilation
+  2. A change to config is made that results into a different binary package.
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2-pf Kernel Configuration
+# Linux/i386 3.2.1-pf Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
 CONFIG_HIBERNATE_CALLBACKS=y
 CONFIG_HIBERNATION=y
 CONFIG_PM_STD_PARTITION=""
-CONFIG_TOI_CORE=m
+CONFIG_TOI_CORE=y
 
 #
 # Image Storage (you need at least one allocator)
 CONFIG_TOI_DEFAULT_EXTRA_PAGES_ALLOWANCE=7000
 # CONFIG_TOI_CHECKSUM is not set
 CONFIG_TOI=y
-CONFIG_TOI_EXPORTS=y
 CONFIG_TOI_ZRAM_SUPPORT=y
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_HIBERNATE_CALLBACKS=y
 CONFIG_HIBERNATION=y
 CONFIG_PM_STD_PARTITION=""
-CONFIG_TOI_CORE=m
+CONFIG_TOI_CORE=y
 
 #
 # Image Storage (you need at least one allocator)