more cleanup (make sure to pass TARGET_PATH and not just TARGET_CC)
SVN-Revision: 4432
This commit is contained in:
parent
429f4764ac
commit
6c81c75f03
9 changed files with 10 additions and 19 deletions
|
@ -66,7 +66,7 @@ else
|
||||||
endif
|
endif
|
||||||
|
|
||||||
$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.linux-compile pkg-install ramdisk-config
|
$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.linux-compile pkg-install ramdisk-config
|
||||||
$(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH)
|
$(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)"
|
||||||
|
|
||||||
$(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
|
$(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
|
||||||
$(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@
|
$(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@
|
||||||
|
@ -75,7 +75,7 @@ $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux
|
||||||
$(LINUX_DIR)/.modules_done:
|
$(LINUX_DIR)/.modules_done:
|
||||||
rm -rf $(KERNEL_BUILD_DIR)/modules
|
rm -rf $(KERNEL_BUILD_DIR)/modules
|
||||||
$(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" modules
|
$(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" modules
|
||||||
$(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install
|
$(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install
|
||||||
touch $(LINUX_DIR)/.modules_done
|
touch $(LINUX_DIR)/.modules_done
|
||||||
|
|
||||||
modules: $(LINUX_DIR)/.modules_done
|
modules: $(LINUX_DIR)/.modules_done
|
||||||
|
|
|
@ -285,7 +285,6 @@ endef
|
||||||
define Build/Compile/Default
|
define Build/Compile/Default
|
||||||
$(MAKE) -C $(PKG_BUILD_DIR) \
|
$(MAKE) -C $(PKG_BUILD_DIR) \
|
||||||
$(TARGET_CONFIGURE_OPTS) \
|
$(TARGET_CONFIGURE_OPTS) \
|
||||||
CC=$(TARGET_CC) \
|
|
||||||
CROSS="$(TARGET_CROSS)" \
|
CROSS="$(TARGET_CROSS)" \
|
||||||
EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include" \
|
EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include" \
|
||||||
ARCH="$(ARCH)" \
|
ARCH="$(ARCH)" \
|
||||||
|
|
|
@ -36,7 +36,7 @@ endef
|
||||||
|
|
||||||
define Build/Compile
|
define Build/Compile
|
||||||
$(MAKE) -C $(PKG_BUILD_DIR) \
|
$(MAKE) -C $(PKG_BUILD_DIR) \
|
||||||
CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
|
$(TARGET_CONFIGURE_OPTS) \
|
||||||
BINDIR="/usr/sbin" MANDIR="/usr/man" \
|
BINDIR="/usr/sbin" MANDIR="/usr/man" \
|
||||||
all
|
all
|
||||||
endef
|
endef
|
||||||
|
|
|
@ -81,11 +81,11 @@ endef
|
||||||
|
|
||||||
define Build/Compile
|
define Build/Compile
|
||||||
$(MAKE) -C $(PKG_BUILD_DIR) \
|
$(MAKE) -C $(PKG_BUILD_DIR) \
|
||||||
LD="$(TARGET_CC)" \
|
$(TARGET_CONFIGURE_OPTS) \
|
||||||
PROGRAMS="dropbear dbclient dropbearkey scp" \
|
PROGRAMS="dropbear dbclient dropbearkey scp" \
|
||||||
MULTI=1 SCPPROGRESS=1
|
MULTI=1 SCPPROGRESS=1
|
||||||
$(MAKE) -C $(PKG_BUILD_DIR) \
|
$(MAKE) -C $(PKG_BUILD_DIR) \
|
||||||
LD="$(TARGET_CC)" \
|
$(TARGET_CONFIGURE_OPTS) \
|
||||||
PROGRAMS="dropbearconvert"
|
PROGRAMS="dropbearconvert"
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
|
|
@ -71,6 +71,7 @@ define Build/Compile
|
||||||
mkdir -p $(PKG_INSTALL_DIR)
|
mkdir -p $(PKG_INSTALL_DIR)
|
||||||
$(MAKE) -C $(PKG_BUILD_DIR) \
|
$(MAKE) -C $(PKG_BUILD_DIR) \
|
||||||
CCOPT="$(TARGET_CFLAGS) -I$(BUILD_DIR)/linux/include" \
|
CCOPT="$(TARGET_CFLAGS) -I$(BUILD_DIR)/linux/include" \
|
||||||
|
PATH=$(TARGET_PATH) \
|
||||||
DESTDIR="$(PKG_INSTALL_DIR)" \
|
DESTDIR="$(PKG_INSTALL_DIR)" \
|
||||||
all install
|
all install
|
||||||
endef
|
endef
|
||||||
|
|
|
@ -44,11 +44,7 @@ define Build/Configure
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Build/Compile
|
define Build/Compile
|
||||||
rm -rf $(PKG_INSTALL_DIR)
|
$(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" all install)
|
||||||
mkdir -p $(PKG_INSTALL_DIR)
|
|
||||||
$(MAKE) -C $(PKG_BUILD_DIR) \
|
|
||||||
DESTDIR="$(PKG_INSTALL_DIR)" \
|
|
||||||
all install
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/linux-atm/install
|
define Package/linux-atm/install
|
||||||
|
|
|
@ -29,12 +29,6 @@ define Build/Prepare
|
||||||
$(CP) ./src/* $(PKG_BUILD_DIR)/
|
$(CP) ./src/* $(PKG_BUILD_DIR)/
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Build/Compile
|
|
||||||
$(MAKE) -C $(PKG_BUILD_DIR) \
|
|
||||||
CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
|
|
||||||
all
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Package/mtd/install
|
define Package/mtd/install
|
||||||
install -d -m0755 $(1)/sbin
|
install -d -m0755 $(1)/sbin
|
||||||
install -m0755 $(PKG_BUILD_DIR)/mtd $(1)/sbin/
|
install -m0755 $(PKG_BUILD_DIR)/mtd $(1)/sbin/
|
||||||
|
|
|
@ -87,7 +87,7 @@ define Build/Compile
|
||||||
rm -rf $(PKG_INSTALL_DIR)
|
rm -rf $(PKG_INSTALL_DIR)
|
||||||
mkdir -p $(PKG_INSTALL_DIR)/usr
|
mkdir -p $(PKG_INSTALL_DIR)/usr
|
||||||
$(MAKE) -C $(PKG_BUILD_DIR) \
|
$(MAKE) -C $(PKG_BUILD_DIR) \
|
||||||
CC="$(TARGET_CC)" \
|
$(TARGET_CONFIGURE_OPTS) \
|
||||||
COPTS="$(TARGET_CFLAGS)" \
|
COPTS="$(TARGET_CFLAGS)" \
|
||||||
PRECOMPILED_FILTER=1 \
|
PRECOMPILED_FILTER=1 \
|
||||||
STAGING_DIR="$(STAGING_DIR)" \
|
STAGING_DIR="$(STAGING_DIR)" \
|
||||||
|
|
|
@ -35,7 +35,8 @@ define Build/Compile
|
||||||
rm -rf $(PKG_INSTALL_DIR)
|
rm -rf $(PKG_INSTALL_DIR)
|
||||||
mkdir -p $(PKG_INSTALL_DIR)
|
mkdir -p $(PKG_INSTALL_DIR)
|
||||||
$(MAKE) -C $(PKG_BUILD_DIR) \
|
$(MAKE) -C $(PKG_BUILD_DIR) \
|
||||||
CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS) -I." \
|
$(TARGET_CONFIGURE_OPTS) \
|
||||||
|
CFLAGS="$(TARGET_CFLAGS) -I." \
|
||||||
libiw.so.28 iwmulticall
|
libiw.so.28 iwmulticall
|
||||||
$(MAKE) -C $(PKG_BUILD_DIR) \
|
$(MAKE) -C $(PKG_BUILD_DIR) \
|
||||||
PREFIX="$(PKG_INSTALL_DIR)" \
|
PREFIX="$(PKG_INSTALL_DIR)" \
|
||||||
|
|
Loading…
Reference in a new issue