summaryrefslogtreecommitdiff
path: root/archiso32
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-05-21 14:36:58 +0200
committerErich Eckner <git@eckner.net>2019-05-21 14:36:58 +0200
commitb8594aaa20471250fcc74b43dfd029161a6254dd (patch)
treee82a00e438c3ec983f9ba20fe78a8b1e27cccd55 /archiso32
parenta04e203014bb2a5d04615361f045abfcc22fea5a (diff)
downloadarchlinuxewe-b8594aaa20471250fcc74b43dfd029161a6254dd.tar.xz
archiso32, archiso-dual: depend on archiso rather than conflicting with it and duplicating the content
Diffstat (limited to 'archiso32')
-rw-r--r--archiso32/PKGBUILD39
1 files changed, 35 insertions, 4 deletions
diff --git a/archiso32/PKGBUILD b/archiso32/PKGBUILD
index 51c7546cc..120d1bfbc 100644
--- a/archiso32/PKGBUILD
+++ b/archiso32/PKGBUILD
@@ -9,13 +9,12 @@ _target_arch=$(printf '%s' i 6 8 6)
pkgname=archiso32
pkgver=42
-pkgrel=1
+pkgrel=2
pkgdesc='Tools for creating Arch Linux live and install iso images - for '"${_target_arch}"
arch=('any')
license=('GPL')
url='https://git.archlinux32.org/archlinux32/archiso32'
-depends=('make' 'arch-install-scripts' 'squashfs-tools' 'libisoburn' 'dosfstools' 'lynx' 'pacman-mirrorlist32' 'archlinux32-keyring')
-conflicts=('archiso' 'archiso-dual')
+depends=('archiso' 'make' 'arch-install-scripts' 'squashfs-tools' 'libisoburn' 'dosfstools' 'lynx' 'pacman-mirrorlist32' 'archlinux32-keyring')
source=(
"https://sources.archlinux32.org/sources/${pkgname}-${_target_arch}-v${pkgver}.tar.gz"{,.sig}
)
@@ -23,6 +22,38 @@ sha512sums=('780bd6d9024493aadfcea99cee709e05dcd7ce672732e9582b03be4693707b5fd2f
'SKIP')
validpgpkeys=('DE9F7688CACF04FEB81A6C590AEEC90755DA7B5A')
+build() {
+ mkdir "${srcdir}/pkg"
+ make -C "${srcdir}/${pkgname}-${_target_arch}-v${pkgver}" DESTDIR="${srcdir}/pkg" install
+}
+
package() {
- make -C "${srcdir}/${pkgname}-${_target_arch}-v${pkgver}" DESTDIR="${pkgdir}" install
+
+ mkdir -p "${pkgdir}/usr/share/archiso/configs"
+ mv "${srcdir}/pkg/usr/share/archiso/configs/releng" "${pkgdir}/usr/share/archiso/configs/releng32"
+
+ rm \
+ "${srcdir}/pkg/usr/share/doc/archiso/README.altbootmethods" \
+ "${srcdir}/pkg/usr/share/doc/archiso/README.transfer"
+
+ (
+ pacman -Qql archiso \
+ | grep -v '/$'
+ cd "${srcdir}/pkg"
+ find * -not -type d \
+ | sed 's,^,/,'
+ ) \
+ | sort \
+ | uniq -d \
+ | while read -r f; do
+ diff -u --color "${f}" "${srcdir}/pkg${f}" || return $?
+ rm "${srcdir}/pkg${f}"
+ done
+
+ if find "${srcdir}/pkg" -not -type d \
+ | grep -F ''; then
+ >&2 echo '^residual files found'
+ return 4
+ fi
+
}