summaryrefslogtreecommitdiff
path: root/pcr/crosstool-ng
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-04-04 11:06:20 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-04-04 11:11:45 -0300
commit3be0c9fb1845c3a3987d26a8ff6587efef3f1095 (patch)
treed611d6ec807f5f658914e0225c70cb99b990f3ba /pcr/crosstool-ng
parent6cdf653cd1ce7fdfc89eacdf71df85bd7b71c9e6 (diff)
crosstool-ng-1.22.0-1.parabola2: fix compiling process for the toolchain when attempting to patch the kernel -> https://lists.parabola.nu/pipermail/dev/2016-March/003869.html
Diffstat (limited to 'pcr/crosstool-ng')
-rw-r--r--pcr/crosstool-ng/PKGBUILD7
-rw-r--r--pcr/crosstool-ng/ctng-libre.patch30
2 files changed, 30 insertions, 7 deletions
diff --git a/pcr/crosstool-ng/PKGBUILD b/pcr/crosstool-ng/PKGBUILD
index e1d1de676..0faeb729e 100644
--- a/pcr/crosstool-ng/PKGBUILD
+++ b/pcr/crosstool-ng/PKGBUILD
@@ -1,13 +1,14 @@
# Maintainer (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor (Arch): jwwolf <jwwolf+arch@gmail.com>
# Contributor (Arch): Bernhard Walle <bernhard@bwalle.de>
-# Maintainer: fauno <fauno@kiwwwi.com.ar>
# Maintainer: André Silva <emulatorman@parabola.nu>
+# Maintainer: fauno <fauno@kiwwwi.com.ar>
# Contributor: Márcio Silva <coadde@parabola.nu>
+# Contributor: Josh Branning <lovell.joshyyy@gmail.com>
pkgname=crosstool-ng
pkgver=1.22.0
-pkgrel=1.parabola1
+pkgrel=1.parabola2
pkgdesc='Versatile cross-toolchain generator, with Linux-libre kernel support'
arch=('i686' 'x86_64')
url='http://crosstool-ng.org/'
@@ -35,4 +36,4 @@ package() {
install -Dm644 ct-ng.comp "$pkgdir"/usr/share/bash-completion/completions/ct-ng
}
sha256sums=('d6338a9b33f9d972167049bbe76e88b1e9248466a53df08dcfe8bcfe849d8d83'
- '75e06ee8e4cb2629564604498796240cbe57219bd235cade6b6982b7b0836136')
+ '36070c7691a150068ab47f01ba59716a1ffc69a08d88347f30c5d60c416adcfc')
diff --git a/pcr/crosstool-ng/ctng-libre.patch b/pcr/crosstool-ng/ctng-libre.patch
index 4c9c85435..f0e92ecad 100644
--- a/pcr/crosstool-ng/ctng-libre.patch
+++ b/pcr/crosstool-ng/ctng-libre.patch
@@ -1,7 +1,8 @@
-diff -Nur crosstool-ng-1.21.0.orig/scripts/build/kernel/linux.sh crosstool-ng-1.21.0/scripts/build/kernel/linux.sh
---- crosstool-ng-1.21.0.orig/scripts/build/kernel/linux.sh 2015-05-25 16:47:17.000000000 -0300
-+++ crosstool-ng-1.21.0/scripts/build/kernel/linux.sh 2015-07-07 04:00:33.900903515 -0300
-@@ -45,13 +45,8 @@
+diff --git a/scripts/build/kernel/linux.sh b/scripts/build/kernel/linux.sh
+index 49fe613..957f369 100644
+--- a/scripts/build/kernel/linux.sh
++++ b/scripts/build/kernel/linux.sh
+@@ -44,13 +44,8 @@ do_kernel_get() {
k_ver="${CT_KERNEL_VERSION}"
;;
esac
@@ -17,3 +18,24 @@ diff -Nur crosstool-ng-1.21.0.orig/scripts/build/kernel/linux.sh crosstool-ng-1.
"${korg_base}" \
"${korg_base}/longterm/v${k_ver}" \
"${korg_base}/longterm"
+@@ -66,13 +61,18 @@ do_kernel_extract() {
+
+ # If using a custom directory location, nothing to do
+ if [ "${CT_KERNEL_LINUX_CUSTOM}" = "y" \
+- -a -d "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}" ]; then
++ -a -d "${CT_SRC_DIR}/linux-libre-${CT_KERNEL_VERSION}-gnu" ]; then
+ return 0
+ fi
+
+ # Otherwise, we're using either a mainstream tarball, or a custom
+ # tarball; in either case, we need to extract
+- CT_Extract "linux-${CT_KERNEL_VERSION}"
++ CT_Extract "linux-libre-${CT_KERNEL_VERSION}-gnu"
++
++ # The following IF statement is a hack, it renames the source directory so that CT_Patch will work on the libre kernel.
++ if [ -d "${CT_SRC_DIR}/linux-libre-${CT_KERNEL_VERSION}-gnu" ]; then
++ mv "${CT_SRC_DIR}/linux-libre-${CT_KERNEL_VERSION}-gnu" "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}"
++ fi
+
+ # If using a custom tarball, no need to patch
+ if [ "${CT_KERNEL_LINUX_CUSTOM}" = "y" ]; then