|
Last change
on this file since 349 was
349,
checked in by ehem, 10 years ago
|
|
Rework the openwrt/patch target. Instead of patching with a hand-rolled
list of patches, scan the appropriate directories for patch files. Patch
filenames now MUST match the pattern [0-9]+(-[0-9]*:[0-9]*)_<name>. The
lead digits specify order of application, lower numbers are applied
first. If present, the two subsequent numbers indicate a range of
Subversion revisions that a given patch applies to. If a number is
absent, the range is interpreted to include all older revisions or all
newer revisions as appropriate.
Adjust openwrt/unpatch target to match (patches are now removed in
reverse order). Adjust the generate script to match.
|
|
File size:
1.2 KB
|
| Line | |
|---|
| 1 | --- include/image.mk.org 2012-02-15 20:30:10.713220246 +0100 |
|---|
| 2 | +++ include/image.mk 2012-02-15 20:41:49.980687722 +0100 |
|---|
| 3 | @@ -87,12 +87,26 @@ |
|---|
| 4 | endif |
|---|
| 5 | |
|---|
| 6 | ifneq ($(CONFIG_TARGET_ROOTFS_SQUASHFS),) |
|---|
| 7 | + ifneq ($(CONFIG_BOOT_METHOD_SCRIPT),) |
|---|
| 8 | define Image/mkfs/squashfs |
|---|
| 9 | + # boot direclty from device |
|---|
| 10 | @mkdir -p $(TARGET_DIR)/overlay |
|---|
| 11 | + mkdir -p $(TMP_DIR)/debwrt-empty-rootfs/overlay |
|---|
| 12 | + touch $(TMP_DIR)/debwrt-empty-rootfs/debwrt-empty-rootfs |
|---|
| 13 | + $(STAGING_DIR_HOST)/bin/mksquashfs4 $(TMP_DIR)/debwrt-empty-rootfs/ $(KDIR)/root.squashfs -nopad -noappend -root-owned -comp $(SQUASHFSCOMP) $(SQUASHFSOPT) -processors $(if $(CONFIG_PKG_BUILD_JOBS),$(CONFIG_PKG_BUILD_JOBS),1) |
|---|
| 14 | + endef |
|---|
| 15 | + else |
|---|
| 16 | + define Image/mkfs/squashfs |
|---|
| 17 | + # kexec and LABEL= boot |
|---|
| 18 | + @mkdir -p $(TARGET_DIR)/overlay |
|---|
| 19 | + ls -l $(TARGET_DIR) |
|---|
| 20 | + # remove /lib/modules to prevent the image from getting to big |
|---|
| 21 | + rm -rf $(TARGET_DIR)/lib/modules |
|---|
| 22 | $(STAGING_DIR_HOST)/bin/mksquashfs4 $(TARGET_DIR) $(KDIR)/root.squashfs -nopad -noappend -root-owned -comp $(SQUASHFSCOMP) $(SQUASHFSOPT) -processors $(if $(CONFIG_PKG_BUILD_JOBS),$(CONFIG_PKG_BUILD_JOBS),1) |
|---|
| 23 | $(call Image/Build,squashfs) |
|---|
| 24 | endef |
|---|
| 25 | endif |
|---|
| 26 | + endif |
|---|
| 27 | |
|---|
| 28 | ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),) |
|---|
| 29 | define Image/mkfs/ubifs |
|---|
Note: See
TracBrowser
for help on using the repository browser.
