raspberry pi kernel and firmware -next update

alarm/raspberrypi-firmware-next/PKGBUILD

@@ -1,8 +1,8 @@
 buildarch=16
 
 pkgname=raspberrypi-firmware-next
-pkgver=20121127
+pkgver=20121128
-pkgrel=1
+pkgrel=3
 pkgdesc="Firmware files for Raspberry Pi"
 arch=('any')
 url="https://github.com/raspberrypi/firmware"
@@ -12,32 +12,23 @@ options=(!strip)
 install=${pkgname}.install
 _gitroot=git://github.com/raspberrypi/firmware.git
 _gitname=firmware
-source=('https://github.com/raspberrypi/firmware/archive/next.zip')
-md5sums=('6e39d086accc4ceddeb687800e9f42dd')
 provides=('raspberrypi-firmware')
 conflicts=('raspberrypi-firmware')
+install=${pkgname}.install
 build() {
-#  msg "Connecting to GIT server...."
+  msg "Connecting to GIT server...."
+  git clone --depth 1 -b next "$_gitroot"
 
-#  if [[ -d "$_gitname" ]]; then
+  rm -f "${srcdir}"/firmware/boot/kernel.img
-#    cd "$_gitname" && git pull origin
-#    msg "The local files are updated."
-#  else
-#    git clone --depth 1 "$_gitroot" "$_gitname"
-#  fi
-#
-#  msg "GIT checkout done or server timeout"
-
-  rm -f "${srcdir}"/firmware-next/boot/kernel.img
 }
 
 package() {
-  cp -R "${srcdir}"/firmware-next/boot "${pkgdir}"/boot
+  cp -R "${srcdir}"/firmware/boot "${pkgdir}"/boot
   mkdir -p "${pkgdir}"/opt/vc
 
   if [[ $CARCH == "arm" ]]; then
-    cp -R "${srcdir}"/firmware-next/opt/vc/{bin,include,lib,sbin,LICENCE} "${pkgdir}"/opt/vc
+    cp -R "${srcdir}"/firmware/opt/vc/{bin,include,lib,sbin,LICENCE} "${pkgdir}"/opt/vc
   elif [[ $CARCH == "armv6h" ]]; then
-    cp -R "${srcdir}"/firmware-next/hardfp/opt/vc/{bin,include,lib,sbin,LICENCE} "${pkgdir}"/opt/vc
+    cp -R "${srcdir}"/firmware/hardfp/opt/vc/{bin,include,lib,sbin,LICENCE} "${pkgdir}"/opt/vc
   fi
 }

core/linux-raspberrypi-next/PKGBUILD

@@ -9,7 +9,7 @@ pkgname=('linux-raspberrypi-next' 'linux-headers-raspberrypi-next')
 _kernelname=${pkgname#linux}
 _basekernel=3.6
 pkgver=${_basekernel}.7
-pkgrel=2
+pkgrel=3
 arch=('arm armv6h')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -21,18 +21,19 @@ source=('config'
         'args-uncompressed.txt'
         'boot-uncompressed.txt'
         'imagetool-uncompressed.py'
-        'https://github.com/raspberrypi/linux/archive/rpi-3.6.y.zip')
+)
 
-md5sums=('059cc95b6df9f4dd0a39ecfadf808c21'
+md5sums=('9d0decd3cbd2e515944bd103d60c19f3'
          '9d3c56a4b999c8bfbd4018089a62f662'
          'd00814b57448895e65fbbc800e8a58ba'
          '9335d1263fd426215db69841a380ea26'
          'a00e424e2fbb8c5a5f77ba2c4871bed4'
-         '2f82dbe5752af65ff409d737caf11954'
+         '2f82dbe5752af65ff409d737caf11954')
-         'a222e270d8225101244ed513fd29464f')
 
 build() {
-  cd "${srcdir}/linux-rpi-3.6.y"
+
+  git clone --depth 1 -b rpi-3.6.y git://github.com/raspberrypi/linux.git
+  cd "${srcdir}/linux"
 
   # add upstream patch
   #patch -p1 -i "${srcdir}/patch-${pkgver}"
@@ -52,7 +53,8 @@ build() {
   cp ${srcdir}/boot-uncompressed.txt arch/arm/boot/
   cp ${srcdir}/imagetool-uncompressed.py arch/arm/boot/
 
-  cat "${srcdir}/config" > ./.config
+  make bcmrpi_defconfig
+  sed -ri "s|^(CONFIG_LOCALVERSION=\").*|\1\-ARCH\"|" .config
 
   # set extraversion to pkgrel
   sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
@@ -95,7 +97,7 @@ package_linux-raspberrypi-next() {
   conflicts=('kernel26' 'linux')
   install=${pkgname}.install
 
-  cd "${srcdir}/linux-rpi-3.6.y"
+  cd "${srcdir}/linux"
 
   KARCH=arm
 
@@ -106,7 +108,7 @@ package_linux-raspberrypi-next() {
   make INSTALL_MOD_PATH="${pkgdir}" modules_install
   cd arch/$KARCH/boot/
   /usr/bin/python2 imagetool-uncompressed.py
-  cd "${srcdir}/linux-rpi-3.6.y"
+  cd "${srcdir}/linux"
   cp arch/$KARCH/boot/kernel.img ${pkgdir}/boot/kernel.img
   #cp arch/$KARCH/boot/uImage "${pkgdir}/boot/uImage"
 
@@ -146,7 +148,7 @@ package_linux-headers-raspberrypi-next() {
   cd "${pkgdir}/usr/lib/modules/${_kernver}"
   ln -sf ../../../src/linux-${_kernver} build
 
-  cd "${srcdir}/linux-rpi-3.6.y"
+  cd "${srcdir}/linux"
   install -D -m644 Makefile \
     "${pkgdir}/usr/src/linux-${_kernver}/Makefile"
   install -D -m644 kernel/Makefile \

core/linux-raspberrypi-next/linux-raspberrypi-next.install

@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-raspberrypi-next
-KERNEL_VERSION=3.6.7-1-ARCH
+KERNEL_VERSION=3.6.7-3-ARCH+
 
 post_install () {
   # updating module dependencies
@@ -21,5 +21,4 @@ post_upgrade() {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
   depmod ${KERNEL_VERSION}
-  echo ">>>Edit /boot/cmdline.txt and add sdhci-bcm2708.cycle_delay=1000 "
 }