diff options
| author | Isaac David <isacdaavid@isacdaavid.info> | 2017-11-14 18:44:01 -0600 |
|---|---|---|
| committer | Isaac David <isacdaavid@isacdaavid.info> | 2017-11-14 18:44:01 -0600 |
| commit | 6647f647074142d2d335694c76284bb720040131 (patch) | |
| tree | 948109206d95b59441caea1d808f49f0b9c53d2a /libre | |
| parent | 8595f8a32adc0057c188c0fb4fe2950b36698b90 (diff) | |
| download | abslibre-6647f647074142d2d335694c76284bb720040131.tar.gz abslibre-6647f647074142d2d335694c76284bb720040131.tar.bz2 abslibre-6647f647074142d2d335694c76284bb720040131.zip | |
pacman 5.0.2-2.parabola1.2: depend on all keyrings
people keep forgeting to install archlinux{arm,32}-keyring for
foreign-architecture pacstrap/librechroot on x86_64.
as for dbscripts, this also allows us to reuse arch=(any) packages
from whatever distro in whatever architecture, in the remote scenario
where ALARM or Arch32 updates one such package before x86_64 Arch
does.
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/archlinuxarm-keyring/PKGBUILD | 21 | ||||
| -rw-r--r-- | libre/archlinuxarm-keyring/archlinuxarm-keyring.install | 11 | ||||
| -rw-r--r-- | libre/pacman/PKGBUILD | 10 |
3 files changed, 36 insertions, 6 deletions
diff --git a/libre/archlinuxarm-keyring/PKGBUILD b/libre/archlinuxarm-keyring/PKGBUILD new file mode 100644 index 000000000..48f570e02 --- /dev/null +++ b/libre/archlinuxarm-keyring/PKGBUILD @@ -0,0 +1,21 @@ +# Maintainer: Isaac David <isacdaavid@at@isacdaavid@dot@info> +# Maintainer (ALARM): Kevin Mihelich <kevin@archlinuxarm.org> + +pkgname=archlinuxarm-keyring +pkgver=20140119 +pkgrel=1 +pkgdesc='Arch Linux ARM PGP keyring' +arch=('any') +url='http://archlinuxarm.org' +license=('GPL') +install="${pkgname}.install" +source=("http://archlinuxarm.org/builder/src/${pkgname}-${pkgver}.tar.gz" + # Arch Linux ARM Build System <builder@archlinuxarm.org> + "http://archlinuxarm.org/builder/src/${pkgname}-${pkgver}.tar.gz.sig") +md5sums=('187140dd1078a4466f79f82f85a43f29' + 'SKIP') + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make PREFIX=/usr DESTDIR=${pkgdir} install +} diff --git a/libre/archlinuxarm-keyring/archlinuxarm-keyring.install b/libre/archlinuxarm-keyring/archlinuxarm-keyring.install new file mode 100644 index 000000000..8304dd82e --- /dev/null +++ b/libre/archlinuxarm-keyring/archlinuxarm-keyring.install @@ -0,0 +1,11 @@ +post_upgrade() { + if usr/bin/pacman-key -l >/dev/null 2>&1; then + usr/bin/pacman-key --populate archlinuxarm + fi +} + +post_install() { + if [ -x usr/bin/pacman-key ]; then + post_upgrade + fi +} diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index a15f51172..09ac88590 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -11,17 +11,15 @@ pkgname=pacman pkgver=5.0.2 -pkgrel=2.parabola1.1 +pkgrel=2.parabola1.2 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'armv7h') url="http://www.archlinux.org/pacman/" license=('GPL') groups=('base' 'base-devel' 'base-openrc') -depends=('bash' 'glibc' 'libarchive' 'curl' - 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring' - 'parabola-keyring') -depends_armv7h=('archlinuxarm-keyring') -depends_i686=('archlinux32-keyring') +depends=('bash' 'glibc' 'libarchive' 'curl' 'gpgme' + 'pacman-mirrorlist' 'archlinux-keyring' 'parabola-keyring' + 'archlinuxarm-keyring' 'archlinux32-keyring') makedepends=('asciidoc') makedepends+=('openssl>=1.1' 'openssl-1.0') # for during openssl 1.0->1.1 rebuild; remove on next rebuild checkdepends=('python2' 'fakechroot') |