aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2019-12-16 15:13:24 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2019-12-16 15:16:46 +0000
commitd8d56f3702cefbfb5433283d1a5ac53e0884198c (patch)
treecea4aa010c11daead199eba37b201d7311d4106e
parentbc557fb7c8ba59c3ddd5f8c246290a5b91c0102f (diff)
downloadaports-d8d56f3702cefbfb5433283d1a5ac53e0884198c.tar.gz
aports-d8d56f3702cefbfb5433283d1a5ac53e0884198c.tar.bz2
aports-d8d56f3702cefbfb5433283d1a5ac53e0884198c.tar.xz
main/busybox-initscripts: move default.script to main/busybox
fixes #10586
-rw-r--r--main/busybox-initscripts/APKBUILD12
-rw-r--r--main/busybox/APKBUILD11
-rw-r--r--main/busybox/default.script (renamed from main/busybox-initscripts/default.script)0
3 files changed, 12 insertions, 11 deletions
diff --git a/main/busybox-initscripts/APKBUILD b/main/busybox-initscripts/APKBUILD
index 4f574727a9..6e39de7417 100644
--- a/main/busybox-initscripts/APKBUILD
+++ b/main/busybox-initscripts/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox-initscripts
pkgver=3.2
-pkgrel=1
+pkgrel=2
pkgdesc="Init scripts for busybox daemons"
url="https://git.alpinelinux.org/aports/tree/main/busybox-initscripts"
arch="noarch"
@@ -17,7 +17,7 @@ source="acpid.initd crond.initd dnsd.initd httpd.initd inetd.initd klogd.initd
mdev.initd ntpd.initd rdate.initd syslog.initd udhcpd.initd loadkmap.initd
watchdog.initd crond.confd klogd.confd ntpd.confd rdate.confd syslog.confd
watchdog.confd loadkmap.confd mdev.conf dvbdev ide_links usbdev usbdisk_link
- xvd_links default.script
+ xvd_links
"
package() {
@@ -41,11 +41,6 @@ package() {
poweroff
EOF
chmod +x "$pkgdir"/etc/acpi/PWRF/00000080
-
- # script for udhcpc
- install -Dm755 "$srcdir"/default.script \
- "$pkgdir"/usr/share/udhcpc/default.script || return 1
-
}
sha512sums="dd548670114a92404b8e35fb915fdbe5994498b05b0a418583271c3dd72fb7800950e42c095c902a014eb198c046b8a346d43dccd8e7a158048ae33767c572ed acpid.initd
@@ -73,5 +68,4 @@ ebd82f935da2ca89097234dd8a8f47e179a423652c151123a1f3343f3e1e7bfaba2b8800380e988d
0142234d0bda86ad1e5f88f1da34669e5fda46a0fd52ce507bd49ce74d2b7c12c323e8db863bccb924e6d632b568db8b243361b217c5b2e1d92a25feb6e62dec ide_links
b2dcf0ded9264334d79fbbb05dd12d649dc3119a060db5893f0e8aeca2141323961c3ba4c822a0ffb00dba848742d5cb374dc77e776b57cecde352a3e8e30f8a usbdev
392c40d223bdff59a624bd67907c06cff9c1b5468c25c19e10dbc3cef3208275d93966e760f140d71a86cb36ec796ea08dbaa767b40c12e9326c3c72964b28a8 usbdisk_link
-5db6fa8bbb2d891212187c598cd8703277b3fcb95b5dba6628f7128eb48cc7c1bf4c53885e9d870999c8c95d2fe9cd27609b523596dc553c31b6f72a452a0118 xvd_links
-788e3525af419dadff5a46f672b9356a1d9f8a3360523e8e247b926a67180212a002adb2499293d3455cce67a95ed8e2c27f9327ae1a5271f6e7f320dc1c2b98 default.script"
+5db6fa8bbb2d891212187c598cd8703277b3fcb95b5dba6628f7128eb48cc7c1bf4c53885e9d870999c8c95d2fe9cd27609b523596dc553c31b6f72a452a0118 xvd_links"
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index a94231c181..af91880261 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox
pkgver=1.31.1
-pkgrel=4
+pkgrel=5
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url="https://busybox.net/"
arch="all"
@@ -41,6 +41,7 @@ source="https://busybox.net/downloads/busybox-$pkgver.tar.bz2
bbsuid.c
dad.if-up
ssl_client.c
+ default.script
"
# secfixes:
@@ -163,6 +164,11 @@ tty9
tty10
tty11
EOF
+
+ # script for udhcpc
+ install -Dm755 "$srcdir"/default.script \
+ "$pkgdir"/usr/share/udhcpc/default.script
+
}
extras() {
@@ -220,4 +226,5 @@ aa93095e20de88730f526c6f463cef711b290b9582cdbd8c1ba2bd290019150cbeaa7007c2e15f03
5f9739b9d0c1ba5d77e3153c373593a1bcb813cf466f951b00a2a040262e5077fb13c1a7aa17d67d1533a473bfcacc1a22833b7f491b4dde9dcb5638ad585f9a busyboxconfig-extras
0becc2186d6c32fb0c401cf7bc0e46268b38ce8892db33be1daf40273024c1c02d518283f44086a313a2ccef34230a1d945ec148cc173f26e6aa9d88a7426e54 bbsuid.c
b993ce589685d5d1f806153d0b7f71657f2d37556654ec60884130a40f09acc4944a13e0a4d02914000bedd779e5a35da08c760fed5f7ca5b601243aff7ba2c9 dad.if-up
-646ad9aefe3596d0170d92c8506ca1846e43b5b83cbef97ae565f15ffa7b14665a8c7061bc69c608c043f834c134c5d63f042509f8999031e89163508a868e46 ssl_client.c"
+646ad9aefe3596d0170d92c8506ca1846e43b5b83cbef97ae565f15ffa7b14665a8c7061bc69c608c043f834c134c5d63f042509f8999031e89163508a868e46 ssl_client.c
+788e3525af419dadff5a46f672b9356a1d9f8a3360523e8e247b926a67180212a002adb2499293d3455cce67a95ed8e2c27f9327ae1a5271f6e7f320dc1c2b98 default.script"
diff --git a/main/busybox-initscripts/default.script b/main/busybox/default.script
index 8c786f8740..8c786f8740 100644
--- a/main/busybox-initscripts/default.script
+++ b/main/busybox/default.script