summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-01-04 11:55:17 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-01-04 11:55:17 -0300
commit8bb7a10e4748b9fe29f4e4cb7012f31a16245093 (patch)
treed34831d76db62a2d010bce9ed4f1ef214560ef21
parent41f96635759489132086f9c599af6b6b8af20db2 (diff)
downloadabslibre-8bb7a10e4748b9fe29f4e4cb7012f31a16245093.tar.gz
abslibre-8bb7a10e4748b9fe29f4e4cb7012f31a16245093.tar.bz2
abslibre-8bb7a10e4748b9fe29f4e4cb7012f31a16245093.zip
libre/linux-libre-3.1.7-1
-rw-r--r--libre/linux-libre/PKGBUILD22
-rw-r--r--libre/linux-libre/config.i6866
-rw-r--r--libre/linux-libre/config.x86_646
-rw-r--r--libre/linux-libre/linux-libre.install10
4 files changed, 21 insertions, 23 deletions
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 4e10d29a0..966e3d979 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -
# pkgname=linux-custom # Build kernel with a different name
_kernelname=${pkgname#linux-libre}
_basekernel=3.1
-pkgver=${_basekernel}.5
+pkgver=${_basekernel}.7
pkgrel=1
arch=('i686' 'x86_64')
url="http://linux-libre.fsfla.org/"
@@ -27,6 +27,16 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li
'i915-fix-ghost-tv-output.patch'
'i915-fix-incorrect-error-message.patch'
'usb-add-reset-resume-quirk-for-several-webcams.patch')
+md5sums=('d73df15ab1d36fe3c102755d8f42117f'
+ '47e4a10500ad90694b7f42fb447ab810'
+ '267ea59695619730032f89ac70bf9391'
+ '5a415fc0c864dc3f5c4afa63f1506c52'
+ 'a8a3843046926eb7ab81312cd438c5c5'
+ '04b21c79df0a952c22d681dd4f4562df'
+ '9d3c56a4b999c8bfbd4018089a62f662'
+ '263725f20c0b9eb9c353040792d644e5'
+ 'a50c9076012cb2dda49952dc6ec3e9c1'
+ '52d41fa61e80277ace2b994412a0c856')
build() {
cd "${srcdir}/linux-${_basekernel}"
@@ -291,13 +301,3 @@ package_linux-libre-docs() {
# remove a file already in linux package
rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
}
-md5sums=('d73df15ab1d36fe3c102755d8f42117f'
- '06b461d4db995ddcbecbf345ae3b8987'
- '7d8fac41f4c4c2d14d8c65645fb676bd'
- '2a0302eda795903d3b01e41ba807c91e'
- 'a8a3843046926eb7ab81312cd438c5c5'
- '04b21c79df0a952c22d681dd4f4562df'
- '9d3c56a4b999c8bfbd4018089a62f662'
- '263725f20c0b9eb9c353040792d644e5'
- 'a50c9076012cb2dda49952dc6ec3e9c1'
- '52d41fa61e80277ace2b994412a0c856')
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 43bf1d3c3..e056a28d6 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.1.1-1 Kernel Configuration
+# Linux/i386 3.1.6-1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -5329,7 +5329,7 @@ CONFIG_SQUASHFS_XZ=y
# CONFIG_SQUASHFS_EMBEDDED is not set
CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
# CONFIG_VXFS_FS is not set
-# CONFIG_MINIX_FS is not set
+CONFIG_MINIX_FS=m
CONFIG_OMFS_FS=m
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
@@ -5404,7 +5404,7 @@ CONFIG_PARTITION_ADVANCED=y
CONFIG_MAC_PARTITION=y
CONFIG_MSDOS_PARTITION=y
CONFIG_BSD_DISKLABEL=y
-# CONFIG_MINIX_SUBPARTITION is not set
+CONFIG_MINIX_SUBPARTITION=y
CONFIG_SOLARIS_X86_PARTITION=y
# CONFIG_UNIXWARE_DISKLABEL is not set
CONFIG_LDM_PARTITION=y
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 6011a797a..e528ee7eb 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.1.1-1 Kernel Configuration
+# Linux/x86_64 3.1.6-1 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -5092,7 +5092,7 @@ CONFIG_SQUASHFS_XZ=y
# CONFIG_SQUASHFS_EMBEDDED is not set
CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
# CONFIG_VXFS_FS is not set
-# CONFIG_MINIX_FS is not set
+CONFIG_MINIX_FS=m
CONFIG_OMFS_FS=m
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
@@ -5167,7 +5167,7 @@ CONFIG_PARTITION_ADVANCED=y
CONFIG_MAC_PARTITION=y
CONFIG_MSDOS_PARTITION=y
CONFIG_BSD_DISKLABEL=y
-# CONFIG_MINIX_SUBPARTITION is not set
+CONFIG_MINIX_SUBPARTITION=y
CONFIG_SOLARIS_X86_PARTITION=y
# CONFIG_UNIXWARE_DISKLABEL is not set
CONFIG_LDM_PARTITION=y
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index d75b48c8f..badaceefd 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.1.5-1-LIBRE
+KERNEL_VERSION=3.1.6-1-LIBRE
post_install () {
# updating module dependencies
@@ -43,11 +43,9 @@ post_upgrade() {
echo ">>>"
fi
- if grep "^[^#]*[[:space:]]/boot" etc/fstab 2>&1 >/dev/null; then
- if ! grep "[[:space:]]/boot" etc/mtab 2>&1 >/dev/null; then
- echo "WARNING: /boot appears to be a seperate partition but is not mounted."
- echo " You probably just broke your system. Congratulations."
- fi
+ if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then
+ echo "WARNING: /boot appears to be a separate partition but is not mounted."
+ echo " You probably just broke your system. Congratulations."
fi
# updating module dependencies