diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-04-04 11:13:26 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-04-04 11:13:26 -0300 |
| commit | b3d2f2a260ef2388c96371c3e0df5b45f4914997 (patch) | |
| tree | c3b7b4f0c24e432d8437013aef44a457ccc6cb40 | |
| parent | 3be0c9fb1845c3a3987d26a8ff6587efef3f1095 (diff) | |
crosstool-ng-git-1.22.0.r21.g2d3c70d-1.parabola2: fix compiling process for the toolchain when attempting to patch the kernel -> https://lists.parabola.nu/pipermail/dev/2016-March/003869.html
| -rw-r--r-- | pcr/crosstool-ng-git/PKGBUILD | 5 | ||||
| -rw-r--r-- | pcr/crosstool-ng-git/ctng-libre.patch | 30 |
2 files changed, 29 insertions, 6 deletions
diff --git a/pcr/crosstool-ng-git/PKGBUILD b/pcr/crosstool-ng-git/PKGBUILD index 0bea2cd0b..72c48cf17 100644 --- a/pcr/crosstool-ng-git/PKGBUILD +++ b/pcr/crosstool-ng-git/PKGBUILD @@ -3,12 +3,13 @@ # 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 pkgname=crosstool-ng-git pkgver=1.22.0.r21.g2d3c70d _gitver=2d3c70dd3ddc5a569c0fa1a833fd5920029b5794 -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/' @@ -44,4 +45,4 @@ package() { install -Dm644 ct-ng.comp "$pkgdir"/usr/share/bash-completion/completions/ct-ng } sha256sums=('SKIP' - '75e06ee8e4cb2629564604498796240cbe57219bd235cade6b6982b7b0836136') + '36070c7691a150068ab47f01ba59716a1ffc69a08d88347f30c5d60c416adcfc') diff --git a/pcr/crosstool-ng-git/ctng-libre.patch b/pcr/crosstool-ng-git/ctng-libre.patch index 4c9c85435..f0e92ecad 100644 --- a/pcr/crosstool-ng-git/ctng-libre.patch +++ b/pcr/crosstool-ng-git/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 |