add fixes from whiterussian

SVN-Revision: 1683
This commit is contained in:
Felix Fietkau 2005-08-15 10:43:09 +00:00
parent f978942809
commit 8781da9dec
3 changed files with 26 additions and 12 deletions

View File

@ -50,9 +50,9 @@ $(IPKG_BASE):
$(IPKG_LIBC): $(IPKG_LIBC):
$(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBC) ipkg/uclibc.control $(LIBC_VERSION)-$(PKG_RELEASE) $(ARCH) $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBC) ipkg/uclibc.control $(LIBC_VERSION)-$(PKG_RELEASE) $(ARCH)
mkdir -p $(IDIR_LIBC)/lib mkdir -p $(IDIR_LIBC)/lib
cp -fpR $(STAGING_DIR)/lib/ld-uClibc*.so.* $(IDIR_LIBC)/lib/ cp $(STAGING_DIR)/lib/ld-uClibc*.so.* $(IDIR_LIBC)/lib/
for file in c crypt dl m nsl resolv rt uClibc util; do \ for file in c crypt dl m nsl resolv rt uClibc util; do \
cp -fpR $(STAGING_DIR)/lib/lib$$file*.so.* $(IDIR_LIBC)/lib/; \ cp $(STAGING_DIR)/lib/lib$$file*.so.* $(IDIR_LIBC)/lib/; \
done done
-$(STRIP) $(IDIR_LIBC)/lib/* -$(STRIP) $(IDIR_LIBC)/lib/*
$(IPKG_BUILD) $(IDIR_LIBC) $(PACKAGE_DIR) $(IPKG_BUILD) $(IDIR_LIBC) $(PACKAGE_DIR)
@ -64,6 +64,9 @@ $(IPKG_GCC):
-$(STRIP) $(IDIR_GCC)/lib/* -$(STRIP) $(IDIR_GCC)/lib/*
$(IPKG_BUILD) $(IDIR_GCC) $(PACKAGE_DIR) $(IPKG_BUILD) $(IDIR_GCC) $(PACKAGE_DIR)
package-clean:
rm -f $(PACKAGES)
clean: package-clean
prepare: prepare:
compile: $(PACKAGES) compile: $(PACKAGES)
install: compile install: compile

View File

@ -19,11 +19,6 @@ LINUX_KCONFIG:=./config/$(BOARD)
LINUX_BUILD_DIR:=$(BUILD_DIR)/linux-2.4-$(BOARD) LINUX_BUILD_DIR:=$(BUILD_DIR)/linux-2.4-$(BOARD)
LINUX_TARGET_DIR:=$(LINUX_BUILD_DIR)/root LINUX_TARGET_DIR:=$(LINUX_BUILD_DIR)/root
LINUX_KERNEL:=$(LINUX_BUILD_DIR)/vmlinux LINUX_KERNEL:=$(LINUX_BUILD_DIR)/vmlinux
LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
-e 's/mipsel/mips/' \
-e 's/powerpc/ppc/' \
-e 's/sh[234]/sh/' \
)
LINUX_BINARY_DRIVER_SITE := http://openwrt.org/downloads/sources/ LINUX_BINARY_DRIVER_SITE := http://openwrt.org/downloads/sources/
LINUX_SOURCE := linux-$(LINUX_VERSION).tar.bz2 LINUX_SOURCE := linux-$(LINUX_VERSION).tar.bz2
@ -226,6 +221,15 @@ $(STAGING_DIR)/include/linux/version.h: $(LINUX_DIR)/.configured
tar -ch -C $(LINUX_DIR)/include -f - linux | tar -xf - -C $(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/ tar -ch -C $(LINUX_DIR)/include -f - asm | tar -xf - -C $(STAGING_DIR)/include/
$(STAMP_DIR)/.linux-compile: $(LINUX_DIR)/.modules_done
@mkdir -p $(STAMP_DIR)
@$(MAKE) $(TARGETS)
ln -sf $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(LINUX_DIR)
$(MAKE) -C $(TOPDIR)/target/linux/package \
$(KPKG_MAKEOPTS) \
compile
touch $@
$(TARGET_MODULES_DIR): $(TARGET_MODULES_DIR):
-mkdir -p $(TARGET_MODULES_DIR) -mkdir -p $(TARGET_MODULES_DIR)
@ -241,11 +245,7 @@ $(KERNEL_IPKG):
source: $(DL_DIR)/$(LINUX_SOURCE) source: $(DL_DIR)/$(LINUX_SOURCE)
prepare: $(LINUX_DIR)/.configured prepare: $(LINUX_DIR)/.configured
compile: $(LINUX_DIR)/.modules_done $(TARGETS) compile: $(STAMP_DIR)/.linux-compile
ln -sf $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(LINUX_DIR)
$(MAKE) -C $(TOPDIR)/target/linux/package \
$(KPKG_MAKEOPTS) \
compile
install: compile $(TARGET_MODULES_DIR) $(KERNEL_IPKG) install: compile $(TARGET_MODULES_DIR) $(KERNEL_IPKG)
rm -rf $(LINUX_BUILD_DIR)/root* rm -rf $(LINUX_BUILD_DIR)/root*
@ -261,6 +261,7 @@ install: compile $(TARGET_MODULES_DIR) $(KERNEL_IPKG)
[ "$(INSTALL_TARGETS)" != "" ] && $(IPKG_KERNEL) install $(INSTALL_TARGETS) || true [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG_KERNEL) install $(INSTALL_TARGETS) || true
mostlyclean: mostlyclean:
rm -f $(STAMP_DIR)/.linux-compile
rm -f $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)/.modules_done rm -f $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)/.modules_done
rm -f $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)/.drivers-unpacked rm -f $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)/.drivers-unpacked
$(MAKE) -C $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) clean $(MAKE) -C $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) clean
@ -274,5 +275,6 @@ rebuild:
$(MAKE) compile $(MAKE) compile
clean: clean:
rm -f $(STAMP_DIR)/.linux-compile
rm -rf $(LINUX_BUILD_DIR) rm -rf $(LINUX_BUILD_DIR)
rm -f $(TARGETS) rm -f $(TARGETS)

View File

@ -1,3 +1,10 @@
LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
-e 's/mipsel/mips/' \
-e 's/powerpc/ppc/' \
-e 's/sh[234]/sh/' \
)
define KMOD_template define KMOD_template
ifeq ($$(strip $(4)),) ifeq ($$(strip $(4)),)
KDEPEND_$(1):=m KDEPEND_$(1):=m
@ -39,3 +46,5 @@ endif
$(IPKG_BUILD) $$(I_$(1)) $(PACKAGE_DIR) $(IPKG_BUILD) $$(I_$(1)) $(PACKAGE_DIR)
endef endef