mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
fix BR2_ and CONFIG_ issues
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3769 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -2,15 +2,15 @@ include $(TOPDIR)/rules.mk
|
||||
|
||||
KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
|
||||
|
||||
ifeq ($(BR2_TARGET_ROOTFS_JFFS2),y)
|
||||
ifeq ($(CONFIG_TARGET_ROOTFS_JFFS2),y)
|
||||
include ./jffs2.mk
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS_LZMA),y)
|
||||
ifeq ($(CONFIG_TARGET_ROOTFS_SQUASHFS_LZMA),y)
|
||||
include ./squashfs.mk
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TARGET_ROOTFS_TGZ),y)
|
||||
ifeq ($(CONFIG_TARGET_ROOTFS_TGZ),y)
|
||||
include ./tgz.mk
|
||||
endif
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ ifeq ($(FS),jffs2-4MB)
|
||||
$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari: $(KDIR)/loader.elf
|
||||
./addVersion -n ArubaOS $(KDIR)/loader.elf $@ version
|
||||
|
||||
ifneq ($(BR2_ARUBA_RAMDISK),y)
|
||||
ifneq ($(CONFIG_ARUBA_RAMDISK),y)
|
||||
$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari $(KDIR)/root.$(FS)
|
||||
@dd if=$< of=$@.tmp bs=655360 conv=sync
|
||||
@cat $(KDIR)/root.$(FS) >> $@.tmp
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
ifneq ($(BR2_mips),y)
|
||||
ifneq ($(CONFIG_mips),y)
|
||||
JFFS2OPTS := --pad --little-endian --squash
|
||||
else
|
||||
JFFS2OPTS := --pad --big-endian --squash
|
||||
|
||||
Reference in New Issue
Block a user