summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre')
-rw-r--r--libre/aif-libre/PKGBUILD3
-rw-r--r--libre/linux-libre/PKGBUILD51
-rw-r--r--libre/linux-libre/change-default-console-loglevel.patch13
-rw-r--r--libre/linux-libre/config.i6861
-rw-r--r--libre/linux-libre/config.x86_641
-rw-r--r--libre/linux-libre/fix-i915.patch1
-rw-r--r--libre/linux-libre/linux-libre.install1
-rw-r--r--libre/linux-libre/linux-libre.preset1
8 files changed, 43 insertions, 29 deletions
diff --git a/libre/aif-libre/PKGBUILD b/libre/aif-libre/PKGBUILD
index 96b874fd5..0751fb372 100644
--- a/libre/aif-libre/PKGBUILD
+++ b/libre/aif-libre/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Dieter Plaetinck <dieter@plaetinck.be>
pkgname=aif-libre
-pkgver=2011.07.20
+pkgver=2011.08.1
pkgrel=1
pkgdesc="The ArchLinux Installation Framework (Parabola Rebranded)"
arch=('any')
@@ -34,3 +34,4 @@ build() {
}
# vim:set ts=2 sw=2 et:
+md5sums=('f4e5215cd27354e3915878d4c2bcee09')
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 350bd7ecc..94b1c7a93 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -11,7 +11,7 @@ _kernelname=${pkgname#linux-libre}
_basekernel=3.0
pkgver=${_basekernel}
pkgrel=3
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
url="http://linux-libre.fsfla.org"
license=('GPL2')
makedepends=('xmlto' 'docbook-xsl')
@@ -22,40 +22,46 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/l
# standard config files for mkinitcpio ramdisk
"${pkgname}.preset"
'boot-logo.patch'
- 'fix-i915.patch')
-
+ 'fix-i915.patch'
+ 'change-default-console-loglevel.patch')
md5sums=('44e7bc20c235a193f9b6123a8d5e9509'
- 'd4805e76a2b0c883ed8269f3dad601fb'
- 'fbefcac9fecd28e4d2e12dbee77f6602'
- 'e5d542d80abeecab674cde471e9a7d94'
+ '66dff8af6b00eb8d054b2af85aaa5ef7'
+ '1a98b8b8f2140ac8f95c3814cba8cc95'
+ '7af24ad1789055e991b1e1f090ff276d'
'04b21c79df0a952c22d681dd4f4562df'
- 'fe04ae7274a1f76ba2a8054aec60ef08')
+ '263725f20c0b9eb9c353040792d644e5'
+ '7396b811db06dec0250a1a098f527b83')
build() {
+ cd "${srcdir}/linux-$pkgver"
- cd "${srcdir}/linux-${_basekernel}"
-
- #patch -p1 -i "${srcdir}/patch-${pkgver}"
+ # fix #19234 i1915 display size
+ patch -Np1 -i "${srcdir}/fix-i915.patch"
# Add freedo as boot logo
- patch -Np1 -i ${srcdir}/boot-logo.patch
+ patch -Np1 -i "${srcdir}/boot-logo.patch"
- # fix #19234 i1915 display size
- patch -Np1 -i "${srcdir}/fix-i915.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)
+ patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
- cat "$srcdir/config.$CARCH" > ./.config # simpler
+ cat $srcdir/config.$CARCH > ./.config # simpler
if [ "${_kernelname}" != "" ]; then
sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
fi
- # remove the sublevel and extraversion from Makefile
+ # remove the "-libre" extraversion from Makefile
# this ensures our kernel version is always 3.X-LIBRE
# this way, minor kernel updates will not break external modules
# we need to change this soon, see FS#16702
- sed -ri 's|^(SUBLEVEL =).*|\1|' Makefile
sed -i 's|^EXTRAVERSION =.*$|EXTRAVERSION =|g' Makefile
+ # remove the sublevel from Makefile
+ # this ensures our kernel version is always 3.X-ARCH
+ sed -ri 's|^(SUBLEVEL =).*|\1|' Makefile
+
# get kernel version
make prepare
@@ -91,7 +97,7 @@ package_linux-libre() {
backup=("etc/mkinitcpio.d/${pkgname}.preset")
install=${pkgname}.install
- cd "${srcdir}/linux-${_basekernel}"
+ cd "${srcdir}/linux-${pkgver}"
KARCH=x86
@@ -139,7 +145,7 @@ package_linux-libre-headers() {
cd "${pkgdir}/lib/modules/${_kernver}"
ln -sf ../../../usr/src/linux-${_kernver} build
- cd "${srcdir}/linux-${_basekernel}"
+ cd "${srcdir}/linux-$pkgver"
install -D -m644 Makefile \
"${pkgdir}/usr/src/linux-${_kernver}/Makefile"
install -D -m644 kernel/Makefile \
@@ -158,7 +164,7 @@ package_linux-libre-headers() {
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/x86"
cp -a arch/x86/include "${pkgdir}/usr/src/linux-${_kernver}/arch/x86/"
- # copy files necessary for later builds, like nvidia and vmware
+ # copy files necessary for later builds
cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}"
cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}"
@@ -265,10 +271,10 @@ package_linux-libre-docs() {
conflicts=('kernel26-docs' 'linux-docs')
replaces=('kernel26-docs' 'linux-docs')
- cd "${srcdir}/linux-${_basekernel}"
+ cd "${srcdir}/linux-$pkgver"
- mkdir -p "${pkgdir}/usr/src/linux-${_kernver}"
- mv Documentation "${pkgdir}/usr/src/linux-${_kernver}"
+ mkdir -p "$pkgdir/usr/src/linux-$_kernver"
+ cp -r Documentation "$pkgdir/usr/src/linux-$_kernver"
find "${pkgdir}" -type f -exec chmod 444 {} \;
find "${pkgdir}" -type d -exec chmod 755 {} \;
@@ -277,4 +283,3 @@ package_linux-libre-docs() {
}
# vim:set ts=2 sw=2 et:
-
diff --git a/libre/linux-libre/change-default-console-loglevel.patch b/libre/linux-libre/change-default-console-loglevel.patch
new file mode 100644
index 000000000..cec208ee8
--- /dev/null
+++ b/libre/linux-libre/change-default-console-loglevel.patch
@@ -0,0 +1,13 @@
+diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c
+--- linux-3.0.orig/kernel/printk.c 2011-07-22 05:17:23.000000000 +0300
++++ linux-3.0/kernel/printk.c 2011-07-27 14:43:07.000000000 +0300
+@@ -58,7 +58,7 @@ void asmlinkage __attribute__((weak)) ea
+
+ /* We show everything that is MORE important than this.. */
+ #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */
+-#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */
++#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_DEBUG */
+
+ DECLARE_WAIT_QUEUE_HEAD(log_wait);
+
+
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index d9568618a..8bd0cbe40 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -5770,4 +5770,3 @@ CONFIG_CPU_RMAP=y
CONFIG_NLATTR=y
CONFIG_LRU_CACHE=m
CONFIG_AVERAGE=y
-
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index e4b5086d5..8d40df599 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -5511,4 +5511,3 @@ CONFIG_CPU_RMAP=y
CONFIG_NLATTR=y
CONFIG_LRU_CACHE=m
CONFIG_AVERAGE=y
-
diff --git a/libre/linux-libre/fix-i915.patch b/libre/linux-libre/fix-i915.patch
index 96654047b..3b631361a 100644
--- a/libre/linux-libre/fix-i915.patch
+++ b/libre/linux-libre/fix-i915.patch
@@ -24,4 +24,3 @@ index dc83b7a..c8f67bf 100644
I915_WRITE(TV_CTL, tv_ctl);
I915_WRITE(TV_DAC, tv_dac);
POSTING_READ(TV_DAC);
-
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 8a5a26ed8..51e78dc60 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -56,4 +56,3 @@ post_remove() {
rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}.img
rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}-fallback.img
}
-
diff --git a/libre/linux-libre/linux-libre.preset b/libre/linux-libre/linux-libre.preset
index e66137cce..7af90ba7a 100644
--- a/libre/linux-libre/linux-libre.preset
+++ b/libre/linux-libre/linux-libre.preset
@@ -12,4 +12,3 @@ default_image="/boot/initramfs-linux-libre.img"
#fallback_config="/etc/mkinitcpio.conf"
fallback_image="/boot/initramfs-linux-libre-fallback.img"
fallback_options="-S autodetect"
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-31 17:16:42 +0000