summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre')
-rw-r--r--libre/linux-libre-api-headers/PKGBUILD18
-rw-r--r--libre/linux-libre-lts/PKGBUILD19
-rw-r--r--libre/linux-libre-lts/linux-libre-lts.install2
-rw-r--r--libre/linux-libre/PKGBUILD23
-rw-r--r--libre/linux-libre/linux-libre.install2
-rw-r--r--libre/lirc-libre/PKGBUILD12
-rw-r--r--libre/lirc-libre/lirc.install2
7 files changed, 45 insertions, 33 deletions
diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD
index f60e4c99f..c229767b1 100644
--- a/libre/linux-libre-api-headers/PKGBUILD
+++ b/libre/linux-libre-api-headers/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 161268 2012-06-08 11:32:36Z allan $
+# $Id: PKGBUILD 162855 2012-07-02 09:35:36Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
# toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc
pkgname=linux-libre-api-headers
-_basekernel=3.3
-_sublevel=8
+_basekernel=3.4
+_sublevel=4
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
pkgdesc="Kernel Libre headers sanitized for use in userspace"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnu.org/software/libc"
license=('GPL2')
-provides=("linux-api-headers=${pkgver}" "kernel-headers=${pkgver}")
-conflicts=('linux-api-headers' 'kernel-headers')
-replaces=('linux-api-headers' 'kernel-headers')
+provides=("linux-api-headers=${pkgver}")
+conflicts=('linux-api-headers')
+replaces=('linux-api-headers')
source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz")
-md5sums=('5487da14ca81715a469c7594d39722fa'
- 'd561c637365f1f0fca29aca39f7a3903')
+md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
+ 'e9bb311ab329555a61696b1a18df2d34')
build() {
cd ${srcdir}/linux-${_basekernel}
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 6c163e5f5..f4807a4d8 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
pkgbase=linux-libre-lts
pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE kernel
@@ -12,7 +12,7 @@ _basekernel=3.0
_sublevel=36
pkgver=${_basekernel}.${_sublevel}
_lxopkgver=${_basekernel}.36 # nearly always the same as pkgver
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -106,6 +106,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
@@ -203,6 +206,12 @@ package_linux-libre-lts() {
# add real version for building modules and running depmod from post_install/upgrade
mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-LTS}"
echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-LTS}/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-lts-headers() {
@@ -220,10 +229,10 @@ package_linux-libre-lts-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/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 4b6841658..8a688091d 100644
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.36-1-LIBRE-LTS
+KERNEL_VERSION=3.0.36-2-LIBRE-LTS
# set a sane PATH to ensure that critical utils like depmod will be found
export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index f4fa860e8..4f4e557ae 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -15,7 +15,7 @@ _basekernel=3.4
_sublevel=4
pkgver=${_basekernel}.${_sublevel}
_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -33,7 +33,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'change-default-console-loglevel.patch'
'i915-fix-ghost-tv-output.patch'
'3.4.4-fix-backlight-regression.patch'
- '3.4.4-fix-gtx560ti-nouveau-regression.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
'e9bb311ab329555a61696b1a18df2d34'
@@ -46,7 +45,6 @@ md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
'9d3c56a4b999c8bfbd4018089a62f662'
'263725f20c0b9eb9c353040792d644e5'
'80a46681386bb87813989faeb92bdd9a'
- '827ffd855dc8b0c91577545c5804c19f'
'86910efeadb5d1e5d5416ff1a9dacb33')
if [ "$CARCH" != "mips64el" ]; then
# Don't use the Loongson-specific patches on non-mips64el arches.
@@ -80,10 +78,6 @@ build() {
# https://bugzilla.kernel.org/show_bug.cgi?id=43168
patch -Np1 -i "${srcdir}/3.4.4-fix-backlight-regression.patch"
- # fix nouveau regression
- # Arch Linux bug report: FS#30417
- patch -Np1 -i "${srcdir}/3.4.4-fix-gtx560ti-nouveau-regression.patch"
-
# 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)
@@ -118,6 +112,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 +213,12 @@ package_linux-libre() {
# 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-headers() {
@@ -233,10 +236,10 @@ package_linux-libre-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/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 5e87c939e..44850230f 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=
-KERNEL_VERSION=3.4.4-2-LIBRE
+KERNEL_VERSION=3.4.4-3-LIBRE
# set a sane PATH to ensure that critical utils like depmod will be found
export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index d6a294fe6..3b73a9f2f 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -1,12 +1,12 @@
# $Id$
# Maintainer: Paul Mattal <paul@archlinux.org>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
_pkgbase=lirc
pkgbase=lirc-libre
pkgname=('lirc-libre' 'lirc-utils-libre')
pkgver=0.9.0
-pkgrel=18
+pkgrel=20
epoch=1
_extramodules=extramodules-3.4-LIBRE
arch=('i686' 'x86_64' 'mips64el')
@@ -34,7 +34,7 @@ md5sums=('b232aef26f23fe33ea8305d276637086'
'69d099e6deedfa3c1ee2b6e82d9b8bfb')
build() {
- _kernver="$(cat /lib/modules/${_extramodules}/version)"
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
cd "${srcdir}/lirc-${pkgver}"
patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch"
patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch"
@@ -51,7 +51,7 @@ build() {
PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \
--with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \
- --with-moduledir=/lib/modules/${_kernver}/kernel/drivers/misc \
+ --with-moduledir=/usr/lib/modules/${_kernver}/kernel/drivers/misc \
--with-transmitter
# Remove drivers already in kernel
@@ -71,7 +71,7 @@ package_lirc-libre() {
install=lirc.install
cd "${srcdir}/lirc-${pkgver}/drivers"
- make DESTDIR="${pkgdir}" moduledir="/lib/modules/${_extramodules}" install
+ make DESTDIR="${pkgdir}" moduledir="/usr/lib/modules/${_extramodules}" install
# set the kernel we've built for inside the install script
sed -i -e "s/EXTRAMODULES=.*/EXTRAMODULES=${_extramodules}/g" "${startdir}/lirc.install"
@@ -108,5 +108,5 @@ package_lirc-utils-libre() {
install -d "${pkgdir}/etc/lirc"
# remove built modules
- rm -r "${pkgdir}/lib/"
+ rm -r "${pkgdir}/usr/lib/modules"
}
diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install
index d6b9e5ff2..c50e384c8 100644
--- a/libre/lirc-libre/lirc.install
+++ b/libre/lirc-libre/lirc.install
@@ -3,7 +3,7 @@ EXTRAMODULES=extramodules-3.4-LIBRE
post_install() {
# updating module dependencies
echo ">>> Updating module dependencies. Please wait ..."
- depmod $(cat /lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1
}
post_upgrade() {
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-21 17:52:16 +0000