summaryrefslogtreecommitdiff
path: root/data/system-cmds
diff options
context:
space:
mode:
Diffstat (limited to 'data/system-cmds')
l---------data/system-cmds/_metadata/libutil.dep1
-rw-r--r--data/system-cmds/make.sh10
-rw-r--r--data/system-cmds/reboot.diff16
-rw-r--r--data/system-cmds/shutdown.diff12
4 files changed, 28 insertions, 11 deletions
diff --git a/data/system-cmds/_metadata/libutil.dep b/data/system-cmds/_metadata/libutil.dep
new file mode 120000
index 000000000..828c65dfc
--- /dev/null
+++ b/data/system-cmds/_metadata/libutil.dep
@@ -0,0 +1 @@
+../../libutil \ No newline at end of file
diff --git a/data/system-cmds/make.sh b/data/system-cmds/make.sh
index 8c7a28e90..4981007fa 100644
--- a/data/system-cmds/make.sh
+++ b/data/system-cmds/make.sh
@@ -9,11 +9,8 @@ for gperf in *.gperf; do
done
cd ..
-arm-apple-darwin-gcc -o passwd passwd.tproj/!(od_passwd).c -I. -DTARGET_OS_EMBEDDED
-arm-apple-darwin-strip passwd
-
-arm-apple-darwin-gcc -o dmesg dmesg.tproj/*.c -I.
-arm-apple-darwin-strip dmesg
+${PKG_TARG}-gcc -o passwd passwd.tproj/!(od_passwd).c -I. -DTARGET_OS_EMBEDDED
+${PKG_TARG}-gcc -o dmesg dmesg.tproj/*.c -I.
cp -va "${PKG_DATA}"/kextmanager* .
# XXX: shutdown
@@ -25,8 +22,7 @@ for tproj in getconf getty hostinfo iostat login nvram reboot sync sysctl vipw z
;; esac
echo "${tproj}"
- arm-apple-darwin-gcc -o "${tproj}" "${tproj}.tproj"/*.c -I. -D'__FBSDID(x)=' -DTARGET_OS_EMBEDDED -framework CoreFoundation -framework IOKit kextmanagerUser.c ${cflags}
- arm-apple-darwin-strip "${tproj}"
+ ${PKG_TARG}-gcc -o "${tproj}" "${tproj}.tproj"/*.c -I. -D'__FBSDID(x)=' -DTARGET_OS_EMBEDDED -framework CoreFoundation -framework IOKit kextmanagerUser.c ${cflags}
done
chmod u+s passwd login
diff --git a/data/system-cmds/reboot.diff b/data/system-cmds/reboot.diff
index 21d11a3bd..4c9dc152d 100644
--- a/data/system-cmds/reboot.diff
+++ b/data/system-cmds/reboot.diff
@@ -1,7 +1,15 @@
-diff -r -u system_cmds-431/reboot.tproj/reboot.c system_cmds-431+iPhone/reboot.tproj/reboot.c
+diff -ru system_cmds-431/reboot.tproj/reboot.c system_cmds-431+iPhone/reboot.tproj/reboot.c
--- system_cmds-431/reboot.tproj/reboot.c 2007-09-06 20:46:17.000000000 +0000
-+++ system_cmds-431+iPhone/reboot.tproj/reboot.c 2008-02-12 11:29:02.000000000 +0000
-@@ -81,11 +81,9 @@
++++ system_cmds-431+iPhone/reboot.tproj/reboot.c 2008-03-30 20:43:53.000000000 +0000
+@@ -63,7 +63,6 @@
+ #include <mach/mach_port.h> // allocate
+ #include <mach/mach.h> // task_self, etc
+ #include <servers/bootstrap.h> // bootstrap
+-#include <reboot2.h>
+ #endif
+
+ void usage(void);
+@@ -81,11 +80,9 @@
int ch, howto, kflag, lflag, nflag, qflag, uflag;
char *p;
const char *user;
@@ -13,7 +21,7 @@ diff -r -u system_cmds-431/reboot.tproj/reboot.c system_cmds-431+iPhone/reboot.t
if (strstr((p = rindex(*argv, '/')) ? p + 1 : *argv, "halt")) {
dohalt = 1;
-@@ -240,19 +238,16 @@
+@@ -240,19 +237,16 @@
}
#endif
diff --git a/data/system-cmds/shutdown.diff b/data/system-cmds/shutdown.diff
new file mode 100644
index 000000000..8526c7534
--- /dev/null
+++ b/data/system-cmds/shutdown.diff
@@ -0,0 +1,12 @@
+diff -r -u system_cmds-431/shutdown.tproj/shutdown.c system_cmds-431+iPhone/shutdown.tproj/shutdown.c
+--- system_cmds-431/shutdown.tproj/shutdown.c 2007-09-06 21:59:26.000000000 +0000
++++ system_cmds-431+iPhone/shutdown.tproj/shutdown.c 2008-02-25 22:30:51.000000000 +0000
+@@ -471,7 +471,7 @@
+ if (nosync) howto |= RB_NOSYNC;
+
+ // launchd(8) handles reboot. This call returns NULL on success.
+- exit(reboot2(howto) == NULL ? EXIT_SUCCESS : EXIT_FAILURE);
++ reboot(howto);
+ }
+ /* NOT-REACHED */
+