From 949214468c5bc614a6c23431de96173175271b45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 5 Jul 2012 01:44:28 -0300 Subject: linux-libre-aufs_friendly-3.3.4-1.1: updating revision --- kernels/linux-libre-aufs_friendly/PKGBUILD | 17 +++++++++++++---- .../linux-libre-aufs_friendly.install | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) (limited to 'kernels/linux-libre-aufs_friendly') diff --git a/kernels/linux-libre-aufs_friendly/PKGBUILD b/kernels/linux-libre-aufs_friendly/PKGBUILD index 8c82d07cd..ded457dc7 100644 --- a/kernels/linux-libre-aufs_friendly/PKGBUILD +++ b/kernels/linux-libre-aufs_friendly/PKGBUILD @@ -16,7 +16,7 @@ _basekernel=3.3 _sublevel=4 pkgver=${_basekernel}.${_sublevel} _lxopkgver=${_basekernel}.4 # nearly always the same as pkgver -pkgrel=1 +pkgrel=1.1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -119,6 +119,9 @@ 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 @@ -216,6 +219,12 @@ package_linux-libre-aufs_friendly() { # add real version for building modules and running depmod from post_install/upgrade mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}" echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}/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-libre-aufs_friendly-headers() { @@ -233,10 +242,10 @@ package_linux-libre-aufs_friendly-headers() { _kernver="$(make kernelrelease)" fi - mkdir -p "${pkgdir}/lib/modules/${_kernver}" + install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}" - cd "${pkgdir}/lib/modules/${_kernver}" - ln -sf ../../../usr/src/linux-${_kernver} build + cd "${pkgdir}/usr/lib/modules/${_kernver}" + ln -sf ../../../src/linux-${_kernver} build cd "${srcdir}/linux-${_basekernel}" install -D -m644 Makefile \ diff --git a/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install b/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install index 2553613f7..ba8593dbf 100644 --- a/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install +++ b/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-aufs_friendly -KERNEL_VERSION=3.3.4-1-LIBRE-AUFS_FRIENDLY +KERNEL_VERSION=3.3.4-1.1-LIBRE-AUFS_FRIENDLY post_install () { # updating module dependencies -- cgit v1.2.3-2-g168b From 3054fbb604a509732c759c1daa192a786a0387e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 5 Jul 2012 01:47:27 -0300 Subject: linux-libre-aufs_friendly-3.3.4-1.1: changing maintainers emails --- kernels/linux-libre-aufs_friendly/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kernels/linux-libre-aufs_friendly') diff --git a/kernels/linux-libre-aufs_friendly/PKGBUILD b/kernels/linux-libre-aufs_friendly/PKGBUILD index ded457dc7..f70902b48 100644 --- a/kernels/linux-libre-aufs_friendly/PKGBUILD +++ b/kernels/linux-libre-aufs_friendly/PKGBUILD @@ -4,9 +4,9 @@ # Maintainer: Calimero # Maintainer (Parabola): Nicolás Reynolds # Maintainer (Parabola): Sorin-Mihai Vârgolici -# Maintainer (Parabola): André Silva +# Maintainer (Parabola): André Silva # Maintainer (Parabola): Michał Masłowski -# Contributor (Parabola): Márcio Silva +# Contributor (Parabola): Márcio Silva pkgbase=linux-libre-aufs_friendly pkgname=('linux-libre-aufs_friendly' 'linux-libre-aufs_friendly-headers') # Build stock -LIBRE kernel with AUFS-libre support -- cgit v1.2.3-2-g168b From ec507b67e803b61357f042eaa524dfb51dd2dec6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Fri, 6 Jul 2012 18:51:28 -0300 Subject: linux-libre-aufs_friendly-3.3.4-1.1: fixing some parts --- kernels/linux-libre-aufs_friendly/PKGBUILD | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'kernels/linux-libre-aufs_friendly') diff --git a/kernels/linux-libre-aufs_friendly/PKGBUILD b/kernels/linux-libre-aufs_friendly/PKGBUILD index f70902b48..7713d3dc0 100644 --- a/kernels/linux-libre-aufs_friendly/PKGBUILD +++ b/kernels/linux-libre-aufs_friendly/PKGBUILD @@ -6,7 +6,7 @@ # Maintainer (Parabola): Sorin-Mihai Vârgolici # Maintainer (Parabola): André Silva # Maintainer (Parabola): Michał Masłowski -# Contributor (Parabola): Márcio Silva +# Maintainer (Parabola): Márcio Silva pkgbase=linux-libre-aufs_friendly pkgname=('linux-libre-aufs_friendly' 'linux-libre-aufs_friendly-headers') # Build stock -LIBRE kernel with AUFS-libre support @@ -67,6 +67,9 @@ build() { # Add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" + # add latest fixes from stable queue, if needed + # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git + # 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 @@ -76,7 +79,6 @@ build() { # needed. patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch" - # Patch submitted upstream, waiting for inclusion: # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) @@ -157,7 +159,7 @@ build() { package_linux-libre-aufs_friendly() { pkgdesc="The Linux-libre Kernel and modules, with symbols exported for AUFS3-libre" - depends=('coreutils' 'module-init-tools>=3.16') + depends=('coreutils' 'kmod') optdepends=('crda: to set the correct wireless channels of your country') provides=('kernel26-aufs_friendly' "linux-aufs_friendly=$pkgver") conflicts=('kernel26-aufs_friendly' 'kernel26-libre-aufs_friendly' 'linux-aufs_friendly') @@ -370,7 +372,7 @@ package_linux-libre-aufs_friendly-headers() { done # remove unneeded architectures - rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa} + rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} if [ "$CARCH" = "mips64el" ]; then rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/x86 else -- cgit v1.2.3-2-g168b From af48d58219555da1d03f73fff4dbd37b7b4a6eb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Fri, 6 Jul 2012 20:28:04 -0300 Subject: linux-libre-aufs_friendly-3.3.4-1.1: updating some parts on PKGBUILD file --- kernels/linux-libre-aufs_friendly/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'kernels/linux-libre-aufs_friendly') diff --git a/kernels/linux-libre-aufs_friendly/PKGBUILD b/kernels/linux-libre-aufs_friendly/PKGBUILD index 7713d3dc0..f02fe9a0b 100644 --- a/kernels/linux-libre-aufs_friendly/PKGBUILD +++ b/kernels/linux-libre-aufs_friendly/PKGBUILD @@ -93,7 +93,7 @@ build() { patch -p1 -i "${srcdir}/aufs3-libre-standalone.patch" if [ "$CARCH" == "mips64el" ]; then - sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile + sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-aufs_friendly|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ < "${srcdir}/lxo-config.patch" > lxo-config.patch msg2 "Adding loongson-community patches" @@ -217,10 +217,10 @@ package_linux-libre-aufs_friendly() { # gzip -9 all modules to save 100MB of space find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; # make room for external modules - ln -s "../extramodules-${_basekernel}${_kernelname:--LIBRE}" "${pkgdir}/lib/modules/${_kernver}/extramodules" + ln -s "../extramodules-${_basekernel}${_kernelname:--LIBRE-AUFS_FRIENDLY}" "${pkgdir}/lib/modules/${_kernver}/extramodules" # add real version for building modules and running depmod from post_install/upgrade - mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}" - echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}/version" + mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-AUFS_FRIENDLY}" + echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-AUFS_FRIENDLY}/version" # move module tree /lib -> /usr/lib mv "$pkgdir/lib" "$pkgdir/usr" -- cgit v1.2.3-2-g168b