summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2018-06-24 00:46:43 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2018-06-24 00:46:43 -0500
commita91fdfc3f349f1693d6cf8e9d5a5303c9e3be17a (patch)
treebb1a51c04b422a3d2680c2e552a0c41ffc423d37
parent212b007ad0f3b1c4e4ae1406162d7d7840176cc0 (diff)
downloadpackages-a91fdfc3f349f1693d6cf8e9d5a5303c9e3be17a.tar.gz
packages-a91fdfc3f349f1693d6cf8e9d5a5303c9e3be17a.tar.bz2
packages-a91fdfc3f349f1693d6cf8e9d5a5303c9e3be17a.tar.xz
packages-a91fdfc3f349f1693d6cf8e9d5a5303c9e3be17a.zip
system/adelie-base: apk-tools deps on cacerts now so drop it; add adelie-keys dep
-rw-r--r--system/adelie-base/APKBUILD18
1 files changed, 10 insertions, 8 deletions
diff --git a/system/adelie-base/APKBUILD b/system/adelie-base/APKBUILD
index da2ae58a4..c26a7766c 100644
--- a/system/adelie-base/APKBUILD
+++ b/system/adelie-base/APKBUILD
@@ -2,12 +2,12 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=adelie-base
pkgver=0.7.0
-pkgrel=0
+pkgrel=1
pkgdesc="The Adélie Linux Base System"
url="http://adelielinux.org/"
arch="noarch"
license="NCSA"
-depends="apk-tools ca-certificates shadow debianutils
+depends="apk-tools adelie-keys shadow debianutils
libarchive-tools file shimmy grep procps
zsh bash
binutils coreutils diffutils findutils sharutils
@@ -28,18 +28,18 @@ source="https://distfiles.adelielinux.org/source/$pkgname/$pkgname-$pkgver.tar.x
"
build() {
- # taken from Alpine Base Layout
-
- # generate shadow
+ # taken from Alpine Base Layout: generate shadow
awk -F: '{
pw = ":!:"
if ($1 == "root") { pw = "::" }
print($1 pw ":0:::::")
}' "$srcdir"/passwd > "$builddir"/tree/etc/shadow
chmod 640 "$builddir"/tree/etc/shadow
- rm "$builddir"/tree/dev/.dirkeep
- rm "$builddir"/tree/proc/.dirkeep
- rm "$builddir"/tree/sys/.dirkeep
+
+ # kill files that sometimes get in release.tar
+ rm "$builddir"/tree/dev/.dirkeep || true
+ rm "$builddir"/tree/proc/.dirkeep || true
+ rm "$builddir"/tree/sys/.dirkeep || true
}
package() {
@@ -51,12 +51,14 @@ package() {
install -m640 -g shadow "$builddir"/tree/etc/shadow "$pkgdir"/etc/shadow
# stupid inflatable stupid busybox
+ local i
for i in adduser addgroup; do
install -m755 "$srcdir"/$i "$pkgdir"/usr/sbin/$i
done
}
doc() {
+ local _doc DOCS
DOCS="CONTRIBUTING.rst LICENSE README.rst"
for _doc in $DOCS; do
install -Dm644 "$srcdir"/$pkgname-$pkgver/$_doc \