From 68a9e5a1609fde10a2f31dac8df211f0c3874eb7 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich <kevin@archlinuxarm.org> Date: Mon, 16 Jul 2012 16:38:16 -0400 Subject: [PATCH] core/linux-omap to 3.4.4-1 --- core/linux-omap/PKGBUILD | 25 ++++++++----------------- core/linux-omap/config | 4 ++-- core/linux-omap/linux-omap.install | 2 +- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/core/linux-omap/PKGBUILD b/core/linux-omap/PKGBUILD index 28f171fa9..9a91a5292 100644 --- a/core/linux-omap/PKGBUILD +++ b/core/linux-omap/PKGBUILD @@ -11,7 +11,7 @@ pkgname=('linux-omap' 'linux-headers-omap') # pkgname=linux-custom # Build kernel with a different name _kernelname=${pkgname#linux} _basekernel=3.4 -pkgver=${_basekernel}.3 +pkgver=${_basekernel}.4 pkgrel=1 arch=('arm') url="http://www.kernel.org/" @@ -20,14 +20,14 @@ makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage') options=('!strip') source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.xz" "ftp://ftp.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.bz2" - "rcn-ee.diff.gz::http://rcn-ee.net/deb/sid-armhf/v3.4.3-x0/patch-3.4.3-x0.diff.gz" + "rcn-ee.diff.gz::http://rcn-ee.net/deb/sid-armhf/v3.4.4-x1/patch-3.4.4-x1.diff.gz" 'config' 'change-default-console-loglevel.patch' 'aufs3-3.4.patch.xz') md5sums=('967f72983655e2479f951195953e8480' - '5362b86a64c0c088852277a6ea5d1b2c' - '7828ee186d952defb047cf80f38fdedd' - '1f1e85739b303f4faff37e94b22bf1e1' + '51d5b74c3523c5dd8d0f4d1a7abb68be' + '37ba6fc85bd4e4fde310a2bf00f84b78' + '7dfd524e5b8ac2aee16648024ecc0b8c' '9d3c56a4b999c8bfbd4018089a62f662' '852ba24ebd20ca85f8bbee03243ccf91') @@ -53,9 +53,6 @@ build() { # set extraversion to pkgrel sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile - # don't run depmod on 'make install'. We'll do this ourselves in packaging - sed -i '2iexit 0' scripts/depmod.sh - # get kernel version make prepare @@ -122,12 +119,6 @@ package_linux-omap() { # add real version for building modules and running depmod from post_install/upgrade mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}-${_kernelname:-ARCH}" echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}-${_kernelname:-ARCH}/version" - - # move module tree /lib -> /usr/lib - mv "$pkgdir/lib" "$pkgdir/usr" - - # Now we call depmod... - depmod -b "$pkgdir" -F System.map "$_kernver" } package_linux-headers-omap() { @@ -136,10 +127,10 @@ package_linux-headers-omap() { conflicts=('kernel26-headers-omap' 'linux-headers-tegra') replaces=('kernel26-headers-omap') - install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}" + mkdir -p "${pkgdir}/lib/modules/${_kernver}" - cd "${pkgdir}/usr/lib/modules/${_kernver}" - ln -sf ../../../src/linux-${_kernver} build + cd "${pkgdir}/lib/modules/${_kernver}" + ln -sf ../../../usr/src/linux-${_kernver} build cd "${srcdir}/linux-${_basekernel}" install -D -m644 Makefile \ diff --git a/core/linux-omap/config b/core/linux-omap/config index fe2c84dd2..ebdff4e31 100644 --- a/core/linux-omap/config +++ b/core/linux-omap/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.4.1 Kernel Configuration +# Linux/arm 3.4.4 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -344,7 +344,7 @@ CONFIG_ARCH_OMAP2PLUS=y # CONFIG_OMAP_SMARTREFLEX=y CONFIG_OMAP_SMARTREFLEX_CLASS3=y -CONFIG_OMAP_RESET_CLOCKS=y +# CONFIG_OMAP_RESET_CLOCKS is not set CONFIG_OMAP_MUX=y CONFIG_OMAP_MUX_DEBUG=y CONFIG_OMAP_MUX_WARNINGS=y diff --git a/core/linux-omap/linux-omap.install b/core/linux-omap/linux-omap.install index 2a8b827fb..94e82b4a2 100644 --- a/core/linux-omap/linux-omap.install +++ b/core/linux-omap/linux-omap.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-omap -KERNEL_VERSION=3.4.3-1-ARCH +KERNEL_VERSION=3.4.4-1-ARCH post_install () { # updating module dependencies