main/alpine-baselayout: modernize APKBUILD

1 files changed, 19 insertions, 50 deletions

diff --git a/main/alpine-baselayout/APKBUILD b/main/alpine-baselayout/APKBUILD
index e3493f36f5..a4a7a6a3c1 100644
--- a/main/alpine-baselayout/APKBUILD
+++ b/main/alpine-baselayout/APKBUILD
@@ -7,7 +7,6 @@ pkgdesc="Alpine base dir structure and init scripts"
 url="http://git.alpinelinux.org/cgit/aports/tree/main/alpine-baselayout"
 arch="all"
 license="GPL2"
-depends=""
 pkggroups="shadow"
 options="!fhs"
 install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-upgrade
@@ -28,16 +27,16 @@ source="mkmntdirs.c
 	protocols
 	services
 	"
+builddir="$srcdir/build"
 
-_builddir="$srcdir"/build
 prepare() {
-	mkdir -p "$_builddir"
+	mkdir -p "$builddir"
 }
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	${CC:-${CROSS_COMPILE}gcc} $CPPFLAGS $CFLAGS $LDFLAGS \
-		"$srcdir"/mkmntdirs.c -o "$_builddir"/mkmntdirs
+		"$srcdir"/mkmntdirs.c -o "$builddir"/mkmntdirs
 
 	# generate shadow
 	awk -F: '{
@@ -45,7 +44,6 @@ build() {
 		if ($1 == "root") { pw = "::" }
 		print($1 pw ":0:::::")
 	}' "$srcdir"/passwd > shadow
-
 }
 
 package() {
@@ -103,25 +101,22 @@ package() {
 		var/log \
 		var/opt \
 		var/spool \
-		var/spool/cron \
-		|| return 1
+		var/spool/cron
 
 	ln -s /run var/run
-	install -d -m 0555 var/empty || return 1
-	install -d -m 0700 "$pkgdir"/root || return 1
-	install -d -m 1777 "$pkgdir"/tmp "$pkgdir"/var/tmp || return 1
-	install -m755 "$_builddir"/mkmntdirs "$pkgdir"/sbin/mkmntdirs \
-		|| return 1
-
-	install -m600 "$srcdir"/crontab "$pkgdir"/etc/crontabs/root || return 1
-	install -m644 "$srcdir"/color_prompt "$pkgdir"/etc/profile.d/ \
-		|| return 1
+	install -d -m 0555 var/empty
+	install -d -m 0700 "$pkgdir"/root
+	install -d -m 1777 "$pkgdir"/tmp "$pkgdir"/var/tmp
+	install -m755 "$builddir"/mkmntdirs "$pkgdir"/sbin/mkmntdirs
+
+	install -m600 "$srcdir"/crontab "$pkgdir"/etc/crontabs/root
+	install -m644 "$srcdir"/color_prompt "$pkgdir"/etc/profile.d/
 	install -m644 \
 		"$srcdir"/aliases.conf \
 		"$srcdir"/blacklist.conf \
 		"$srcdir"/i386.conf \
 		"$srcdir"/kms.conf \
-		"$pkgdir"/etc/modprobe.d/ || return 1
+		"$pkgdir"/etc/modprobe.d/
 
 	echo "UTC" > "$pkgdir"/etc/TZ
 	echo "localhost" > "$pkgdir"/etc/hostname
@@ -168,46 +163,20 @@ EOF
 		"$srcdir"/profile \
 		"$srcdir"/protocols \
 		"$srcdir"/services \
-		"$pkgdir"/etc/ || return 1
+		"$pkgdir"/etc/
 
-	install -m640 -g shadow "$_builddir"/shadow \
-		"$pkgdir"/etc/ || return 1
+	install -m640 -g shadow "$builddir"/shadow \
+		"$pkgdir"/etc/
 
 	# symlinks
 	ln -s /etc/crontabs "$pkgdir"/var/spool/cron/crontabs
 	ln -s /proc/mounts "$pkgdir"/etc/mtab
-
 }
-md5sums="db115e3302157a836a746bfd1d3f39be  mkmntdirs.c
-6e67923e98287d5133b565acd44cb506  crontab
-d7da26e76752b2e31c66b63f40a73397  color_prompt
-6945faabb2a18cee73c0a6d78b499084  aliases.conf
-0ea6be55b18804f166e6939e9d5f4099  blacklist.conf
-f9e3eac60200d41dd5569eeabb4eddff  i386.conf
-17ba4f49c51dd2ba49ccceb0ecadaca4  kms.conf
-e76b843364cfde89db77f838e4af9ee3  group
-e16a056e48e7003b7aa08cb4034d3228  inittab
-5d620e5b17afaa6d66dc1044780a0a07  passwd
-2939a40b911cac04c85263072c663973  profile
-394f8cd9fbf549f1d1b9a5bba680fc92  protocols
-5278bea4f45f4e289f72897b84dcb909  services"
-sha256sums="44ca046e8188a4c9d32577470c1cbb864fe20889a3c4e6309d1d665c4c13a852  mkmntdirs.c
-575d810a9fae5f2f0671c9b2c0ce973e46c7207fbe5cb8d1b0d1836a6a0470e3  crontab
-a00b56dbd437d3f2c32ced50974daa3cfc84a8dd1cbaf75cf307be20b398fc75  color_prompt
-3e2daa0326fc4d73921cd693dff47b211d0ba3d92ad62fca072c259600695693  aliases.conf
-70becab743ff2071247bd144499eadbb1b42a5436dcc63991d69aa63ee2fe755  blacklist.conf
-6c46c4cbfb8b7594f19eb94801a350fa2221ae9ac5239a8819d15555caa76ae8  i386.conf
-079f74b93a4df310f55f60fea5e05996d3267c50076ae16402fa9e497ea5fdb2  kms.conf
-132d13f9260edf201efd1400b830ec39d25769c1a5b5a5dc74acdfed126f9d0a  group
-54a5f36970125bf70cdf7b215c9e12a287d92ad76a693bd72aec4cbc5645df87  inittab
-3dcaeb5a9ee2cf8808565a7108aafe4f97ffdc47dbaac5c3eac4e68ff31b6176  passwd
-8ef550a4efc4bed1630b47c48aefbf1c63ae6e8d9c1246be92135465965712d2  profile
-a6695dbd53b87c7b41dfdafd40b1c8ba34fed2f0fa8eaaa296ad17c0b154603e  protocols
-e96af627f7774e8c87b0de843556a355fea6150c4d64fa4e2ff2c5fd610e7a79  services"
-sha512sums="94a75cbd309e7b7d3b1bbbddb6f361335336d804c2a331b9963de7cee38633217bcd533b4b29a4333ba477c6a13fe9a160c822108027a03a84b334bc76bf8ebd  mkmntdirs.c
+
+sha512sums="199a34716b1f029407b08679fed4fda58384a1ccefbbec9abe1c64f4a3f7ad2a89bc7c02fc19a7f791f7c6bb87f9f0c708cb3f18c027cb7f54f25976eba4b839  mkmntdirs.c
 6e169c0975a1ad1ad871a863e8ee83f053de9ad0b58d94952efa4c28a8c221445d9e9732ad8b52832a50919c2f39aa965a929b3d5b3f9e62f169e2b2e0813d82  crontab
 7fcb5df98b0f19e609cb9444b2e6ca5ee97f5f308eb407436acdd0115781623fd89768a9285e9816e36778e565b6f27055f2a586a58f19d6d880de5446d263c4  color_prompt
-8d55acb0457eec4008ba09c3de92fed6893b72d062edd5dcd74016e9c6c4dfeba7e86620e59d21a7adce11377ec793812c90e9d9771a804097fa64cff646666c  aliases.conf
+bfe947bdd69e7d93b32c8cb4e2cabe5717cb6c1e1f49a74015ac2cfb13e96d1f12c4be23ae93a1d61aaa3760d33a032fa9bd99f227fb21223a76b5f5908acc65  aliases.conf
 2b8e55339955c9670b5b9832bf57e711aca70cd2ebf815a9623fbb7fcd440cca4dd6a4862750885f779080d5c5416de197ff9a250cf116b1c8cf130fafbdaae8  blacklist.conf
 49109d434b577563849c43dd8141961ca798dada74d4d3f49003dac1911f522c43438b8241fa254e4faacdd90058f4d39a7d69b1f493f6d57422c1f706547c95  i386.conf
 b407351a5a64b00100753a13a91f4b1cb51017ae918a91fd37f3a6e76e3b6f562be643e74f969a888bdd54b0ad2d09e3b283d44ae4b5efccca7d7e9f735c5afb  kms.conf