diff options
author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-03-12 12:38:40 -0300 |
---|---|---|
committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-03-12 12:38:40 -0300 |
commit | da3e14b1c0836ab3facc47d4645942d92b2f4760 (patch) | |
tree | 2064d6087d6fadd8b4969a77fbf1e7d70b760733 | |
parent | d3e5d228125973838465eef2a151c89044f9e7f8 (diff) | |
parent | 2a5aebb2f7996f804dcf8355e86ae72010b42b9a (diff) | |
download | abslibre-da3e14b1c0836ab3facc47d4645942d92b2f4760.tar.gz abslibre-da3e14b1c0836ab3facc47d4645942d92b2f4760.tar.bz2 abslibre-da3e14b1c0836ab3facc47d4645942d92b2f4760.zip |
Merge branch 'master' of ssh://gparabola/abslibre
-rw-r--r-- | kernels/aufs2-libre/PKGBUILD (renamed from libre/aufs2-libre/PKGBUILD) | 0 | ||||
-rw-r--r-- | kernels/aufs2-libre/aufs2-libre.install (renamed from libre/aufs2-libre/aufs2-libre.install) | 0 | ||||
-rw-r--r-- | kernels/aufs2-libre/aufs2-module-2.6.36.patch (renamed from libre/aufs2-libre/aufs2-module-2.6.36.patch) | 0 | ||||
-rw-r--r-- | kernels/aufs2-libre/create-tarball.sh (renamed from libre/aufs2-libre/create-tarball.sh) | 0 | ||||
-rw-r--r-- | kernels/aufs3-libre/PKGBUILD (renamed from libre/aufs3-libre/PKGBUILD) | 8 | ||||
-rw-r--r-- | kernels/aufs3-libre/aufs3-libre.install (renamed from libre/aufs3-libre/aufs3-libre.install) | 2 | ||||
-rw-r--r-- | kernels/linux-libre-aufs_friendly/CVE-2012-0056.patch (renamed from libre/linux-libre-aufs_friendly/CVE-2012-0056.patch) | 0 | ||||
-rw-r--r-- | kernels/linux-libre-aufs_friendly/Kbuild (renamed from libre/linux-libre-aufs_friendly/Kbuild) | 0 | ||||
-rw-r--r-- | kernels/linux-libre-aufs_friendly/Kbuild.platforms (renamed from libre/linux-libre-aufs_friendly/Kbuild.platforms) | 0 | ||||
-rw-r--r-- | kernels/linux-libre-aufs_friendly/PKGBUILD (renamed from libre/linux-libre-aufs_friendly/PKGBUILD) | 0 | ||||
-rw-r--r-- | kernels/linux-libre-aufs_friendly/aufs3-libre-base.patch (renamed from libre/linux-libre-aufs_friendly/aufs3-libre-base.patch) | 0 | ||||
-rw-r--r-- | kernels/linux-libre-aufs_friendly/aufs3-libre-standalone.patch (renamed from libre/linux-libre-aufs_friendly/aufs3-libre-standalone.patch) | 0 | ||||
-rw-r--r-- | kernels/linux-libre-aufs_friendly/boot-logo.patch (renamed from libre/linux-libre-aufs_friendly/boot-logo.patch) | 0 | ||||
-rw-r--r-- | kernels/linux-libre-aufs_friendly/change-default-console-loglevel.patch (renamed from libre/linux-libre-aufs_friendly/change-default-console-loglevel.patch) | 0 | ||||
-rw-r--r-- | kernels/linux-libre-aufs_friendly/config.i686 (renamed from libre/linux-libre-aufs_friendly/config.i686) | 0 | ||||
-rw-r--r-- | kernels/linux-libre-aufs_friendly/config.x86_64 (renamed from libre/linux-libre-aufs_friendly/config.x86_64) | 0 | ||||
-rw-r--r-- | kernels/linux-libre-aufs_friendly/dib0700-fix.patch (renamed from libre/linux-libre-aufs_friendly/dib0700-fix.patch) | 0 | ||||
-rw-r--r-- | kernels/linux-libre-aufs_friendly/ext4-options.patch (renamed from libre/linux-libre-aufs_friendly/ext4-options.patch) | 0 | ||||
-rw-r--r-- | kernels/linux-libre-aufs_friendly/fix-i915.patch (renamed from libre/linux-libre-aufs_friendly/fix-i915.patch) | 0 | ||||
-rw-r--r-- | kernels/linux-libre-aufs_friendly/i915-fix-ghost-tv-output.patch (renamed from libre/linux-libre-aufs_friendly/i915-fix-ghost-tv-output.patch) | 0 | ||||
-rw-r--r-- | kernels/linux-libre-aufs_friendly/i915-fix-incorrect-error-message.patch (renamed from libre/linux-libre-aufs_friendly/i915-fix-incorrect-error-message.patch) | 0 | ||||
-rw-r--r-- | kernels/linux-libre-aufs_friendly/i915-gpu-finish.patch (renamed from libre/linux-libre-aufs_friendly/i915-gpu-finish.patch) | 0 | ||||
-rw-r--r-- | kernels/linux-libre-aufs_friendly/iwlagn-fix-NULL-pointer-dereference.patch (renamed from libre/linux-libre-aufs_friendly/iwlagn-fix-NULL-pointer-dereference.patch) | 0 | ||||
-rw-r--r-- | kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install (renamed from libre/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install) | 0 | ||||
-rw-r--r-- | kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.preset (renamed from libre/linux-libre-aufs_friendly/linux-libre-aufs_friendly.preset) | 0 | ||||
-rw-r--r-- | kernels/linux-libre-aufs_friendly/md-raid10-fix-bug-when-activating-a-hot-spare.patch (renamed from libre/linux-libre-aufs_friendly/md-raid10-fix-bug-when-activating-a-hot-spare.patch) | 0 | ||||
-rw-r--r-- | kernels/linux-libre-aufs_friendly/usb-add-reset-resume-quirk-for-several-webcams.patch (renamed from libre/linux-libre-aufs_friendly/usb-add-reset-resume-quirk-for-several-webcams.patch) | 0 |
27 files changed, 5 insertions, 5 deletions
diff --git a/libre/aufs2-libre/PKGBUILD b/kernels/aufs2-libre/PKGBUILD index bd177ef9c..bd177ef9c 100644 --- a/libre/aufs2-libre/PKGBUILD +++ b/kernels/aufs2-libre/PKGBUILD diff --git a/libre/aufs2-libre/aufs2-libre.install b/kernels/aufs2-libre/aufs2-libre.install index 883882a54..883882a54 100644 --- a/libre/aufs2-libre/aufs2-libre.install +++ b/kernels/aufs2-libre/aufs2-libre.install diff --git a/libre/aufs2-libre/aufs2-module-2.6.36.patch b/kernels/aufs2-libre/aufs2-module-2.6.36.patch index 3b43f7aed..3b43f7aed 100644 --- a/libre/aufs2-libre/aufs2-module-2.6.36.patch +++ b/kernels/aufs2-libre/aufs2-module-2.6.36.patch diff --git a/libre/aufs2-libre/create-tarball.sh b/kernels/aufs2-libre/create-tarball.sh index 6801f00bd..6801f00bd 100644 --- a/libre/aufs2-libre/create-tarball.sh +++ b/kernels/aufs2-libre/create-tarball.sh diff --git a/libre/aufs3-libre/PKGBUILD b/kernels/aufs3-libre/PKGBUILD index cb338fe6f..64bc71c9e 100644 --- a/libre/aufs3-libre/PKGBUILD +++ b/kernels/aufs3-libre/PKGBUILD @@ -10,8 +10,8 @@ pkgrel=1 #_kernver=${pkgver%_*}-LIBRE #depends=('aufs_friendly') -_kernver=3.2-LIBRE-AUFS_FRIENDLY -depends=('linux-libre-aufs_friendly') +_kernver=3.2-aufs_friendly +depends=('linux-libre-aufs_friendly' 'linux-libre-aufs_friendly-headers') pkgdesc="Another UnionFS implementation" arch=('i686' 'x86_64') @@ -23,7 +23,7 @@ provides=("aufs3=$pkgver") install=aufs3-libre.install source=("http://calimeroteknik.free.fr/src/aufs3-${pkgver}.tar.gz") options=('!makeflags' '!strip') -md5sums=('4ee4adc0c25127c942be973410a6f90a') +md5sums=('35dd55adc3f403f532ebe6d8fb354c77') build() { cd "${srcdir}/aufs3-${pkgver}" @@ -61,7 +61,7 @@ package() { #"${pkgdir}/lib/modules/${_kernver}/kernel/fs/aufs/aufs.ko" # tweak the install script for the right kernel version sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \ - "${startdir}/aufs3.install" + "${startdir}/aufs3-libre.install" # install include file install -D -m 644 include/linux/aufs_type.h "${pkgdir}/usr/include/linux/aufs_type.h" # gzip -9 the module diff --git a/libre/aufs3-libre/aufs3-libre.install b/kernels/aufs3-libre/aufs3-libre.install index e08b76b54..6e92c8e9a 100644 --- a/libre/aufs3-libre/aufs3-libre.install +++ b/kernels/aufs3-libre/aufs3-libre.install @@ -1,5 +1,5 @@ post_install() { - KERNEL_VERSION=3.2-LIBRE-AUFS_FRIENDLY + KERNEL_VERSION=3.2-aufs_friendly depmod $(cat /lib/modules/extramodules-$KERNEL_VERSION/version) } diff --git a/libre/linux-libre-aufs_friendly/CVE-2012-0056.patch b/kernels/linux-libre-aufs_friendly/CVE-2012-0056.patch index 6a83fef1c..6a83fef1c 100644 --- a/libre/linux-libre-aufs_friendly/CVE-2012-0056.patch +++ b/kernels/linux-libre-aufs_friendly/CVE-2012-0056.patch diff --git a/libre/linux-libre-aufs_friendly/Kbuild b/kernels/linux-libre-aufs_friendly/Kbuild index 8a9d7dceb..8a9d7dceb 100644 --- a/libre/linux-libre-aufs_friendly/Kbuild +++ b/kernels/linux-libre-aufs_friendly/Kbuild diff --git a/libre/linux-libre-aufs_friendly/Kbuild.platforms b/kernels/linux-libre-aufs_friendly/Kbuild.platforms index 90a226888..90a226888 100644 --- a/libre/linux-libre-aufs_friendly/Kbuild.platforms +++ b/kernels/linux-libre-aufs_friendly/Kbuild.platforms diff --git a/libre/linux-libre-aufs_friendly/PKGBUILD b/kernels/linux-libre-aufs_friendly/PKGBUILD index 49b0adba1..49b0adba1 100644 --- a/libre/linux-libre-aufs_friendly/PKGBUILD +++ b/kernels/linux-libre-aufs_friendly/PKGBUILD diff --git a/libre/linux-libre-aufs_friendly/aufs3-libre-base.patch b/kernels/linux-libre-aufs_friendly/aufs3-libre-base.patch index ac30c8db9..ac30c8db9 100644 --- a/libre/linux-libre-aufs_friendly/aufs3-libre-base.patch +++ b/kernels/linux-libre-aufs_friendly/aufs3-libre-base.patch diff --git a/libre/linux-libre-aufs_friendly/aufs3-libre-standalone.patch b/kernels/linux-libre-aufs_friendly/aufs3-libre-standalone.patch index ae897f388..ae897f388 100644 --- a/libre/linux-libre-aufs_friendly/aufs3-libre-standalone.patch +++ b/kernels/linux-libre-aufs_friendly/aufs3-libre-standalone.patch diff --git a/libre/linux-libre-aufs_friendly/boot-logo.patch b/kernels/linux-libre-aufs_friendly/boot-logo.patch index c392928a5..c392928a5 100644 --- a/libre/linux-libre-aufs_friendly/boot-logo.patch +++ b/kernels/linux-libre-aufs_friendly/boot-logo.patch diff --git a/libre/linux-libre-aufs_friendly/change-default-console-loglevel.patch b/kernels/linux-libre-aufs_friendly/change-default-console-loglevel.patch index 63435d84f..63435d84f 100644 --- a/libre/linux-libre-aufs_friendly/change-default-console-loglevel.patch +++ b/kernels/linux-libre-aufs_friendly/change-default-console-loglevel.patch diff --git a/libre/linux-libre-aufs_friendly/config.i686 b/kernels/linux-libre-aufs_friendly/config.i686 index 220956bb0..220956bb0 100644 --- a/libre/linux-libre-aufs_friendly/config.i686 +++ b/kernels/linux-libre-aufs_friendly/config.i686 diff --git a/libre/linux-libre-aufs_friendly/config.x86_64 b/kernels/linux-libre-aufs_friendly/config.x86_64 index 6fe3c37d0..6fe3c37d0 100644 --- a/libre/linux-libre-aufs_friendly/config.x86_64 +++ b/kernels/linux-libre-aufs_friendly/config.x86_64 diff --git a/libre/linux-libre-aufs_friendly/dib0700-fix.patch b/kernels/linux-libre-aufs_friendly/dib0700-fix.patch index 48f07e6fd..48f07e6fd 100644 --- a/libre/linux-libre-aufs_friendly/dib0700-fix.patch +++ b/kernels/linux-libre-aufs_friendly/dib0700-fix.patch diff --git a/libre/linux-libre-aufs_friendly/ext4-options.patch b/kernels/linux-libre-aufs_friendly/ext4-options.patch index ef1b2417d..ef1b2417d 100644 --- a/libre/linux-libre-aufs_friendly/ext4-options.patch +++ b/kernels/linux-libre-aufs_friendly/ext4-options.patch diff --git a/libre/linux-libre-aufs_friendly/fix-i915.patch b/kernels/linux-libre-aufs_friendly/fix-i915.patch index 3b631361a..3b631361a 100644 --- a/libre/linux-libre-aufs_friendly/fix-i915.patch +++ b/kernels/linux-libre-aufs_friendly/fix-i915.patch diff --git a/libre/linux-libre-aufs_friendly/i915-fix-ghost-tv-output.patch b/kernels/linux-libre-aufs_friendly/i915-fix-ghost-tv-output.patch index 3b631361a..3b631361a 100644 --- a/libre/linux-libre-aufs_friendly/i915-fix-ghost-tv-output.patch +++ b/kernels/linux-libre-aufs_friendly/i915-fix-ghost-tv-output.patch diff --git a/libre/linux-libre-aufs_friendly/i915-fix-incorrect-error-message.patch b/kernels/linux-libre-aufs_friendly/i915-fix-incorrect-error-message.patch index e1addbb05..e1addbb05 100644 --- a/libre/linux-libre-aufs_friendly/i915-fix-incorrect-error-message.patch +++ b/kernels/linux-libre-aufs_friendly/i915-fix-incorrect-error-message.patch diff --git a/libre/linux-libre-aufs_friendly/i915-gpu-finish.patch b/kernels/linux-libre-aufs_friendly/i915-gpu-finish.patch index 5840c9181..5840c9181 100644 --- a/libre/linux-libre-aufs_friendly/i915-gpu-finish.patch +++ b/kernels/linux-libre-aufs_friendly/i915-gpu-finish.patch diff --git a/libre/linux-libre-aufs_friendly/iwlagn-fix-NULL-pointer-dereference.patch b/kernels/linux-libre-aufs_friendly/iwlagn-fix-NULL-pointer-dereference.patch index a53a3a425..a53a3a425 100644 --- a/libre/linux-libre-aufs_friendly/iwlagn-fix-NULL-pointer-dereference.patch +++ b/kernels/linux-libre-aufs_friendly/iwlagn-fix-NULL-pointer-dereference.patch diff --git a/libre/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install b/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install index eb2293d00..eb2293d00 100644 --- a/libre/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install +++ b/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.install diff --git a/libre/linux-libre-aufs_friendly/linux-libre-aufs_friendly.preset b/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.preset index c802eda83..c802eda83 100644 --- a/libre/linux-libre-aufs_friendly/linux-libre-aufs_friendly.preset +++ b/kernels/linux-libre-aufs_friendly/linux-libre-aufs_friendly.preset diff --git a/libre/linux-libre-aufs_friendly/md-raid10-fix-bug-when-activating-a-hot-spare.patch b/kernels/linux-libre-aufs_friendly/md-raid10-fix-bug-when-activating-a-hot-spare.patch index 880849db5..880849db5 100644 --- a/libre/linux-libre-aufs_friendly/md-raid10-fix-bug-when-activating-a-hot-spare.patch +++ b/kernels/linux-libre-aufs_friendly/md-raid10-fix-bug-when-activating-a-hot-spare.patch diff --git a/libre/linux-libre-aufs_friendly/usb-add-reset-resume-quirk-for-several-webcams.patch b/kernels/linux-libre-aufs_friendly/usb-add-reset-resume-quirk-for-several-webcams.patch index 9e570dd3f..9e570dd3f 100644 --- a/libre/linux-libre-aufs_friendly/usb-add-reset-resume-quirk-for-several-webcams.patch +++ b/kernels/linux-libre-aufs_friendly/usb-add-reset-resume-quirk-for-several-webcams.patch |