summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoréclairevoyant2023-06-01 19:54:17 -0400
committeréclairevoyant2023-06-01 19:54:17 -0400
commit5e4ac7683d5968a96f2ae7fd74eb68a548c2043e (patch)
treef4ce58846e5badfb25857dd86b8d810155781bba
parent1eac5265df9fc73841ac658fbb117582270c3aa5 (diff)
downloadaur-5e4ac7683d5968a96f2ae7fd74eb68a548c2043e.tar.gz
sysvinit: remove /bin, /sbin dirs; move /sbin symlinks to /usr/bin
-rw-r--r--.SRCINFO4
-rw-r--r--.gitignore10
-rw-r--r--PKGBUILD4
-rw-r--r--sysvinit-makefile.patch28
4 files changed, 33 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b5165665fa8b..7ab7ead6a7fc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = sysvinit
pkgdesc = Linux System V Init
pkgver = 3.07
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/slicer69/sysvinit
arch = i686
arch = x86_64
@@ -17,6 +17,6 @@ pkgbase = sysvinit
validpgpkeys = C1A4432D88896729E4300B04AFD1B98BF3273812
b2sums = 51943290c5f41ac6eb421a3ee1529d07bc127a44306973a2f3180079a28119001ad6b44c25156986fe249dd025f5eb1929189edfb5da72ee4fa64b5fd4cd5993
b2sums = SKIP
- b2sums = 8877b4523b2aeb75e602e4ef53007e9258a76a1a981e620ea3c6e275a97257f9efb060f102ea95a914c3729bd26fcc360b5613276641b61d452417bff2fa6878
+ b2sums = 7a3b8f3d84b4cf1dadc00ee2ee62d2e5cc74bba202cdf6a3d424974ace65f91ca1a68a9cfc15027988098b0b6e7c974d30cb3aaf90524ba69d2355b6df70b8b8
pkgname = sysvinit
diff --git a/.gitignore b/.gitignore
index 0789591f0610..42bb85301f8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-*
-!.gitignore
-!.SRCINFO
-!PKGBUILD
-!sysvinit-makefile.patch
+/*
+!/.gitignore
+!/.SRCINFO
+!/PKGBUILD
+!/sysvinit-makefile.patch
diff --git a/PKGBUILD b/PKGBUILD
index 7e6ad24720fa..7254054e35f3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=sysvinit
pkgver=3.07
-pkgrel=1
+pkgrel=2
pkgdesc='Linux System V Init'
url="https://github.com/slicer69/$pkgname"
arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ source=($url/releases/download/$pkgver/$pkgname-$pkgver.tar.xz{,.sig}
$pkgname-makefile.patch)
b2sums=('51943290c5f41ac6eb421a3ee1529d07bc127a44306973a2f3180079a28119001ad6b44c25156986fe249dd025f5eb1929189edfb5da72ee4fa64b5fd4cd5993'
'SKIP'
- '8877b4523b2aeb75e602e4ef53007e9258a76a1a981e620ea3c6e275a97257f9efb060f102ea95a914c3729bd26fcc360b5613276641b61d452417bff2fa6878')
+ '7a3b8f3d84b4cf1dadc00ee2ee62d2e5cc74bba202cdf6a3d424974ace65f91ca1a68a9cfc15027988098b0b6e7c974d30cb3aaf90524ba69d2355b6df70b8b8')
validpgpkeys=(
'5A2DC686CDC5D6087D88C198351F75FA45D53656' # sysvinit-verification-key-2.pub
'C1A4432D88896729E4300B04AFD1B98BF3273812' # sysvinit-verification-key-3.pub
diff --git a/sysvinit-makefile.patch b/sysvinit-makefile.patch
index 19eaf0ae95c4..3a748f070980 100644
--- a/sysvinit-makefile.patch
+++ b/sysvinit-makefile.patch
@@ -19,10 +19,30 @@
ifeq ($(DISTRO),)
SBIN += sulogin bootlogd
-@@ -213,10 +213,6 @@
- ln -sf halt $(ROOT)/sbin/reboot
- ln -sf halt $(ROOT)/sbin/poweroff
- ln -sf init $(ROOT)/sbin/telinit
+@@ -196,27 +196,16 @@
+ distclean: clobber
+
+ install: all
+- $(INSTALL_DIR) $(ROOT)/bin/ $(ROOT)/sbin/
+ $(INSTALL_DIR) $(ROOT)/usr/bin/
+- for i in $(BIN); do \
+- $(INSTALL_EXEC) $$i $(ROOT)/bin/ ; \
+- done
+- for i in $(SBIN); do \
+- $(INSTALL_EXEC) $$i $(ROOT)/sbin/ ; \
+- done
+ for i in $(USRBIN); do \
+ $(INSTALL_EXEC) $$i $(ROOT)/usr/bin/ ; \
+ done
+ # $(INSTALL_DIR) $(ROOT)/etc/
+ $(INSTALL_DIR) $(ROOT)/etc/inittab.d
+ # $(INSTALL_EXEC) ../doc/initscript.sample $(ROOT)/etc/
+- ln -sf halt $(ROOT)/sbin/reboot
+- ln -sf halt $(ROOT)/sbin/poweroff
+- ln -sf init $(ROOT)/sbin/telinit
++ ln -sf halt $(ROOT)/usr/bin/reboot
++ ln -sf halt $(ROOT)/usr/bin/poweroff
++ ln -sf init $(ROOT)/usr/bin/telinit
- ln -sf ../sbin/killall5 $(ROOT)/bin/pidof
- if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
- ln -sf last $(ROOT)/usr/bin/lastb; \