mirror of
https://github.com/sheumann/hush.git
synced 2024-06-09 07:29:30 +00:00
Update the build system for pristine source directory builds. This
update is primarily work done by Larry Doolittle, but I did some touchups of my own to make it work for me, -Erik
This commit is contained in:
Eric Andersen
parent
69c8572f29
commit
19f86207f5
22
Config.h
22
Config.h
|
|
@ -142,25 +142,18 @@
|
|||
//
|
||||
// Turn this on to use Erik's very cool devps, and devmtab kernel drivers,
|
||||
// thereby eliminating the need for the /proc filesystem and thereby saving
|
||||
// lots and lots memory for more important things. You can not use this and
|
||||
// USE_PROCFS at the same time... NOTE: If you enable this feature, you
|
||||
// _must_ have patched the kernel to include the devps patch that is included
|
||||
// in the busybox/kernel-patches directory. You will also need to create some
|
||||
// device special files in /dev on your embedded system:
|
||||
// lots and lots memory for more important things. NOTE: If you enable this
|
||||
// feature, you _must_ have patched the kernel to include the devps patch that
|
||||
// is included in the busybox/kernel-patches directory. You will also need to
|
||||
// create some device special files in /dev on your embedded system:
|
||||
// mknod /dev/mtab c 10 22
|
||||
// mknod /dev/ps c 10 21
|
||||
// I emailed Linus and this patch will not be going into the stock kernel.
|
||||
//#define BB_FEATURE_USE_DEVPS_PATCH
|
||||
//
|
||||
// enable features that use the /proc filesystem (apps that
|
||||
// break without this will tell you on compile)...
|
||||
// You can't use this and BB_FEATURE_USE_DEVPS_PATCH
|
||||
// at the same time...
|
||||
#define BB_FEATURE_USE_PROCFS
|
||||
//
|
||||
// This compiles out everything but the most
|
||||
// trivial --help usage information (i.e. reduces binary size)
|
||||
//#define BB_FEATURE_TRIVIAL_HELP
|
||||
#define BB_FEATURE_TRIVIAL_HELP
|
||||
//
|
||||
// Use termios to manipulate the screen ('more' is prettier with this on)
|
||||
#define BB_FEATURE_USE_TERMIOS
|
||||
|
|
@ -198,11 +191,6 @@
|
|||
//Have init enable core dumping for child processes (for debugging only)
|
||||
//#define BB_FEATURE_INIT_COREDUMPS
|
||||
//
|
||||
// Allow init to permenently chroot, and umount the old root fs
|
||||
// just like an initrd does. Requires a kernel patch by Werner Almesberger.
|
||||
// ftp://icaftp.epfl.ch/pub/people/almesber/misc/umount-root-*.tar.gz
|
||||
//#define BB_FEATURE_INIT_CHROOT
|
||||
//
|
||||
//Make sure nothing is printed to the console on boot
|
||||
//#define BB_FEATURE_EXTRA_QUIET
|
||||
//
|
||||
|
|
|
|||
127
Makefile
127
Makefile
|
|
@ -72,7 +72,7 @@ DOLFS = false
|
|||
# If you have a "pristine" source directory, point BB_SRC_DIR to it.
|
||||
# Experimental and incomplete; tell the mailing list
|
||||
# <busybox@opensource.lineo.com> if you do or don't like it so far.
|
||||
BB_SRC_DIR = .
|
||||
BB_SRC_DIR =
|
||||
|
||||
# If you are running a cross compiler, you may want to set this
|
||||
# to something more interesting, like "powerpc-linux-".
|
||||
|
|
@ -94,14 +94,21 @@ STRIPTOOL = $(CROSS)strip
|
|||
#CROSS_CFLAGS+=-nostdinc -I$(LIBCDIR)/include -I$(GCCINCDIR)
|
||||
#GCCINCDIR = $(shell gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp")
|
||||
|
||||
#--------------------------------------------------------
|
||||
|
||||
# use '-Os' optimization if available, else use -O2
|
||||
OPTIMIZATION = $(shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \
|
||||
OPTIMIZATION := $(shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \
|
||||
then echo "-Os"; else echo "-O2" ; fi)
|
||||
|
||||
WARNINGS = -Wall
|
||||
|
||||
#
|
||||
#--------------------------------------------------------
|
||||
# If you're going to do a lot of builds with a non-vanilla configuration,
|
||||
# it makes sense to adjust parameters above, so you can type "make"
|
||||
# by itself, instead of following it by the same half-dozen overrides
|
||||
# every time. The stuff below, on the other hand, is probably less
|
||||
# prone to casual user adjustment.
|
||||
#
|
||||
|
||||
ifeq ($(strip $(DOLFS)),true)
|
||||
# For large file summit support
|
||||
CFLAGS+=-D_FILE_OFFSET_BITS=64
|
||||
|
|
@ -142,22 +149,48 @@ ifndef $(PREFIX)
|
|||
endif
|
||||
|
||||
# Additional complications due to support for pristine source dir.
|
||||
# Config.h in the build directory should take precedence over the
|
||||
# copy in BB_SRC_DIR, both during the compilation phase and the
|
||||
# Include files in the build directory should take precedence over
|
||||
# the copy in BB_SRC_DIR, both during the compilation phase and the
|
||||
# shell script that finds the list of object files.
|
||||
#
|
||||
# Work in progress by <ldoolitt@recycle.lbl.gov>.
|
||||
# If it gets in your way, set DISABLE_VPATH=yes
|
||||
ifeq ($(strip $(DISABLE_VPATH)),yes)
|
||||
CONFIG_H = Config.h
|
||||
else
|
||||
VPATH = .:$(BB_SRC_DIR)
|
||||
CONFIG_LIST = $(addsuffix /Config.h,$(subst :, ,$(VPATH)))
|
||||
CONFIG_H = $(word 1,$(shell ls -f -1 $(CONFIG_LIST) 2>/dev/null))
|
||||
CFLAGS += -I- $(patsubst %,-I%,$(subst :, ,$(VPATH)))
|
||||
#
|
||||
ifneq ($(strip $(BB_SRC_DIR)),)
|
||||
VPATH = $(BB_SRC_DIR)
|
||||
endif
|
||||
#ifneq ($(strip $(VPATH)),)
|
||||
# CFLAGS += -I- -I. $(patsubst %,-I%,$(subst :, ,$(VPATH)))
|
||||
#endif
|
||||
|
||||
OBJECTS = $(shell $(BB_SRC_DIR)/busybox.sh $(CONFIG_H) $(BB_SRC_DIR)) busybox.o messages.o usage.o utility.o
|
||||
# We need to set APPLET_SOURCES to something like
|
||||
# $(shell busybox.sh Config.h)
|
||||
# but in a manner that works with VPATH and BB_SRC_DIR.
|
||||
# Possible ways to approach this:
|
||||
#
|
||||
# 1. Explicitly search through .:$(VPATH) for busybox.sh and config.h,
|
||||
# then $(shell $(BUSYBOX_SH) $(CONFIG_H) $(BB_SRC_DIR))
|
||||
#
|
||||
# 2. Explicity search through .:$(VPATH) for slist.mk,
|
||||
# then $(shell $(MAKE) -f $(SLIST_MK) VPATH=$(VPATH) BB_SRC_DIR=$(BB_SRC_DIR))
|
||||
#
|
||||
# 3. Create slist.mk in this directory, with commands embedded in
|
||||
# a $(shell ...) command, and $(MAKE) it immediately.
|
||||
#
|
||||
# 4. Use a real rule within this makefile to create a file that sets
|
||||
# APPLET_SOURCE_LIST, then include that file. Has complications
|
||||
# with the first trip through the makefile (before processing the
|
||||
# include) trying to do too much, and a spurious warning the first
|
||||
# time make is run.
|
||||
#
|
||||
# This is option 3:
|
||||
#
|
||||
#APPLET_SOURCES = $(shell \
|
||||
# echo -e 'all: busybox.sh Config.h\n\t@ $$(SHELL) $$^ $$(BB_SRC_DIR)' >slist.mk; \
|
||||
# make -f slist.mk VPATH=$(VPATH) BB_SRC_DIR=$(BB_SRC_DIR) \
|
||||
#)
|
||||
# And option 4:
|
||||
-include applet_source_list
|
||||
|
||||
OBJECTS = $(APPLET_SOURCES:.c=.o) busybox.o messages.o usage.o utility.o
|
||||
CFLAGS += $(CROSS_CFLAGS)
|
||||
CFLAGS += -DBB_VER='"$(VERSION)"'
|
||||
CFLAGS += -DBB_BT='"$(BUILDTIME)"'
|
||||
|
|
@ -166,20 +199,29 @@ ifdef BB_INIT_SCRIPT
|
|||
endif
|
||||
|
||||
ifneq ($(strip $(USE_SYSTEM_PWD_GRP)),true)
|
||||
PWD_LIB = pwd_grp/libpwd.a
|
||||
LIBRARIES += $(PWD_LIB)
|
||||
PWD_GRP = pwd_grp
|
||||
PWD_GRP_DIR = $(BB_SRC_DIR)$(PWD_GRP)
|
||||
PWD_LIB = libpwd.a
|
||||
LIBRARIES += $(PWD_LIB)
|
||||
PWD_CSRC=__getpwent.c pwent.c getpwnam.c getpwuid.c putpwent.c getpw.c \
|
||||
fgetpwent.c __getgrent.c grent.c getgrnam.c getgrgid.c fgetgrent.c \
|
||||
initgroups.c setgroups.c
|
||||
PWD_OBJS=$(patsubst %.c,$(PWD_GRP)/%.o, $(PWD_CSRC))
|
||||
PWD_CFLAGS = -I$(PWD_GRP_DIR)
|
||||
else
|
||||
CFLAGS += -DUSE_SYSTEM_PWD_GRP
|
||||
endif
|
||||
|
||||
|
||||
# Put user-supplied flags at the end, where they
|
||||
# have a chance of winning.
|
||||
CFLAGS += $(CFLAGS_EXTRA)
|
||||
|
||||
.EXPORT_ALL_VARIABLES:
|
||||
|
||||
all: busybox busybox.links doc
|
||||
all: applet_source_list busybox busybox.links doc
|
||||
|
||||
applet_source_list: busybox.sh Config.h
|
||||
(echo -n "APPLET_SOURCES := "; $(SHELL) $^ $(BB_SRC_DIR)) > $@
|
||||
|
||||
doc: olddoc
|
||||
|
||||
|
|
@ -191,12 +233,12 @@ docs/BusyBox.txt: docs/busybox.pod
|
|||
@echo BusyBox Documentation
|
||||
@echo
|
||||
-mkdir -p docs
|
||||
-pod2text $(BB_SRC_DIR)/docs/busybox.pod > docs/BusyBox.txt
|
||||
-pod2text $< > $@
|
||||
|
||||
docs/BusyBox.1: docs/busybox.pod
|
||||
- mkdir -p docs
|
||||
- pod2man --center=BusyBox --release="version $(VERSION)" \
|
||||
$(BB_SRC_DIR)/docs/busybox.pod > docs/BusyBox.1
|
||||
$< > $@
|
||||
|
||||
docs/BusyBox.html: docs/busybox.lineo.com/BusyBox.html
|
||||
-@ rm -f docs/BusyBox.html
|
||||
|
|
@ -204,7 +246,7 @@ docs/BusyBox.html: docs/busybox.lineo.com/BusyBox.html
|
|||
|
||||
docs/busybox.lineo.com/BusyBox.html: docs/busybox.pod
|
||||
-@ mkdir -p docs/busybox.lineo.com
|
||||
- pod2html --noindex $(BB_SRC_DIR)/docs/busybox.pod > \
|
||||
- pod2html --noindex $< > \
|
||||
docs/busybox.lineo.com/BusyBox.html
|
||||
-@ rm -f pod2html*
|
||||
|
||||
|
|
@ -236,55 +278,62 @@ docs/busybox/busyboxdocumentation.html: docs/busybox.sgml
|
|||
(cd docs/busybox.lineo.com; sgmltools -b html ../busybox.sgml)
|
||||
|
||||
|
||||
|
||||
busybox: $(PWD_LIB) $(OBJECTS)
|
||||
$(CC) $(LDFLAGS) -o $@ $^ $(LIBRARIES)
|
||||
$(STRIP)
|
||||
|
||||
$(PWD_LIB):
|
||||
$(MAKE) -eC pwd_grp
|
||||
|
||||
busybox.links: Config.h applets.h
|
||||
- $(BB_SRC_DIR)/busybox.mkll $(CONFIG_H) $(BB_SRC_DIR)/applets.h >$@
|
||||
# Without VPATH, rule expands to "/bin/sh busybox.mkll Config.h applets.h"
|
||||
# but with VPATH, some or all of those file names are resolved to the
|
||||
# directories in which they live.
|
||||
busybox.links: busybox.mkll Config.h applets.h
|
||||
- $(SHELL) $^ >$@
|
||||
|
||||
nfsmount.o cmdedit.o: %.o: %.h
|
||||
$(OBJECTS): %.o: %.c Config.h busybox.h applets.h Makefile
|
||||
$(CC) $(CFLAGS) -I- -I. $(patsubst %,-I%,$(subst :, ,$(BB_SRC_DIR))) -c $< -o $*.o
|
||||
|
||||
$(PWD_OBJS): %.o: %.c pwd_lib_objdir Config.h busybox.h applets.h Makefile
|
||||
$(CC) $(CFLAGS) $(PWD_CFLAGS) -c $< -o $*.o
|
||||
|
||||
$(PWD_LIB): $(PWD_OBJS)
|
||||
$(AR) $(ARFLAGS) $(PWD_LIB) $^
|
||||
|
||||
pwd_lib_objdir:
|
||||
mkdir -p $(PWD_GRP)
|
||||
|
||||
usage.o: usage.h
|
||||
|
||||
utility.o: loop.h
|
||||
|
||||
loop.h: mk_loop_h.sh
|
||||
@ sh $<
|
||||
@ $(SHELL) $< > $@
|
||||
|
||||
test tests:
|
||||
cd tests && $(MAKE) all
|
||||
|
||||
clean:
|
||||
- cd tests && $(MAKE) clean
|
||||
- cd pwd_grp && $(MAKE) clean
|
||||
- rm -f docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html \
|
||||
docs/busybox.lineo.com/BusyBox.html
|
||||
- rm -f docs/busybox.txt docs/busybox.dvi docs/busybox.ps \
|
||||
docs/busybox.pdf docs/busybox.lineo.com/busybox.html
|
||||
- rm -f multibuild.log Config.h.orig
|
||||
- rm -rf docs/busybox _install
|
||||
- rm -f busybox.links loop.h *~ *.o core
|
||||
- rm -rf docs/busybox _install $(PWD_LIB)
|
||||
- rm -f busybox.links loop.h *~ slist.mk core applet_source_list
|
||||
- find -name *.o | xargs rm -f;
|
||||
|
||||
distclean: clean
|
||||
- rm -f busybox
|
||||
- cd tests && $(MAKE) distclean
|
||||
|
||||
install: busybox busybox.links
|
||||
$(BB_SRC_DIR)/install.sh $(PREFIX)
|
||||
install: install.sh busybox busybox.links
|
||||
$(SHELL) $< $(PREFIX)
|
||||
|
||||
install-hardlinks: busybox busybox.links
|
||||
$(BB_SRC_DIR)/install.sh $(PREFIX) --hardlinks
|
||||
install-hardlinks: install.sh busybox busybox.links
|
||||
$(SHELL) $< $(PREFIX) --hardlinks
|
||||
|
||||
debug_pristine:
|
||||
@ echo VPATH=\"$(VPATH)\"
|
||||
@ echo CONFIG_LIST=\"$(CONFIG_LIST)\"
|
||||
@ echo CONFIG_H=\"$(CONFIG_H)\"
|
||||
@ echo OBJECTS=\"$(OBJECTS)\"
|
||||
|
||||
dist release: distclean doc
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ RAW=` \
|
|||
`
|
||||
test "${RAW}" != "" || exit
|
||||
cd ${2:-.}
|
||||
# I added in the extra "ls" so only source files that
|
||||
# actually exist will show up in the compile list.
|
||||
ls -1 $RAW 2>/dev/null | sed -e 's/\.c$/\.o/g'
|
||||
# By running $RAW through "ls", we avoid listing
|
||||
# source files that don't exist.
|
||||
ls $RAW 2>/dev/null | tr '\n' ' '
|
||||
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
#define USAGE_MESSAGES
|
||||
#include <usage.h>
|
||||
#include "usage.h"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ RAW=` \
|
|||
`
|
||||
test "${RAW}" != "" || exit
|
||||
cd ${2:-.}
|
||||
# I added in the extra "ls" so only source files that
|
||||
# actually exist will show up in the compile list.
|
||||
ls -1 $RAW 2>/dev/null | sed -e 's/\.c$/\.o/g'
|
||||
# By running $RAW through "ls", we avoid listing
|
||||
# source files that don't exist.
|
||||
ls $RAW 2>/dev/null | tr '\n' ' '
|
||||
|
||||
|
|
|
|||
|
|
@ -2,8 +2,7 @@
|
|||
#
|
||||
# Figure out (i) the type of dev_t (ii) the defines for loop stuff
|
||||
#
|
||||
|
||||
rm -f loop.h
|
||||
# Output of this script is normally redirected to "loop.h".
|
||||
|
||||
# Since 1.3.79 there is an include file <asm/posix_types.h>
|
||||
# that defines __kernel_dev_t.
|
||||
|
|
@ -12,23 +11,27 @@ rm -f loop.h
|
|||
# avoids namespace pollution. Otherwise we guess that __kernel_dev_t
|
||||
# is an unsigned short (which is true on i386, but false on alpha).
|
||||
|
||||
# BUG: This test is actually broken if your gcc is not configured to
|
||||
# search /usr/include, as may well happen with cross-compilers.
|
||||
# It would be better to ask $(CC) if these files can be found.
|
||||
|
||||
if [ -f /usr/include/linux/posix_types.h ]; then
|
||||
echo '#include <linux/posix_types.h>' >> loop.h
|
||||
echo '#undef dev_t' >> loop.h
|
||||
echo '#define dev_t __kernel_dev_t' >> loop.h
|
||||
echo '#include <linux/posix_types.h>'
|
||||
echo '#undef dev_t'
|
||||
echo '#define dev_t __kernel_dev_t'
|
||||
else
|
||||
echo '#undef dev_t' >> loop.h
|
||||
echo '#define dev_t unsigned short' >> loop.h
|
||||
echo '#undef dev_t'
|
||||
echo '#define dev_t unsigned short'
|
||||
fi
|
||||
|
||||
# Next we have to find the loop stuff itself.
|
||||
# First try kernel source, then a private version.
|
||||
|
||||
if [ -f /usr/include/linux/loop.h ]; then
|
||||
echo '#include <linux/loop.h>' >> loop.h
|
||||
echo '#include <linux/loop.h>'
|
||||
else
|
||||
echo '#include "real_loop.h"' >> loop.h
|
||||
echo '#include "real_loop.h"'
|
||||
fi
|
||||
|
||||
echo '#undef dev_t' >> loop.h
|
||||
echo '#undef dev_t'
|
||||
|
||||
|
|
|
|||
23
mk_loop_h.sh
23
mk_loop_h.sh
|
|
@ -2,8 +2,7 @@
|
|||
#
|
||||
# Figure out (i) the type of dev_t (ii) the defines for loop stuff
|
||||
#
|
||||
|
||||
rm -f loop.h
|
||||
# Output of this script is normally redirected to "loop.h".
|
||||
|
||||
# Since 1.3.79 there is an include file <asm/posix_types.h>
|
||||
# that defines __kernel_dev_t.
|
||||
|
|
@ -12,23 +11,27 @@ rm -f loop.h
|
|||
# avoids namespace pollution. Otherwise we guess that __kernel_dev_t
|
||||
# is an unsigned short (which is true on i386, but false on alpha).
|
||||
|
||||
# BUG: This test is actually broken if your gcc is not configured to
|
||||
# search /usr/include, as may well happen with cross-compilers.
|
||||
# It would be better to ask $(CC) if these files can be found.
|
||||
|
||||
if [ -f /usr/include/linux/posix_types.h ]; then
|
||||
echo '#include <linux/posix_types.h>' >> loop.h
|
||||
echo '#undef dev_t' >> loop.h
|
||||
echo '#define dev_t __kernel_dev_t' >> loop.h
|
||||
echo '#include <linux/posix_types.h>'
|
||||
echo '#undef dev_t'
|
||||
echo '#define dev_t __kernel_dev_t'
|
||||
else
|
||||
echo '#undef dev_t' >> loop.h
|
||||
echo '#define dev_t unsigned short' >> loop.h
|
||||
echo '#undef dev_t'
|
||||
echo '#define dev_t unsigned short'
|
||||
fi
|
||||
|
||||
# Next we have to find the loop stuff itself.
|
||||
# First try kernel source, then a private version.
|
||||
|
||||
if [ -f /usr/include/linux/loop.h ]; then
|
||||
echo '#include <linux/loop.h>' >> loop.h
|
||||
echo '#include <linux/loop.h>'
|
||||
else
|
||||
echo '#include "real_loop.h"' >> loop.h
|
||||
echo '#include "real_loop.h"'
|
||||
fi
|
||||
|
||||
echo '#undef dev_t' >> loop.h
|
||||
echo '#undef dev_t'
|
||||
|
||||
|
|
|
|||
39
pristine_setup.sh
Executable file
39
pristine_setup.sh
Executable file
|
|
@ -0,0 +1,39 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# To compile BusyBox without touching the original sources
|
||||
# (as might be interesting for multi-target builds), create
|
||||
# an empty directory, cd into it, and run this program by
|
||||
# giving its explicit path (kind of like how you would run
|
||||
# configure, if BusyBox had one). Then you should be ready
|
||||
# to "make". Files in the build tree, in particular Config.h,
|
||||
# will override those in the pristine source tree.
|
||||
#
|
||||
|
||||
|
||||
# if you use a ? in your path name, you lose.
|
||||
DIR=`basedir ${0%%/pristine_setup}`
|
||||
if [ ! -d $DIR ]; then
|
||||
echo "unexpected problem: $DIR is not a directory. Aborting pristine setup"
|
||||
exit
|
||||
fi
|
||||
|
||||
echo " "
|
||||
|
||||
if [ -e ./Config.h ]; then
|
||||
echo "./Config.h already exists: not overwriting"
|
||||
else
|
||||
cp $DIR/Config.h Config.h
|
||||
fi
|
||||
|
||||
if [ -e ./Makefile ]; then
|
||||
echo "./Makefile already exists: not overwriting"
|
||||
else
|
||||
sed -e "s?BB_SRC_DIR =?BB_SRC_DIR = $DIR?" <$DIR/Makefile >Makefile || exit
|
||||
fi
|
||||
|
||||
|
||||
echo " "
|
||||
echo "You may now type 'make' to build busybox in this directory"
|
||||
echo "($PWD) using the pristine sources in $DIR"
|
||||
echo " "
|
||||
|
||||
Loading…
Reference in New Issue
Block a user