diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-09-06 01:23:56 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-09-06 01:23:56 -0300 |
| commit | 921eaa918e7462782b54d4b3a5ec359d4f20ca51 (patch) | |
| tree | 94f5330b9aa1d0d11481ca5e203f130cd25fff4b /libre | |
| parent | 09c71fe405c01f951a98e1863f86a85c1daf3dfe (diff) | |
| parent | 7a9f5c420f8c3216c673e8947aa694f6aa20f171 (diff) | |
Merge branch 'master' of ssh://gparabola/abslibre
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/linux-libre/PKGBUILD | 21 | ||||
| -rw-r--r-- | libre/linux-libre/config.i686 | 2 | ||||
| -rw-r--r-- | libre/linux-libre/config.x86_64 | 2 |
3 files changed, 13 insertions, 12 deletions
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 35ee930ea..c83f3ef23 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -10,7 +10,7 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock - _kernelname=${pkgname#linux-libre} _basekernel=3.0 pkgver=${_basekernel}.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -25,6 +25,14 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li 'boot-logo.patch' 'fix-i915.patch' 'change-default-console-loglevel.patch') +md5sums=('44e7bc20c235a193f9b6123a8d5e9509' + 'f17e9c5f801be0b17efe78aaff0f2a0e' + 'bb679e0e61c53a8f1a22b8d46f89f47e' + '68d2fc73ce1d9057678f91235f6e22c6' + 'a8a3843046926eb7ab81312cd438c5c5' + '04b21c79df0a952c22d681dd4f4562df' + '263725f20c0b9eb9c353040792d644e5' + '9d3c56a4b999c8bfbd4018089a62f662') build() { cd "${srcdir}/linux-${_basekernel}" @@ -130,7 +138,7 @@ package_linux-libre() { package_linux-libre-headers() { pkgdesc="Header files and scripts for building modules for linux-libre kernel" - provides=("kernel26-headers=${pkgver}" "linux-headers=${pkgver}" "kernel26-libre-headers=${pkgver}") + provides=('kernel26-headers' "linux-headers=${pkgver}") conflicts=('kernel26-headers' 'kernel26-libre-headers' 'linux-headers') replaces=('kernel26-headers' 'kernel26-libre-headers' 'linux-headers') @@ -275,11 +283,4 @@ package_linux-libre-docs() { # remove a file already in linux package rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile" } -md5sums=('44e7bc20c235a193f9b6123a8d5e9509' - 'f17e9c5f801be0b17efe78aaff0f2a0e' - '66dff8af6b00eb8d054b2af85aaa5ef7' - '1a98b8b8f2140ac8f95c3814cba8cc95' - 'a8a3843046926eb7ab81312cd438c5c5' - '04b21c79df0a952c22d681dd4f4562df' - '263725f20c0b9eb9c353040792d644e5' - '9d3c56a4b999c8bfbd4018089a62f662') + diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 8bd0cbe40..69a35c73c 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -470,7 +470,7 @@ CONFIG_CAN_PM_TRACE=y CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y CONFIG_ACPI_PROCFS=y -CONFIG_ACPI_PROCFS_POWER=y +# CONFIG_ACPI_PROCFS_POWER is not set CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_PROC_EVENT=y CONFIG_ACPI_AC=m diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 8d40df599..d7b662cb6 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -458,7 +458,7 @@ CONFIG_CAN_PM_TRACE=y CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y CONFIG_ACPI_PROCFS=y -CONFIG_ACPI_PROCFS_POWER=y +# CONFIG_ACPI_PROCFS_POWER is not set CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_PROC_EVENT=y CONFIG_ACPI_AC=m |