From a09b34620af4083210a7d29adeea9c8aadb7f04b Mon Sep 17 00:00:00 2001 From: David P Date: Fri, 19 Jun 2020 19:45:01 -0400 Subject: remove pcr/crosstool-ng-git the non-git version is more up to date, we don't need this one Signed-off-by: David P --- pcr/crosstool-ng-git/PKGBUILD | 48 ----------------------------------- pcr/crosstool-ng-git/ctng-libre.patch | 41 ------------------------------ 2 files changed, 89 deletions(-) delete mode 100644 pcr/crosstool-ng-git/PKGBUILD delete mode 100644 pcr/crosstool-ng-git/ctng-libre.patch (limited to 'pcr') diff --git a/pcr/crosstool-ng-git/PKGBUILD b/pcr/crosstool-ng-git/PKGBUILD deleted file mode 100644 index d6e562cae..000000000 --- a/pcr/crosstool-ng-git/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# Maintainer (Arch): Ivan Shapovalov -# Contributor (Arch): goodmen -# Maintainer: André Silva -# Maintainer: fauno -# Contributor: Márcio Silva -# Contributor: Josh Branning - -_pkgname=crosstool-ng -pkgname=crosstool-ng-git -pkgver=1.22.0.r21.g2d3c70d -_gitver=2d3c70dd3ddc5a569c0fa1a833fd5920029b5794 -pkgrel=1.parabola2 -pkgdesc='Versatile cross-toolchain generator, with Linux-libre kernel support' -arch=('i686' 'x86_64') -url='http://crosstool-ng.org/' -license=('GPL2') -depends=('make' 'gperf' 'wget') -makedepends=('git' 'help2man') -options=('!makeflags') -provides=("$_pkgname") -conflicts=("$_pkgname") -source=(git://github.com/crosstool-ng/crosstool-ng#commit=$_gitver - ctng-libre.patch) - -pkgver() { - cd $_pkgname - git describe --long --tags | sed 's/^crosstool-ng-//;s/-/.r/;s/-/./' -} - -prepare() { - cd $_pkgname - patch -Np1 -i ../ctng-libre.patch -} - -build() { - cd $_pkgname - ./bootstrap - ./configure --prefix=/usr - make -} - -package() { - cd $_pkgname - make DESTDIR="$pkgdir" install - install -Dm644 ct-ng.comp "$pkgdir"/usr/share/bash-completion/completions/ct-ng -} -sha256sums=('SKIP' - '36070c7691a150068ab47f01ba59716a1ffc69a08d88347f30c5d60c416adcfc') diff --git a/pcr/crosstool-ng-git/ctng-libre.patch b/pcr/crosstool-ng-git/ctng-libre.patch deleted file mode 100644 index f0e92ecad..000000000 --- a/pcr/crosstool-ng-git/ctng-libre.patch +++ /dev/null @@ -1,41 +0,0 @@ -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 -- case "${CT_KERNEL_VERSION}" in -- 2.6.*) rel_dir=v2.6;; -- 3.*) rel_dir=v3.x;; -- 4.*) rel_dir=v4.x;; -- esac -- korg_base="http://www.kernel.org/pub/linux/kernel/${rel_dir}" -- CT_GetFile "linux-${CT_KERNEL_VERSION}" \ -+ korg_base="http://linux-libre.fsfla.org/pub/linux-libre/releases/${CT_KERNEL_VERSION}-gnu" -+ CT_GetFile "linux-libre-${CT_KERNEL_VERSION}-gnu" \ - "${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 -- cgit v1.2.3