[kernel] sched_connmark depends on NF_CONNTRACK_MARK (#8976, #9423)

[openwrt.git] / target / linux / ramips / image / Makefile

diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile
index 98dbdfb..b1e856d 100644 (file)
--- a/target/linux/ramips/image/Makefile
+++ b/target/linux/ramips/image/Makefile
@@ -54,15 +54,12 @@ endef
 
 define BuildFirmware/Generic
        $(call PatchKernelLzma,$(2),$(3) $($(4)))
 
 define BuildFirmware/Generic
        $(call PatchKernelLzma,$(2),$(3) $($(4)))

-       if [ `stat -c%s "$(KDIR)/vmlinux-$(2).bin.lzma"` -gt $(5) ]; then \
-               echo "Warning: $(KDIR)/vmlinux-$(2).bin.lzma is too big"; \
+       $(call MkImage,lzma,"$(KDIR)/vmlinux-$(2).bin.lzma","$(KDIR)/vmlinux-$(2).uImage")
+       if [ `stat -c%s "$(KDIR)/vmlinux-$(2).uImage"` -gt $(5) ]; then \
+               echo "Warning: $(KDIR)/vmlinux-$(2).uImage is too big"; \

        else if [ `stat -c%s $(KDIR)/root.$(1)` -gt $(6) ]; then \
                echo "Warning: $(KDIR)/root.$(1) is too big"; \
        else \
        else if [ `stat -c%s $(KDIR)/root.$(1)` -gt $(6) ]; then \
                echo "Warning: $(KDIR)/root.$(1) is too big"; \
        else \

-               mkimage -A mips -O linux -T kernel -C lzma \
-                       $(call kernel_entry) \
-                       -n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
-                       -d $(KDIR)/vmlinux-$(2).bin.lzma $(KDIR)/vmlinux-$(2).uImage; \

                ( \
                        dd if=$(KDIR)/vmlinux-$(2).uImage bs=$(5) conv=sync; \
                        dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \
                ( \
                        dd if=$(KDIR)/vmlinux-$(2).uImage bs=$(5) conv=sync; \
                        dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \


@@ -85,6 +82,9 @@ mtd_dir300b1_kernel_part_size=851968
 mtd_dir300b1_rootfs_part_size=3014656
 define Image/Build/Template/DIR300B1
        $(call BuildFirmware/Generic,$(1),$(2),board=$(3),mtdlayout_dir300b1,$(mtd_dir300b1_kernel_part_size),$(mtd_dir300b1_rootfs_part_size))
 mtd_dir300b1_rootfs_part_size=3014656
 define Image/Build/Template/DIR300B1
        $(call BuildFirmware/Generic,$(1),$(2),board=$(3),mtdlayout_dir300b1,$(mtd_dir300b1_kernel_part_size),$(mtd_dir300b1_rootfs_part_size))

+       mkwrgimg -s wrgn23_dlwbr_dir300b -d /dev/mtdblock/2 \
+               -i $(call imgname,$(1),$(2))-sysupgrade.bin \
+               -o $(call imgname,$(1),$(2))-factory.bin

 endef
 
 define Image/Build/Profile/DIR300B1
 endef
 
 define Image/Build/Profile/DIR300B1