diff options
| author | Eric Andersen <andersen@codepoet.org> | 2002-12-28 04:05:46 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2002-12-28 04:05:46 +0000 |
| commit | 416af4663eb969f99d79567e8550338b11bdc974 (patch) | |
| tree | 24e101fb414d103f580930db18303c39652c545c /make | |
| parent | e6b6dceed3cb12e2aad863f8fe9134fc4b73d7c7 (diff) | |
Fix it so this:
touch /tmp/cvs/buildroot/build/linux-2.4.20/.dist
Aborting. '/tmp/cvs/buildroot/sources/kernel-patches' is not a directory.
make: *** [/tmp/cvs/buildroot/build/linux-2.4.20/.dist] Error 1
doesn't happen any more
Diffstat (limited to 'make')
| -rw-r--r-- | make/linux.mk | 36 |
1 files changed, 25 insertions, 11 deletions
diff --git a/make/linux.mk b/make/linux.mk index 710d34f0a..deb756321 100644 --- a/make/linux.mk +++ b/make/linux.mk @@ -22,10 +22,14 @@ ifneq ($(filter $(TARGETS),linux),) LINUX_KERNEL=$(BUILD_DIR)/buildroot-kernel LINUX_DIR=$(BUILD_DIR)/linux-2.4.20 +#LINUX_FORMAT=bzImage +#LINUX_BINLOC=arch/$(ARCH)/boot/$(LINUX_FORMAT) +LINUX_FORMAT=zImage.prep +LINUX_BINLOC=arch/ppc/boot/images/$(LINUX_FORMAT) LINUX_SOURCE=linux-2.4.20.tar.bz2 LINUX_SITE=http://ftp.us.kernel.org/pub/linux/kernel/v2.4 LINUX_KCONFIG=$(SOURCE_DIR)/linux.config -LINUX_VERSION=$(shell grep -s UTS_RELEASE $(LINUX_DIR)/include/linux/version.h || echo '\#define UTS_RELEASE \"2.4.20\"' | cut -f 2 -d \" ) +LINUX_VERSION=$(shell grep -s UTS_RELEASE $(LINUX_DIR)/include/linux/version.h | cut -f 2 -d \" || echo \"2.4.20\" ) $(DL_DIR)/$(LINUX_SOURCE): $(WGET) -P $(DL_DIR) $(LINUX_SITE)/$(LINUX_SOURCE) @@ -33,14 +37,24 @@ $(DL_DIR)/$(LINUX_SOURCE): $(LINUX_DIR)/.dist: $(DL_DIR)/$(LINUX_SOURCE) rm -rf $(LINUX_DIR) bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(BUILD_DIR) -xvf - - $(SOURCE_DIR)/patch-kernel.sh $(LINUX_DIR) $(SOURCE_DIR)/kernel-patches \ + mkdir -p $(SOURCE_DIR)/kernel-patches + $(SOURCE_DIR)/patch-kernel.sh $(LINUX_DIR) $(SOURCE_DIR)/kernel-patches touch $(LINUX_DIR)/.dist +$(LINUX_KCONFIG): + @if [ ! -f "$(LINUX_KCONFIG)" ] ; then \ + echo ""; \ + echo "You should create a .config for your kernel"; \ + echo "and install it as $(LINUX_KCONFIG)"; \ + echo ""; \ + sleep 5; \ + fi; + $(LINUX_DIR)/.configured: $(LINUX_DIR)/.dist $(LINUX_KCONFIG) - perl -i -p -e "s,^CROSS_COMPILE.*,\ - CROSS_COMPILE=$(STAGING_DIR)/bin/$(ARCH)-uclibc-,g;" \ - $(LINUX_DIR)/Makefile - cp $(LINUX_KCONFIG) $(LINUX_DIR)/.config + #perl -i -p -e "s,^CROSS_COMPILE.*,\ + # CROSS_COMPILE=$(STAGING_DIR)/bin/$(ARCH)-uclibc-,g;" \ + # $(LINUX_DIR)/Makefile + -cp $(LINUX_KCONFIG) $(LINUX_DIR)/.config make -C $(LINUX_DIR) oldconfig include/linux/version.h touch $(LINUX_DIR)/.configured @@ -48,12 +62,12 @@ $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured make -C $(LINUX_DIR) dep touch $(LINUX_DIR)/.depend_done -$(LINUX_DIR)/arch/$(ARCH)/boot/bzImage: $(LINUX_DIR)/.depend_done - make -C $(LINUX_DIR) bzImage +$(LINUX_DIR)/$(LINUX_BINLOC): $(LINUX_DIR)/.depend_done + make -C $(LINUX_DIR) $(LINUX_FORMAT) make -C $(LINUX_DIR) modules -$(LINUX_KERNEL): $(LINUX_DIR)/arch/$(ARCH)/boot/bzImage - cp -fa $(LINUX_DIR)/arch/$(ARCH)/boot/bzImage $(LINUX_KERNEL) +$(LINUX_KERNEL): $(LINUX_DIR)/$(LINUX_BINLOC) + cp -fa $(LINUX_DIR)/$(LINUX_BINLOC) $(LINUX_KERNEL) $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep: $(LINUX_KERNEL) rm -rf $(TARGET_DIR)/lib/modules @@ -61,7 +75,7 @@ $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep: $(LINUX_KERNEL) make -C $(LINUX_DIR) INSTALL_MOD_PATH=$(TARGET_DIR) modules_install (cd $(TARGET_DIR)/lib/modules; ln -s $(LINUX_VERSION)/kernel/drivers .) -$(STAGING_DIR)/include/linux/version.h: $(LINUX_DIR)/include/linux/version.h +$(STAGING_DIR)/include/linux/version.h: $(LINUX_DIR)/.configured mkdir -p $(STAGING_DIR)/include tar -ch -C $(LINUX_DIR)/include -f - linux | tar -xf - -C $(STAGING_DIR)/include/ tar -ch -C $(LINUX_DIR)/include -f - asm | tar -xf - -C $(STAGING_DIR)/include/ |