More Corrections- raspberry pi kernel and firmware for -next 3.6.x Linux

archlinuxarm · Nov 26, 2012 · 8f04e5a · 8f04e5a
1 parent 8f52d12
commit 8f04e5a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/alarm/raspberrypi-firmware-next/PKGBUILD b/alarm/raspberrypi-firmware-next/PKGBUILD
@@ -1,7 +1,7 @@
 buildarch=16
 
 pkgname=raspberrypi-firmware-next
-pkgver=20121126
+pkgver=20121127
 pkgrel=1
 pkgdesc="Firmware files for Raspberry Pi"
 arch=('any')
@@ -14,7 +14,7 @@ _gitroot=git://github.com/raspberrypi/firmware.git
 _gitname=firmware
 source=('https://github.com/raspberrypi/firmware/archive/next.zip')
 md5sums=('6e39d086accc4ceddeb687800e9f42dd')
-provides=('raspberrypi-firmware-next')
+provides=('raspberrypi-firmware')
 conflicts=('raspberrypi-firmware')
 build() {
 #  msg "Connecting to GIT server...."

diff --git a/alarm/raspberrypi-firmware/PKGBUILD b/alarm/raspberrypi-firmware/PKGBUILD
@@ -1,7 +1,7 @@
 buildarch=18
 
 pkgname=raspberrypi-firmware
-pkgver=20121126
+pkgver=20121127
 pkgrel=1
 pkgdesc="Firmware files for Raspberry Pi"
 arch=('any')
@@ -13,7 +13,7 @@ install=${pkgname}.install
 _gitroot=git://github.com/raspberrypi/firmware.git
 _gitname=firmware
 provides=('raspberrypi-firmware')
-conflicts=('raspberrypi-firmware-next')
+conflicts=('raspberrypi-firmware')
 build() {
   msg "Connecting to GIT server...."
 

diff --git a/core/linux-raspberrypi-next/PKGBUILD b/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=1
+pkgrel=2
 arch=('arm armv6h')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -91,9 +91,8 @@ package_linux-raspberrypi-next() {
   pkgdesc="The Linux Kernel and modules for Raspberry Pi"
   depends=('coreutils' 'linux-firmware' 'module-init-tools>=3.16')
   optdepends=('crda: to set the correct wireless channels of your country')
-  provides=('kernel26-raspberrypi' "linux=${pkgver}")
+  provides=('kernel26' "linux=${pkgver}")
   conflicts=('kernel26' 'linux')
-  replaces=('kernel26')
   install=${pkgname}.install
 
   cd "${srcdir}/linux-rpi-3.6.y"
@@ -141,7 +140,6 @@ package_linux-headers-raspberrypi-next() {
   pkgdesc="Header files and scripts for building modules for linux kernel for Raspberry Pi"
   provides=('kernel26-headers' "linux-headers=${pkgver}")
   conflicts=('kernel26-headers')
-  replaces=('kernel26-headers')
 
   install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
 

diff --git a/core/linux-raspberrypi/PKGBUILD b/core/linux-raspberrypi/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('linux-raspberrypi' 'linux-headers-raspberrypi')
 _kernelname=${pkgname#linux}
 _basekernel=3.2
 pkgver=${_basekernel}.27
-pkgrel=15
+pkgrel=16
 arch=('arm armv6h')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -84,9 +84,8 @@ package_linux-raspberrypi() {
   pkgdesc="The Linux Kernel and modules for Raspberry Pi"
   depends=('coreutils' 'linux-firmware' 'module-init-tools>=3.16')
   optdepends=('crda: to set the correct wireless channels of your country')
-  provides=('kernel26-raspberrypi' "linux=${pkgver}")
+  provides=('kernel26' "linux=${pkgver}")
   conflicts=('kernel26' 'linux')
-  replaces=('kernel26')
   install=${pkgname}.install
 
   cd "${srcdir}/linux"
@@ -134,7 +133,6 @@ package_linux-headers-raspberrypi() {
   pkgdesc="Header files and scripts for building modules for linux kernel for Raspberry Pi"
   provides=('kernel26-headers' "linux-headers=${pkgver}")
   conflicts=('kernel26-headers')
-  replaces=('kernel26-headers')
 
   install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"