ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-19 05:38:00 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

remove lzma loader config option (make it default) and move it from package/ to target/

Browse Source 
SVN-Revision: 530
This commit is contained in:
Felix Fietkau 2005-04-02 19:06:50 +00:00
parent d2aa16fb0e
commit ebac64aab9
8 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openwrt/package/Config.in
View File

@ -3,7 +3,6 @@
menu "OpenWrt Package Selection" menu "OpenWrt Package Selection"
comment "The default set" comment "The default set"
source "package/loader/Config.in"
source "package/busybox/Config.in" source "package/busybox/Config.in"
source "package/dnsmasq/Config.in" source "package/dnsmasq/Config.in"
source "package/iptables/Config.in" source "package/iptables/Config.in"

6
openwrt/package/loader/Config.in
View File

@ -1,6 +0,0 @@
config BR2_PACKAGE_LOADER
bool "LZMA compressed kernel loader"
default y
help
LZMA compressed kernel loader (saves much space in the flash)

1
openwrt/rules.mk
View File

@ -73,6 +73,7 @@ LINUX_VERSION=2.4.29
LINUX_DIR:=$(BUILD_DIR)/linux LINUX_DIR:=$(BUILD_DIR)/linux
LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux
LINUX_KERNEL:=$(BUILD_DIR)/buildroot-kernel LINUX_KERNEL:=$(BUILD_DIR)/buildroot-kernel
LINUX_IMAGE:=$(BUILD_DIR)/buildroot-kernel-image
MODULES_SUBDIR := lib/modules/$(LINUX_VERSION) MODULES_SUBDIR := lib/modules/$(LINUX_VERSION)
MODULES_DIR := $(BUILD_DIR)/modules/$(MODULES_SUBDIR) MODULES_DIR := $(BUILD_DIR)/modules/$(MODULES_SUBDIR)

14
openwrt/target/Makefile
View File

@ -29,20 +29,9 @@ IMAGE_TARGETS += $(BIN_DIR)/openwrt-motorola-$(1).bin
endif endif
endef endef
# Enable loader and prepare kernel $(LINUX_IMAGE): $(LINUX_KERNEL)
ifeq ($(strip $(BR2_PACKAGE_LOADER)),y)
export LINUX_LOADER=$(BUILD_DIR)/lzmaldr
export LINUX_IMAGE=$(BUILD_DIR)/piggy.lzma
else
export LINUX_IMAGE=$(BUILD_DIR)/piggy.gz
endif
$(BUILD_DIR)/piggy.lzma: $(LINUX_KERNEL)
cat $^ | $(BUILD_DIR)/lzma/lzma e -si -so -eos > $@ || (rm -f $@ && false) cat $^ | $(BUILD_DIR)/lzma/lzma e -si -so -eos > $@ || (rm -f $@ && false)
$(BUILD_DIR)/piggy.gz: $(LINUX_KERNEL)
cat $^ | gzip -c9 $^ > $@ || (rm -f $@ && false)
TARGET_DIRS:= TARGET_DIRS:=
TARGET_FS:= TARGET_FS:=
IMAGE_TARGETS:= IMAGE_TARGETS:=
@ -83,6 +72,7 @@ prepare: $(patsubst %,%-prepare,$(TARGET_DIRS))
$(BIN_DIR): $(BIN_DIR):
mkdir -p $(BIN_DIR) mkdir -p $(BIN_DIR)
$(INSTALL_TARGET_DIRS): lzma-loader-compile
compile: $(patsubst %,%-compile,$(TARGET_DIRS)) compile: $(patsubst %,%-compile,$(TARGET_DIRS))
install: utils-install lzma-install $(LINUX_IMAGE) $(patsubst %,%-install,$(TARGET_DIRS)) $(IMAGE_TARGETS) install: utils-install lzma-install $(LINUX_IMAGE) $(patsubst %,%-install,$(TARGET_DIRS)) $(IMAGE_TARGETS)
clean: $(patsubst %,%-clean,$(TARGET_DIRS)) image_clean clean: $(patsubst %,%-clean,$(TARGET_DIRS)) image_clean

4
openwrt/target/jffs2/Makefile
View File

@ -12,13 +12,13 @@ clean: jffs2root-dirclean
$(BIN_DIR)/openwrt-generic-jffs2-4MB.trx: $(BIN_DIR)/openwrt-generic-jffs2-4MB.trx:
$(MKFS_JFFS2) --pad --little-endian --squash -e 0x10000 \ $(MKFS_JFFS2) --pad --little-endian --squash -e 0x10000 \
-d $(TARGET_DIR) -o $(IMAGE)-4MB.jffs2 -d $(TARGET_DIR) -o $(IMAGE)-4MB.jffs2
PATH=$(TARGET_PATH) trx -o $@ $(LINUX_LOADER) \ PATH=$(TARGET_PATH) trx -o $@ $(BUILD_DIR)/loader.gz \
$(LINUX_IMAGE) -a 0x10000 $(IMAGE)-4MB.jffs2 $(LINUX_IMAGE) -a 0x10000 $(IMAGE)-4MB.jffs2
$(BIN_DIR)/openwrt-generic-jffs2-8MB.trx: $(BIN_DIR)/openwrt-generic-jffs2-8MB.trx:
$(MKFS_JFFS2) --pad --little-endian --squash -e 0x20000 \ $(MKFS_JFFS2) --pad --little-endian --squash -e 0x20000 \
-d $(TARGET_DIR) -o $(IMAGE)-8MB.jffs2 -d $(TARGET_DIR) -o $(IMAGE)-8MB.jffs2
PATH=$(TARGET_PATH) trx -o $@ $(LINUX_LOADER) \ PATH=$(TARGET_PATH) trx -o $@ $(BUILD_DIR)/loader.gz \
$(LINUX_IMAGE) -a 0x20000 $(IMAGE)-8MB.jffs2 $(LINUX_IMAGE) -a 0x20000 $(IMAGE)-8MB.jffs2
$(BIN_DIR)/openwrt-wrt54g-jffs2.bin: $(BIN_DIR)/openwrt-generic-jffs2-4MB.trx $(BIN_DIR)/openwrt-wrt54g-jffs2.bin: $(BIN_DIR)/openwrt-generic-jffs2-4MB.trx

6
openwrt/package/loader/Makefile → openwrt/target/lzma-loader/Makefile
View File

@ -26,14 +26,14 @@ $(PKG_BUILD_DIR)/loader.gz: $(PKG_BUILD_DIR)/.patched
$(MAKE) -C $(PKG_BUILD_DIR) CC=$(TARGET_CC) \ $(MAKE) -C $(PKG_BUILD_DIR) CC=$(TARGET_CC) \
LD=$(TARGET_CROSS)ld CROSS_COMPILE=$(TARGET_CROSS) LD=$(TARGET_CROSS)ld CROSS_COMPILE=$(TARGET_CROSS)
$(BUILD_DIR)/lzmaldr: $(PKG_BUILD_DIR)/loader.gz $(BUILD_DIR)/loader.gz: $(PKG_BUILD_DIR)/loader.gz
cp $< $@ cp $< $@
source: $(DL_DIR)/$(PKG_SOURCE_FILE) source: $(DL_DIR)/$(PKG_SOURCE_FILE)
prepare: $(PKG_BUILD_DIR)/.patched prepare: $(PKG_BUILD_DIR)/.patched
compile: $(BUILD_DIR)/lzmaldr compile: $(BUILD_DIR)/loader.gz
install: install:
clean: clean:
rm -rf $(PKG_BUILD_DIR) rm -rf $(PKG_BUILD_DIR)
rm -f $(BUILD_DIR)/lzmaldr rm -f $(BUILD_DIR)/loader.gz

0
openwrt/package/loader/patches/toolchain.patch → openwrt/target/lzma-loader/patches/toolchain.patch
View File

2
openwrt/target/squashfs-lzma/Makefile
View File

@ -11,6 +11,6 @@ clean: squashfslzmaroot-dirclean
$(BIN_DIR)/openwrt-generic-squashfs.trx: $(BIN_DIR)/openwrt-generic-squashfs.trx:
@mkdir -p $(TARGET_DIR)/jffs @mkdir -p $(TARGET_DIR)/jffs
$(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma $(TARGET_DIR) $(IMAGE).squashfslzma -noappend -root-owned -le $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma $(TARGET_DIR) $(IMAGE).squashfslzma -noappend -root-owned -le
PATH=$(TARGET_PATH) trx -o $@ $(LINUX_LOADER) \ PATH=$(TARGET_PATH) trx -o $@ $(BUILD_DIR)/loader.gz \
$(LINUX_IMAGE) $(IMAGE).squashfslzma $(LINUX_IMAGE) $(IMAGE).squashfslzma