diff options
| author | wbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-02-19 13:00:30 +0000 |
|---|---|---|
| committer | wbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-02-19 13:00:30 +0000 |
| commit | 6331e0d599b67379c2bee1d584cf42ab94e9fc9e (patch) | |
| tree | 5ff9396a098d631bae3a7d7c70bd4d9fa294a8af /openwrt/package | |
| parent | c774a728f37181d400e26edfcc15e4d3e6510249 (diff) | |
demistifying make *clean targets, fix some clean targets issues
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@272 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt/package')
| -rw-r--r-- | openwrt/package/linux/linux.config | 2 | ||||
| -rw-r--r-- | openwrt/package/linux/linux.mk | 6 | ||||
| -rw-r--r-- | openwrt/package/sed/sed.mk | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/openwrt/package/linux/linux.config b/openwrt/package/linux/linux.config index aef2c2888e..423fd8ce43 100644 --- a/openwrt/package/linux/linux.config +++ b/openwrt/package/linux/linux.config @@ -86,7 +86,7 @@ CONFIG_BCM4704=y # CONFIG_HIGHMEM is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set -CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs init=/etc/preinit noinitrd console=ttyS0,115200" +CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=jffs2 init=/etc/preinit noinitrd console=ttyS0,115200" CONFIG_PCI=y CONFIG_NONCOHERENT_IO=y CONFIG_NEW_TIME_C=y diff --git a/openwrt/package/linux/linux.mk b/openwrt/package/linux/linux.mk index 6d4545b3c4..bead2226a6 100644 --- a/openwrt/package/linux/linux.mk +++ b/openwrt/package/linux/linux.mk @@ -57,6 +57,12 @@ endif $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched -cp $(LINUX_KCONFIG) $(LINUX_DIR)/.config +ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS_LZMA),y) + $(SED) "s,rootfstype=jffs2,rootfstype=squashfs," $(LINUX_DIR)/.config +endif +ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS),y) + $(SED) "s,rootfstype=jffs2,rootfstype=squashfs," $(LINUX_DIR)/.config +endif $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/Makefile $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/arch/mips/Makefile $(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile diff --git a/openwrt/package/sed/sed.mk b/openwrt/package/sed/sed.mk index 637768920c..8de0ea64cd 100644 --- a/openwrt/package/sed/sed.mk +++ b/openwrt/package/sed/sed.mk @@ -69,7 +69,6 @@ use-sed-host-binary: host-sed: $(HOST_SED_TARGET) host-sed-clean: - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(SED_DIR1) uninstall -$(MAKE) -C $(SED_DIR1) clean host-sed-dirclean: @@ -127,7 +126,6 @@ sed-target_binary: $(SED_DIR2)/$(SED_BINARY) sed: uclibc sed-target_binary sed-clean: - $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SED_DIR2) uninstall -$(MAKE) -C $(SED_DIR2) clean sed-dirclean: |