diff options
| -rw-r--r-- | libre/linux-libre/PKGBUILD | 6 | ||||
| -rw-r--r-- | libre/linux-libre/config.i686 | 4 | ||||
| -rw-r--r-- | libre/linux-libre/linux-libre.install | 4 |
3 files changed, 3 insertions, 11 deletions
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 33e3f2073..6677931dd 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -226,9 +226,9 @@ package_linux-libre-headers() { cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}" if [ "$CARCH" = "mips64el" ]; then - cp -a "arch/${KARCH}/Kbuild" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" - cp -a "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" - cp -a "${srcdir}/Kbuild.platforms" "${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/" + cp "arch/${KARCH}/Kbuild" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" + cp "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" + cp "${srcdir}/Kbuild.platforms" "${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/" fi # fix permissions on scripts dir diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 71783fa50..a310f72e1 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,10 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -<<<<<<< HEAD -# Linux/i386 3.1.6-1 Kernel Configuration -======= # Linux/i386 3.2.0 Kernel Configuration ->>>>>>> ddf6b4309b9f9816e75828359a2d60a23a0ca68c # # CONFIG_64BIT is not set CONFIG_X86_32=y diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index bab05ffce..3e86e1c56 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.6-1-LIBRE -======= KERNEL_VERSION=3.2.0-1-LIBRE ->>>>>>> ddf6b4309b9f9816e75828359a2d60a23a0ca68c post_install () { # updating module dependencies |