diff options
Diffstat (limited to 'pcr/debootstrap')
| -rw-r--r-- | pcr/debootstrap/PKGBUILD | 22 | ||||
| -rw-r--r-- | pcr/debootstrap/debootstrap.install | 2 | ||||
| -rw-r--r-- | pcr/debootstrap/gnewsense (renamed from pcr/debootstrap/metad) | 11 |
3 files changed, 14 insertions, 21 deletions
diff --git a/pcr/debootstrap/PKGBUILD b/pcr/debootstrap/PKGBUILD index d5a45b5b1..5e01864d7 100644 --- a/pcr/debootstrap/PKGBUILD +++ b/pcr/debootstrap/PKGBUILD @@ -1,23 +1,26 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -pkgname=debootstrap -pkgver=1.0.52 +_pkgname=debootstrap +pkgname=debootstrap-libre +pkgver=1.0.53 pkgrel=3 -pkgdesc="A tool used to create a gNewSense or Trisquel base system from scratch, without requiring the availability of dpkg or apt" +pkgdesc="A tool used to create a gNewSense or Trisquel base system from scratch, without requiring the availability of dpkg or apt (Debian scripts removed)" arch=('any') license=('GPL') url="http://packages.debian.org/sid/debootstrap" depends=('wget') source=("http://ftp.debian.org/debian/pool/main/d/${pkgname}/${pkgname}_${pkgver}_all.deb" - 'metad' + 'gnewsense' 'trisquel') install="debootstrap.install" -md5sums=('97ac467bf63cf066f52d0dd7fcf77e9a' - '4425300ca68d60fb60a6d699e153a519' +md5sums=('1ea9c87d54b6cf9349d602406bf43e5a' + '13978bdd1d877a0dd2c3c874ecd54f03' 'b020aa8426e70a6024c8e76312c17d78') package(){ tar -xzf "${srcdir}/data.tar.gz" -C "${pkgdir}/" + # remove Debian scripts + rm -v "$pkgdir/usr/share/debootstrap/scripts/*" # move the executables to /usr/bin mkdir -p ${pkgdir}/usr/bin mv "${pkgdir}/usr/sbin"/* "${pkgdir}/usr/bin/" @@ -25,14 +28,13 @@ package(){ # patch the path to use gNewSense or Trisquel defaults (prevents error in chrooted environment) sed -i 's|export PATH|export PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/java/jre/bin:/usr/bin/vendor_perl:/usr/bin/core_perl"|' ${pkgdir}/usr/bin/debootstrap # doesn't work with gpg 2.x, patch to point to gpg1v - sed 's/gpgv/gpg1v/g;' -i "${pkgdir}/usr/bin/debootstrap" "${pkgdir}/usr/share/debootstrap/functions" + sed 's/gpgv/gpg1v/g;' -i "${pkgdir}/usr/bin/debootstrap" "${pkgdir}/usr/share/debootstrap/functions" # add gNewSense script - install -m644 metad "$pkgdir/usr/share/debootstrap/scripts" + install -m644 gnewsense "$pkgdir/usr/share/debootstrap/scripts" # create gNewSense symlinks - ln -s metad "$pkgdir/usr/share/debootstrap/scripts/deltah" - ln -s metad "$pkgdir/usr/share/debootstrap/scripts/parkes" + ln -s gnewsense "$pkgdir/usr/share/debootstrap/scripts/parkes" # add Trisquel script install -m644 trisquel "$pkgdir/usr/share/debootstrap/scripts" diff --git a/pcr/debootstrap/debootstrap.install b/pcr/debootstrap/debootstrap.install index 85a99f160..3da2f1d22 100644 --- a/pcr/debootstrap/debootstrap.install +++ b/pcr/debootstrap/debootstrap.install @@ -1,7 +1,7 @@ post_install() { if [ "$(uname -m)" = "x86_64" ]; then darch="amd64" - elif [ "$(uname -m)" = "i386" ]; then + elif [ "$(uname -m)" = "i686" ]; then darch="i386" else darch="mips64el" diff --git a/pcr/debootstrap/metad b/pcr/debootstrap/gnewsense index 8d14c0ed9..884ac88a0 100644 --- a/pcr/debootstrap/metad +++ b/pcr/debootstrap/gnewsense @@ -1,13 +1,4 @@ -case $SUITE in - parkes|metad) - default_mirror http://archive.gnewsense.org/gnewsense-three/gnewsense/ - ;; - deltah) - default_mirror http://archive.gnewsense.org/gnewsense - ;; -esac - - +default_mirror http://archive.gnewsense.org/gnewsense-three/gnewsense mirror_style release download_style apt finddebs_style from-indices |