diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2020-01-14 13:10:58 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2020-01-14 13:17:17 +0100 |
| commit | 0ac93488952f225ad0c7cbe97f6a3cffb60d0520 (patch) | |
| tree | 41a0a9d427eaf04ebe5c865ab6f32b31d63a9181 | |
| parent | cb453d989bfc4afb706fe97bbf48f06461ec0e16 (diff) | |
| download | aports-0ac93488952f.tar.bz2 aports-0ac93488952f.tar.xz | |
testing/sssd: revert bad "modernization" from the last commit
This partially reverts commit 67a63bbbb70c24358c6dde9240a8babf2500cd08.
Removing quotes around $pkgdir is not improvement at all; it should be
always quoted, to be safe if $pkgdir contains spaces.
${pkgdir:?} is completely unnecessary and doesn't make much sense -
pkgdir is always set by abuild script.
Adding yourself to the contributors just for very minor (and even wrong)
changes in APKBUILD is not good.
| -rw-r--r-- | testing/sssd/APKBUILD | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/testing/sssd/APKBUILD b/testing/sssd/APKBUILD index 549f78bb61..8786915c11 100644 --- a/testing/sssd/APKBUILD +++ b/testing/sssd/APKBUILD @@ -1,5 +1,4 @@ # Contributor: Vince Mele <vmele@inoc.com> -# Contributor: Henrik Riomar <henrik.riomar@gmail.com> # Maintainer: Vince Mele <vmele@inoc.com> pkgname=sssd pkgver=1.16.3 @@ -51,7 +50,7 @@ makedepends=" keyutils-dev " subpackages="$pkgname-dev $pkgname-openrc" -source="https://releases.pagure.org/SSSD/sssd/sssd-$pkgver.tar.gz +source="https://releases.pagure.org/SSSD/$pkgname/$pkgname-$pkgver.tar.gz 0001-makefile.patch 0002-src.patch 0003-alpine.patch @@ -59,9 +58,11 @@ source="https://releases.pagure.org/SSSD/sssd/sssd-$pkgver.tar.gz nss.h cifsidmap.h " +builddir="$srcdir/$pkgname-$pkgver" + prepare() { default_prepare - cp $srcdir/nss.h $srcdir/cifsidmap.h $builddir/src/ + cp "$srcdir"/nss.h "$srcdir"/cifsidmap.h "$builddir"/src/ autoreconf -i } @@ -97,17 +98,17 @@ check() { } package() { - make -j1 DESTDIR="$pkgdir" install + make -j1 DESTDIR=$pkgdir install # Remove files we don't want to package - find ${pkgdir:?} -name '*.la' -delete - find ${pkgdir:?} -name '*.pyc' -delete - find ${pkgdir:?} -name '*.egg-info' -delete + find "$pkgdir" -name '*.la' -delete + find "$pkgdir" -name '*.pyc' -delete + find "$pkgdir" -name '*.egg-info' -delete - rm -rf ${pkgdir:?}/usr/share - rm -rf ${pkgdir:?}/lib - rm -rf ${pkgdir:?}/run - rm -rf ${pkgdir:?}/usr/lib/ldb/modules/ldb/memberof.la + rm -rf "$pkgdir"/usr/share + rm -rf "$pkgdir"/lib + rm -rf "$pkgdir"/run + rm -rf "$pkgdir"/usr/lib/ldb/modules/ldb/memberof.la } sha512sums="6165923f652f624bbe3ddc625ae682c4867eb7a20652d0cf74bbb8dda2307c917d3189ede26fd21a4fb5fd5926149271a65fa09f3affe928029ed99e6422b728 sssd-1.16.3.tar.gz |