The rest of Yann E. Morin's install revamp.

This commit is contained in:
Rob Landley 2005-12-15 07:25:54 +00:00
parent 164c5c80ba
commit e0c418e13b
3 changed files with 47 additions and 5 deletions

View File

@ -205,4 +205,16 @@ endif
# have a chance of winning. # have a chance of winning.
CFLAGS += $(CFLAGS_EXTRA) 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 .PHONY: dummy

View File

@ -8,12 +8,13 @@ if [ "$prefix" = "" ]; then
echo "No installation directory, aborting." echo "No installation directory, aborting."
exit 1; exit 1;
fi fi
if [ "$2" = "--hardlinks" ]; then
linkopts="-f"
else
linkopts="-fs"
fi
h=`sort busybox.links | uniq` 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 rm -f $prefix/bin/busybox || exit 1

View File

@ -229,6 +229,35 @@ config CONFIG_INSTALL_NO_USR
Disable use of /usr. Don't activate this option if you don't know Disable use of /usr. Don't activate this option if you don't know
that you really want this behaviour. 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 config PREFIX
string "BusyBox installation prefix" string "BusyBox installation prefix"
default "./_install" default "./_install"