diff options
| author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-12-25 13:37:35 -0600 |
|---|---|---|
| committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-12-25 13:37:35 -0600 |
| commit | d4891d626bd0699dafdcfa776ad0ee48df04f2d4 (patch) | |
| tree | 215f7e117f4e146389e96b8b976591b101845667 /libre | |
| parent | 14f1f7de0e32b27172968722644d5dbced226f52 (diff) | |
| parent | c46511670fc7e857a314c0e9e974be610065ab98 (diff) | |
Merge branch 'master' of gitpar:abslibre-mips64el
Conflicts:
libre/linux-libre/PKGBUILD
libre/linux-libre/linux-libre.install
libre/metalog/PKGBUILD
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/linux-libre/PKGBUILD | 31 | ||||
| -rw-r--r-- | libre/linux-libre/linux-libre.install | 4 | ||||
| -rw-r--r-- | libre/metalog/PKGBUILD | 2 |
3 files changed, 2 insertions, 35 deletions
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 77e514293..e3b949f1d 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -9,15 +9,9 @@ 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 -<<<<<<< HEAD -pkgver=${_basekernel}.4 -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') -======= pkgver=${_basekernel}.5 pkgrel=1 -arch=('i686' 'x86_64') ->>>>>>> libre/master +arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl') @@ -186,7 +180,6 @@ package_linux-libre-headers() { provides=('kernel26-headers' "linux-headers=${pkgver}") conflicts=('kernel26-headers' 'kernel26-libre-headers' 'linux-headers') replaces=('kernel26-headers' 'kernel26-libre-headers' 'linux-headers') -<<<<<<< HEAD KARCH=x86 [[ $CARCH = "mips64el" ]] && KARCH=mips @@ -196,8 +189,6 @@ package_linux-libre-headers() { cd ${srcdir}/linux-$pkgver _kernver="$(make kernelrelease)" fi -======= ->>>>>>> libre/master mkdir -p "${pkgdir}/lib/modules/${_kernver}" @@ -351,23 +342,3 @@ package_linux-libre-docs() { # remove a file already in linux package rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile" } -md5sums=('d73df15ab1d36fe3c102755d8f42117f' -<<<<<<< HEAD - 'ad965eeb168f19c536722ede6e22983b' - '9b116e9b7a87ed9f6235deae432b9fd6' - '7d8fac41f4c4c2d14d8c65645fb676bd' - '2a0302eda795903d3b01e41ba807c91e' - 'a8a3843046926eb7ab81312cd438c5c5' - '2967cecc3af9f954ccc822fd63dca6ff' - '8267264d9a8966e57fdacd1fa1fc65c4' -======= - '06b461d4db995ddcbecbf345ae3b8987' - '7d8fac41f4c4c2d14d8c65645fb676bd' - '2a0302eda795903d3b01e41ba807c91e' - 'a8a3843046926eb7ab81312cd438c5c5' ->>>>>>> libre/master - '04b21c79df0a952c22d681dd4f4562df' - '9d3c56a4b999c8bfbd4018089a62f662' - '263725f20c0b9eb9c353040792d644e5' - 'a50c9076012cb2dda49952dc6ec3e9c1' - '52d41fa61e80277ace2b994412a0c856') diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 79e11697d..d75b48c8f 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,11 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -<<<<<<< HEAD -KERNEL_VERSION=3.1.4-1-LIBRE -======= KERNEL_VERSION=3.1.5-1-LIBRE ->>>>>>> libre/master post_install () { # updating module dependencies diff --git a/libre/metalog/PKGBUILD b/libre/metalog/PKGBUILD index 3692229e0..c26467d36 100644 --- a/libre/metalog/PKGBUILD +++ b/libre/metalog/PKGBUILD @@ -42,4 +42,4 @@ package() { # compat symlink ln -s metalog $pkgdir/etc/rc.d/syslog-ng -}
\ No newline at end of file +} |