e0c418e13
Rob Landley
2005-12-15
Subject
The rest of Yann E. Morin's install revamp.
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
Rules.mak+12 -0
| @@ -205,4 +205,16 @@ endif | |
| # have a chance of winning. | |
| CFLAGS += $(CFLAGS_EXTRA) | |
| + | #------------------------------------------------------------ |
| + | # Installation options |
| + | ifeq ($(strip $(CONFIG_INSTALL_APPLET_HARDLINKS)),y) |
| + | INSTALL_OPTS=--hardlinks |
| + | endif |
| + | ifeq ($(strip $(CONFIG_INSTALL_APPLET_SYMLINKS)),y) |
| + | INSTALL_OPTS=--symlinks |
| + | endif |
| + | ifeq ($(strip $(CONFIG_INSTALL_APPLET_DONT)),y) |
| + | INSTALL_OPTS= |
| + | endif |
| + | |
| .PHONY: dummy | |
applets/install.sh+6 -5
| @@ -8,12 +8,13 @@ if [ "$prefix" = "" ]; then | |
| echo "No installation directory, aborting." | |
| exit 1; | |
| fi | |
| - | if [ "$2" = "--hardlinks" ]; then |
| - | linkopts="-f" |
| - | else |
| - | linkopts="-fs" |
| - | fi |
| h=`sort busybox.links | uniq` | |
| + | case "$2" in |
| + | --hardlinks) linkopts="-f";; |
| + | --symlinks) linkopts="-fs";; |
| + | "") h="";; |
| + | *) echo "Unknown install option: $2"; exit 1;; |
| + | esac |
| rm -f $prefix/bin/busybox || exit 1 | |
sysdeps/linux/Config.in+29 -0
| @@ -229,6 +229,35 @@ config CONFIG_INSTALL_NO_USR | |
| Disable use of /usr. Don't activate this option if you don't know | |
| that you really want this behaviour. | |
| + | choice |
| + | prompt "Applets links" |
| + | default CONFIG_INSTALL_APPLET_SYMLINKS |
| + | help |
| + | Choose how you install applets links. |
| + | |
| + | config CONFIG_INSTALL_APPLET_SYMLINKS |
| + | bool "as soft-links" |
| + | help |
| + | Install applets as soft-links to the busybox binary. This needs some |
| + | free inodes on the filesystem, but might help with filesystem |
| + | generators that can't cope with hard-links. |
| + | |
| + | config CONFIG_INSTALL_APPLET_HARDLINKS |
| + | bool "as hard-links" |
| + | help |
| + | Install applets as hard-links to the busybox binary. This might count |
| + | on a filesystem with few inodes. |
| + | |
| + | config CONFIG_INSTALL_APPLET_DONT |
| + | bool |
| + | prompt "not installed" |
| + | depends on CONFIG_FEATURE_INSTALLER || CONFIG_FEATURE_SH_STANDALONE_SHELL |
| + | help |
| + | Do not install applets links. Usefull when using the -install feature |
| + | or a standalone shell for rescue pruposes. |
| + | |
| + | endchoice |
| + | |
| config PREFIX | |
| string "BusyBox installation prefix" | |
| default "./_install" | |