summaryrefslogtreecommitdiffstats
path: root/package/sysvinit
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-08-25 14:49:17 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2010-08-25 14:49:17 +0200
commita99b1bb24fa09ecbdcde0364514d3690caaadcc8 (patch)
tree7abf0c1fff6a0b871a2f5a12200d32a06c2c9d35 /package/sysvinit
parent2c31d745ac08e620d143cc266e2b7113754a8787 (diff)
parent311e0a6fc49a2135a3a5e1e63fe8b77c184cb8c9 (diff)
downloadbuildroot-novena-a99b1bb24fa09ecbdcde0364514d3690caaadcc8.tar.gz
buildroot-novena-a99b1bb24fa09ecbdcde0364514d3690caaadcc8.zip
Merge branch 'for-2010.08' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/sysvinit')
-rw-r--r--package/sysvinit/Config.in1
-rw-r--r--package/sysvinit/sysvinit.mk6
2 files changed, 4 insertions, 3 deletions
diff --git a/package/sysvinit/Config.in b/package/sysvinit/Config.in
index 82826dc93..34ec391c5 100644
--- a/package/sysvinit/Config.in
+++ b/package/sysvinit/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_SYSVINIT
bool "sysvinit"
- select BR2_PACKAGE_NCURSES
help
/sbin/init - parent of all processes
diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk
index 0b827e615..ef7c71321 100644
--- a/package/sysvinit/sysvinit.mk
+++ b/package/sysvinit/sysvinit.mk
@@ -21,14 +21,16 @@ $(SYSVINIT_DIR)/.unpacked: $(DL_DIR)/$(SYSVINIT_SOURCE)
touch $@
$(SYSVINIT_DIR)/$(SYSVINIT_BINARY): $(SYSVINIT_DIR)/.unpacked
- CFLAGS="$(TARGET_CFLAGS)" $(MAKE) CC="$(TARGET_CC)" -C $(SYSVINIT_DIR)/src
+ # Force sysvinit to link against libcrypt as it otherwise
+ # use an incorrect test to see if it's available
+ CFLAGS="$(TARGET_CFLAGS)" $(MAKE) CC="$(TARGET_CC)" LCRYPT="-lcrypt" -C $(SYSVINIT_DIR)/src
$(TARGET_DIR)/$(SYSVINIT_TARGET_BINARY): $(SYSVINIT_DIR)/$(SYSVINIT_BINARY)
for x in halt init shutdown; do \
install -D $(SYSVINIT_DIR)/src/$$x $(TARGET_DIR)/sbin/$$x || exit 1; \
done
-sysvinit: ncurses $(TARGET_DIR)/$(SYSVINIT_TARGET_BINARY)
+sysvinit: $(TARGET_DIR)/$(SYSVINIT_TARGET_BINARY)
sysvinit-source: $(DL_DIR)/$(SYSVINIT_SOURCE)