Fix buglet whereupon $(LINUX_DIR)/.configdone was copied *after*
configuration rather than before. Try a different approach to avoid version-specific uClibc issues, using '-nt' (newer than) test, and files $(UCLIBC_DIR)/.installed{,runtime}
This commit is contained in:
parent
339f2f492e
commit
c38dccccfd
24
Makefile
24
Makefile
|
@ -35,11 +35,12 @@ IMAGE_SIZE=550 # library is 550K
|
||||||
IMAGE_INODES=300
|
IMAGE_INODES=300
|
||||||
|
|
||||||
LINUX_SOURCE=linux-2.4.14.tar.bz2
|
LINUX_SOURCE=linux-2.4.14.tar.bz2
|
||||||
USERMODELINUX_PATCH=uml-patch-2.4.14-6.bz2
|
|
||||||
UCLIBC_SOURCE=uClibc-snapshot.tar.gz
|
|
||||||
|
|
||||||
LINUX_URI=http://www.kernel.org/pub/linux/kernel/v2.4
|
LINUX_URI=http://www.kernel.org/pub/linux/kernel/v2.4
|
||||||
|
|
||||||
|
USERMODELINUX_PATCH=uml-patch-2.4.14-6.bz2
|
||||||
USERMODELINUX_URI=http://prdownloads.sourceforge.net/user-mode-linux
|
USERMODELINUX_URI=http://prdownloads.sourceforge.net/user-mode-linux
|
||||||
|
|
||||||
|
UCLIBC_SOURCE=uClibc-snapshot.tar.gz
|
||||||
UCLIBC_URI=http://uclibc.org/downloads/
|
UCLIBC_URI=http://uclibc.org/downloads/
|
||||||
|
|
||||||
# Don't alter below this line unless you (think) you know
|
# Don't alter below this line unless you (think) you know
|
||||||
|
@ -109,6 +110,7 @@ $(SOURCE_DIR)/$(USERMODELINUX_PATCH):
|
||||||
|
|
||||||
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked $(SOURCE_DIR)/$(USERMODELINUX_PATCH)
|
$(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked $(SOURCE_DIR)/$(USERMODELINUX_PATCH)
|
||||||
bzcat $(SOURCE_DIR)/$(USERMODELINUX_PATCH) | patch -d $(LINUX_DIR) -p1
|
bzcat $(SOURCE_DIR)/$(USERMODELINUX_PATCH) | patch -d $(LINUX_DIR) -p1
|
||||||
|
cp -f $(KCONFIG) $(LINUX_DIR)/.config
|
||||||
touch $(LINUX_DIR)/.patched
|
touch $(LINUX_DIR)/.patched
|
||||||
|
|
||||||
$(LINUX_DIR)/.um: $(LINUX_DIR)/.patched
|
$(LINUX_DIR)/.um: $(LINUX_DIR)/.patched
|
||||||
|
@ -116,7 +118,6 @@ $(LINUX_DIR)/.um: $(LINUX_DIR)/.patched
|
||||||
touch $(LINUX_DIR)/.um
|
touch $(LINUX_DIR)/.um
|
||||||
|
|
||||||
$(LINUX_DIR)/.configdone: $(LINUX_DIR)/.um
|
$(LINUX_DIR)/.configdone: $(LINUX_DIR)/.um
|
||||||
cp -f $(KCONFIG) $(LINUX_DIR)/.config
|
|
||||||
make -C $(LINUX_DIR) oldconfig menuconfig
|
make -C $(LINUX_DIR) oldconfig menuconfig
|
||||||
touch $(LINUX_DIR)/.configdone
|
touch $(LINUX_DIR)/.configdone
|
||||||
|
|
||||||
|
@ -154,26 +155,25 @@ $(UCLIBC_DIR)/lib/libc.a: $(LINUX) $(UCLIBC_DIR)/Config
|
||||||
-C $(UCLIBC_DIR)
|
-C $(UCLIBC_DIR)
|
||||||
|
|
||||||
uclibc: $(UCLIBC_DIR)/lib/libc.a $(STAGING_DIR) $(TARGET_DIR)
|
uclibc: $(UCLIBC_DIR)/lib/libc.a $(STAGING_DIR) $(TARGET_DIR)
|
||||||
@A=`cksum $(STAGING_DIR)/lib/libuClibc-0.9.5.so 2>/dev/null | awk '{ print $$1 }'`; \
|
@if [ $(UCLIBC_DIR)/lib/libc.a -nt $(UCLIBC_DIR)/.installed ]; then \
|
||||||
B=`cksum $(UCLIBC_DIR)/lib/libuClibc-0.9.5.so 2>/dev/null | awk '{ print $$1 }'`; \
|
rm -f $(UCLIBC_DIR)/.installed; \
|
||||||
if [ "$$A" != "$$B" ] ; then \
|
|
||||||
set -x; \
|
set -x; \
|
||||||
$(MAKE) \
|
$(MAKE) \
|
||||||
DEVEL_PREFIX=$(STAGING_DIR) \
|
DEVEL_PREFIX=$(STAGING_DIR) \
|
||||||
SYSTEM_DEVEL_PREFIX=$(STAGING_DIR)/usr \
|
SYSTEM_DEVEL_PREFIX=$(STAGING_DIR)/usr \
|
||||||
SHARED_LIB_LOADER_PATH=$(STAGING_DIR)/lib \
|
SHARED_LIB_LOADER_PATH=$(STAGING_DIR)/lib \
|
||||||
-C $(UCLIBC_DIR) install; \
|
-C $(UCLIBC_DIR) install; \
|
||||||
fi;
|
touch $(UCLIBC_DIR)/.installed ; \
|
||||||
@A=`cksum $(TARGET_DIR)/lib/libuClibc-0.9.5.so 2>/dev/null | awk '{ print $$1 }'`; \
|
fi
|
||||||
B=`cksum $(UCLIBC_DIR)/lib/libuClibc-0.9.5.so 2>/dev/null | awk '{ print $$1 }'`; \
|
@if [ $(UCLIBC_DIR)/lib/libc.a -nt $(UCLIBC_DIR)/.installed_runtime ]; then \
|
||||||
if [ "$$A" != "$$B" ] ; then \
|
rm -f $(UCLIBC_DIR)/.installed_runtime; \
|
||||||
set -x; \
|
|
||||||
$(MAKE) \
|
$(MAKE) \
|
||||||
PREFIX=$(TARGET_DIR) \
|
PREFIX=$(TARGET_DIR) \
|
||||||
DEVEL_PREFIX=/ \
|
DEVEL_PREFIX=/ \
|
||||||
SYSTEM_DEVEL_PREFIX=/usr \
|
SYSTEM_DEVEL_PREFIX=/usr \
|
||||||
SHARED_LIB_LOADER_PATH=/lib \
|
SHARED_LIB_LOADER_PATH=/lib \
|
||||||
-C $(UCLIBC_DIR) install_runtime; \
|
-C $(UCLIBC_DIR) install_runtime; \
|
||||||
|
touch $(UCLIBC_DIR)/.installed_runtime ; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# genext2fs
|
# genext2fs
|
||||||
|
|
Loading…
Reference in a new issue