system/adelie-base: improvements, finally ship an /etc/group

1 files changed, 30 insertions, 7 deletions

diff --git a/system/adelie-base/APKBUILD b/system/adelie-base/APKBUILD
index eb5bc6650..8ac9d9f6d 100644
--- a/system/adelie-base/APKBUILD
+++ b/system/adelie-base/APKBUILD
@@ -3,26 +3,38 @@
 
 pkgname=adelie-base
 pkgver=0.3.2
-pkgrel=0
+pkgrel=1
 pkgdesc="The Adélie Linux Base System"
 url="http://adelielinux.org/"
 arch="noarch"
 license="NCSA"
-depends="apk-tools shadow sysklogd libarchive zsh binutils at coreutils diffutils fcron file findutils shimmy grep procps util-linux mailx man-db patch sed sharutils bc vim psmisc net-tools kbd less"
+depends="apk-tools shadow sysklogd libarchive-tools zsh binutils at coreutils diffutils fcron file findutils shimmy grep procps util-linux mailx man-db patch sed sharutils bc vim psmisc net-tools kbd less"
 makedepends=""
 install=""
-options="!fhs"
-subpackages="$pkgname-doc $pkgname-posix $pkgname-lsb"
-source="https://distfiles.adelielinux.org/source/$pkgname/$pkgname-$pkgver.tar.xz"
+options="!check !fhs"
+subpackages="$pkgname-doc $pkgname-posix $pkgname-lsb dev-kit:devkit"
+source="https://distfiles.adelielinux.org/source/$pkgname/$pkgname-$pkgver.tar.xz
+	group
+	passwd"
 
 build() {
-	return 0
+	# 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
 }
 
 package() {
 	cd "$builddir"
 	mkdir -p "$pkgdir"
 	make install DESTDIR="$pkgdir"
+	install -m644 "$srcdir"/group "$pkgdir"/etc/group
+	install -m644 "$srcdir"/passwd "$pkgdir"/etc/passwd
 }
 
 doc() {
@@ -35,14 +47,25 @@ doc() {
 
 posix() {
 	depends="cflow cups ed m4 ncompress pax"
+	pkgdesc="$pkgdesc - Additional POSIX tools"
 	mkdir -p "$subpkgdir"
 	return 0
 }
 
 lsb() {
 	depends="gettext gzip libarchive-tools linux-pam make mawk ncurses nspr nss"
+	pkgdesc="$pkgdesc - Additional LSB tools"
+	mkdir -p "$subpkgdir"
+	return 0
+}
+
+devkit() {
+	depends="build-tools fakeroot gzip libarchive-tools mawk xz"
+	pkgdesc="The Adélie Linux Development Kit"
 	mkdir -p "$subpkgdir"
 	return 0
 }
 
-sha512sums="bc8369dec474262de74117789db26130ffd7664f33235fad363771891ce8e64ce339f803509fc044339d8ff173dcf4b1c3cebab6fbcf4d91e3af7d2fb75580c3  adelie-base-0.3.2.tar.xz"
+sha512sums="bc8369dec474262de74117789db26130ffd7664f33235fad363771891ce8e64ce339f803509fc044339d8ff173dcf4b1c3cebab6fbcf4d91e3af7d2fb75580c3  adelie-base-0.3.2.tar.xz
+e6775b9e1c6421338aaceee375b3b74aa100fd444e369b280ce45c9167119b76bebc11737d7f929e50e20a553a35e0e25f7d0f71deb0483d3bccc08e319dcf98  group
+595d7d4ab873545b3b69b8cd028674f72d2c0b8cb4dce3fe59cf6f88e20ef5c803f4ac8e98ba93f6306f8950ef77049112cba58035adb7ae68f8ea95e9fb6610  passwd"