summaryrefslogtreecommitdiff
path: root/sys-process/minit
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-04-21 12:05:28 +0100
committerV3n3RiX <venerix@koprulu.sector>2024-04-21 12:05:28 +0100
commit490ef2c2dc8b4e808f37add1adee21a754efd9a9 (patch)
treee235cdf15550b3d2f644b6fc4a8aa726971416f5 /sys-process/minit
parentda7ae1dd1fccb6b3c0e4763ab983ad96d57bf463 (diff)
gentoo auto-resync : 21:04:2024 - 12:05:28
Diffstat (limited to 'sys-process/minit')
-rw-r--r--sys-process/minit/Manifest4
-rw-r--r--sys-process/minit/files/minit-0.10-fixes.diff20
-rw-r--r--sys-process/minit/minit-0.10-r2.ebuild (renamed from sys-process/minit/minit-0.10-r1.ebuild)17
3 files changed, 21 insertions, 20 deletions
diff --git a/sys-process/minit/Manifest b/sys-process/minit/Manifest
index 41293e468537..45304f21e4b1 100644
--- a/sys-process/minit/Manifest
+++ b/sys-process/minit/Manifest
@@ -1,4 +1,4 @@
-AUX minit-0.10-fixes.diff 1916 BLAKE2B 4c277a5f25838533074515edf5b11244ad94350ebb5dce0bfef66ba7c022f5d68e54e568da851c610c2da832cfec6b0a1d53d990b5e9725b4b7b5bcdfbcfdea6 SHA512 dca96b6a5c6dba7d72f0df32a2d615aee7ffd9f640a20fa67b4fcd9a0f56e991033196e91090fd78c2ba1c38d013a4ca4b0a74e7ddc39f488354a8aafb281b00
+AUX minit-0.10-fixes.diff 1615 BLAKE2B 3398dcfa9dd4d5e30f55cb8dc9a43c3ba0f860828dc67a7b626e0ee9b9f22007f9fc63540360059f29372bec272c7b4d5071ee2268e3ead11807c943262d6ae7 SHA512 e42e2843fc258ec1cf62e5063a8f386902100035bf47e532903c4b46e8e87713790dd6d3c4d44964afffd15223398341963f7e542cd4ed609d90807c75f5558e
DIST minit-0.10.tar.bz2 26119 BLAKE2B 3520cb53192df3da87f2cd40247623a1c1c77cd728890aa7ee24804729429d955abe430e9f90e6786a5c4f8dc733aae8ea17f7488ef0650bb4ece356c2033713 SHA512 9c617ca9f3638a430ae8347ec4b3dc36c5b23c703f11c4d445c9abebb2e7cb2460424f5ed71112bb21e862818a45338926bc4de3d0ed8b2e99f7d296ca37479c
-EBUILD minit-0.10-r1.ebuild 934 BLAKE2B 74adeb15a44dacca463e7f4c8436e5eadaa61325a23c30b96f180c517386c11e1f5a810cb6d1fb292513b214571781d017f65ce6c531edfabddbd55e42367ff8 SHA512 4dd5afc99b797057101d108949de43a7002fea17b0a653212273b970d362d26d4fd1309d26a3040950184e27c0e038db4e4827b12c3b0b289a00e7c742661ccf
+EBUILD minit-0.10-r2.ebuild 972 BLAKE2B 415913c4b115578a45efb047faad142392e809d3abd359f4036c8310ece28f1bde6531eec8bfffa4f95a07d32e8ed879dc0c8d1051860660229ba6c78e344fd5 SHA512 b54ebb0830490c6c30372836d64e0ed65ad4c03620763a59903860e083d37919d15f1d9578a10e20a5ae81f0e4eb035391a6c712c13284271b5da47d0a8ca930
MISC metadata.xml 1031 BLAKE2B 1ed8454369c950213c77918374234b037b9ac2d2ccbd85088c2e2076963a300df54bebbfd1ea1a6b70bcd62cc8bb3cbbc046206ccc6cf7e3d3ce2f43f9a3d083 SHA512 9f1e1972606c77295afc5749bb1af14cba691d53ed6d072c862220ba8011d28cd005b1fa2a374008964a8ce199172541eb330c7da74a227aa46f044d450c8159
diff --git a/sys-process/minit/files/minit-0.10-fixes.diff b/sys-process/minit/files/minit-0.10-fixes.diff
index 5c80091f84f3..49b67c67a282 100644
--- a/sys-process/minit/files/minit-0.10-fixes.diff
+++ b/sys-process/minit/files/minit-0.10-fixes.diff
@@ -1,13 +1,12 @@
-diff -ru minit-0.10.orig/Makefile minit-0.10/Makefile
---- minit-0.10.orig/Makefile 2005-04-08 19:24:04.000000000 +0200
-+++ minit-0.10/Makefile 2008-11-27 23:05:57.000000000 +0100
+--- a/Makefile
++++ b/Makefile
@@ -7,7 +7,7 @@
CROSS=
#CROSS=arm-linux-
LDFLAGS=-s
-MANDIR=/usr/man
+MANDIR=/usr/share/man
-
+
path = $(subst :, ,$(PATH))
diet_path = $(foreach dir,$(path),$(wildcard $(dir)/diet))
@@ -44,9 +44,11 @@
@@ -21,13 +20,13 @@ diff -ru minit-0.10.orig/Makefile minit-0.10/Makefile
+hard-reboot: hard-reboot.o
+write_proc: write_proc.o
+killall5: killall5.o
-
+
%.o: %.c
$(DIET) $(CROSS)$(CC) $(CFLAGS) -c $<
@@ -61,22 +63,11 @@
test: test.c
gcc -nostdlib -o $@ $^ -I../dietlibc/include ../dietlibc/start.o ../dietlibc/dietlibc.a
-
+
-pidfilehack: pidfilehack.c
- $(DIET) $(CROSS)$(CC) $(CFLAGS) -o $@ $^
-
@@ -49,14 +48,13 @@ diff -ru minit-0.10.orig/Makefile minit-0.10/Makefile
install msvc serdo $(DESTDIR)/bin
install -m 4750 shutdown $(DESTDIR)/sbin
test -f $(DESTDIR)/sbin/init || ln $(DESTDIR)/sbin/minit $(DESTDIR)/sbin/init
-diff -ru minit-0.10.orig/serdo.c minit-0.10/serdo.c
---- minit-0.10.orig/serdo.c 2005-02-26 18:00:22.000000000 +0100
-+++ minit-0.10/serdo.c 2008-11-27 23:02:57.000000000 +0100
+--- a/serdo.c
++++ b/serdo.c
@@ -10,6 +10,7 @@
#define MAXENV 256
char* envp[MAXENV+2];
int envc;
+extern char **environ;
-
+
int continueonerror;
-
+
diff --git a/sys-process/minit/minit-0.10-r1.ebuild b/sys-process/minit/minit-0.10-r2.ebuild
index 38f8edebd305..06ea79028377 100644
--- a/sys-process/minit/minit-0.10-r1.ebuild
+++ b/sys-process/minit/minit-0.10-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit toolchain-funcs
@@ -15,8 +15,8 @@ KEYWORDS="amd64 x86"
DEPEND="
dev-libs/libowfat
- dev-libs/dietlibc"
-
+ dev-libs/dietlibc
+"
RDEPEND="${DEPEND}"
PATCHES=(
@@ -26,10 +26,13 @@ PATCHES=(
DOCS=( CHANGES README TODO )
src_compile() {
- emake CFLAGS="${CFLAGS} -I/usr/include/libowfat" \
- LDFLAGS="${LDFLAGS}" \
- DIET="diet"\
+ local mymakeflags=(
+ CFLAGS="${CFLAGS} -I/usr/include/libowfat"
+ LDFLAGS="${LDFLAGS}"
+ DIET="diet"
CC="$(tc-getCC)"
+ )
+ emake "${mymakeflags[@]}"
}
src_install() {