Changeset 673


Ignore:
Timestamp:
Sep 27, 2015, 3:42:44 PM (4 years ago)
Author:
amain
Message:

Add support for EdgeRouter? Lite(Ubiquity). Add NFS boot support, allow disabling of OpenWrt's kernel commandline hack (allow bootloader to supply kernel cmdline), disable debwrt-net, swconfig and debwrt-hostapd packes due to compile issues, fix DebWrt patches.

Location:
trunk
Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/config/debwrt_boot.in

    r517 r673  
    1818menu "DebWrt Boot Options"
    1919
     20config IMAGE_CMDLINE_HACK
     21        tristate
     22        default n if BOOT_METHOD_BOOTLOADER
     23        default y if !BOOT_METHOD_BOOTLOADER
     24         
     25
    2026choice
    2127    prompt "Boot method"
     
    2329        help
    2430          Select how DebWrt should boot
     31
     32config BOOT_METHOD_BOOTLOADER
     33        bool "Ignore OpenWrt built-in kernel command line"
     34        help
     35          Don't use the OpenWrt built-in kernel command line, but use the command line
     36          provided by the boot loader.
     37          .
     38          Many embedded devices don't provided easy access to the bootloader, or if you
     39          manage to get access, the bootloader is very limited and might not allow changing
     40          the kernel command line parameters.  Therefore OpenWrt normally creates kernels
     41          with the kernel command line built-in.
     42          .
     43          This automatically sets OpenWrt's IMAGE_CMDLINE_HACK setting to n and replaces
     44          the the patch-cmdline tool with a no-op script. Which is an ugly hack, but the
     45          only way to avoid big patches.
    2546
    2647config BOOT_METHOD_SCRIPT
     
    6384source "config/kexec.in"
    6485
     86source "config/nfs.in"
     87
    6588endmenu
     89
  • trunk/config/kernel_config.in

    r517 r673  
    1818menu "Kernel Configuration"
    1919
     20menu "Overrides"
     21
     22config SYSFS_DEPRECATED
     23        bool "Enable deprecated sysfs features to support old userspace tools"
     24        default n
     25        help
     26          For DebWrt/Debian: say N hre.
     27          .
     28          This option adds code that switches the layout of the "block" class
     29          devices, to not show up in /sys/class/block/, but only in
     30          /sys/block/.
     31          .
     32          This switch is only active when the sysfs.deprecated=1 boot option is
     33          passed or the SYSFS_DEPRECATED_V2 option is set.
     34          .
     35          This option allows new kernels to run on old distributions and tools,
     36          which might get confused by /sys/class/block/. Since 2007/2008 all
     37          major distributions and tools handle this just fine.
     38          .
     39          Recent distributions and userspace tools after 2009/2010 depend on
     40          the existence of /sys/class/block/, and will not work with this
     41          option enabled.
     42          .
     43          Only if you are using a new kernel on an old distribution, you might
     44          need to say Y here.
     45
     46config SYSFS_DEPRECATED_V2
     47        bool "Enable deprecated sysfs features by default"
     48        default n
     49        depends on SYSFS_DEPRECATED
     50        help
     51          For DebWrt/Debian: say N hre.
     52          .
     53          Enable deprecated sysfs by default.
     54          .
     55          See the CONFIG_SYSFS_DEPRECATED option for more details about this
     56          option.
     57          .
     58          Only if you are using a new kernel on an old distribution, you might
     59          need to say Y here. Even then, odds are you would not need it
     60          enabled, you can always pass the boot option if absolutely necessary.
     61
     62endmenu
     63
    2064menu "General configuration"
    2165
     
    3074          available no Debian compiled program will run. Init(which is the first process which is
    3175          started by the kernel will just freeze.
     76
     77config MIPS_FPU_EMULATOR
     78        bool "MIPS FPU Emulator"
     79        default y
     80        help
     81          MIPS_FPU_EMU now renamed to MIPS_FPU_EMULATOR. See help text of MIPS_FPU_EMU for more
     82          information.
    3283
    3384config INOTIFY
  • trunk/debian/package/debian.mk

    r583 r673  
    2121CH                        := "[\(\)]"
    2222
    23 DEBWRT_ROOTFS_PKGLST      := libnl iw debwrt-kernel-headers robocfg nvram \
    24                              debwrt-hostapd shellinabox libnl-tiny swconfig \
    25                              broadcom-wl debwrt-net mjpg-streamer
     23DEBWRT_ROOTFS_PKGLST      := libnl iw debwrt-kernel-headers nvram \
     24                             libnl-tiny \
     25                             broadcom-wl mjpg-streamer
    2626
    2727DEBWRT_ROOTFS_PKGLST_DEPS := libjpeg8
  • trunk/debian/package/libnl/libnl.sh

    r563 r673  
    1717RELEASE=1
    1818PACKAGE_SOURCE=${PACKAGE}-${VERSION}.tar.gz
    19 DOWNLOAD_URL=http://www.infradead.org/~tgr/libnl/files/${PACKAGE_SOURCE}
     19#DOWNLOAD_URL=http://www.infradead.org/~tgr/libnl/files/${PACKAGE_SOURCE}
     20DOWNLOAD_URL=https://downloads.openwrt.org/sources/${PACKAGE_SOURCE}
    2021DEP=
    2122
  • trunk/debian/package/nvram/debian/rules

    r84 r673  
    2929        install -d debian/libnvram/usr/lib
    3030        install -o root -g root -m 755 src/nvram debian/nvram/usr/sbin/nvram
    31         install -o root -g root -m 644 src/libnvram.so.0.1 debian/libnvram/usr/lib/libnvram.so.0.1
    32         ln -snf libnvram.so.0.1 debian/libnvram/usr/lib/libnvram.so
    3331
    3432override_dh_auto_clean:
  • trunk/openwrt/patches/all/012_disable_all_openwrt_packages

    r517 r673  
    22+++ openwrt/include/toplevel.mk 2010-01-02 00:14:07.000000000 +0100
    33@@ -49,6 +49,11 @@
    4                 f=tmp/.$${type}info; t=tmp/.config-$${type}.in; \
    54                [ "$$t" -nt "$$f" ] || ./scripts/metadata.pl $${type}_config "$$f" > "$$t" || { rm -f "$$t"; echo "Failed to build $$t"; false; break; }; \
    65        done
     6        [ tmp/.config-feeds.in -nt tmp/.packagefeeds ] || ./scripts/feeds feed_config > tmp/.config-feeds.in
    77+       # DebWrt: we don't need to build any packages by default, so we disable them
    88+       #         all. This allows us to have fine control over which packages we
     
    1212        ./scripts/metadata.pl package_mk tmp/.packageinfo > tmp/.packagedeps || { rm -f tmp/.packagedeps; false; }
    1313        touch $(TOPDIR)/tmp/.build
    14  
  • trunk/openwrt/patches/trunk/025_make_empty_rootfs

    r556 r673  
    1 --- openwrt/include/image.mk.org
    2 +++ openwrt/include/image.mk
    3 @@ -122,12 +122,26 @@
    4  endif
     1Index: openwrt-octeon-generic-trunk-HEAD/include/image.mk
     2===================================================================
     3--- openwrt-octeon-generic-trunk-HEAD/include/image.mk  (revision 47046)
     4+++ openwrt-octeon-generic-trunk-HEAD/include/image.mk  (working copy)
     5@@ -169,9 +169,24 @@
     6 $(eval $(foreach S,$(JFFS2_BLOCKSIZE),$(call Image/mkfs/jffs2/template,$(S))))
     7 $(eval $(foreach S,$(NAND_BLOCKSIZE),$(call Image/mkfs/jffs2-nand/template,$(S))))
    58 
    6  ifneq ($(CONFIG_TARGET_ROOTFS_SQUASHFS),)
     9-define Image/mkfs/squashfs
    710+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
     11+   define Image/mkfs/squashfs
     12+       # kexec and LABEL= boot
     13+       @mkdir -p $(TARGET_DIR)/overlay
     14+       ls -l $(TARGET_DIR)
     15+       # remove /lib/modules to prevent the image from getting to big
     16+       rm -rf $(TARGET_DIR)/lib/modules
     17        $(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)
     18-endef
     19+   endef
     20+else
     21+   define Image/mkfs/squashfs
     22+       # boot direclty from device
     23+       @mkdir -p $(TARGET_DIR)/overlay
     24+       mkdir -p $(TMP_DIR)/debwrt-empty-rootfs/overlay
     25+       touch $(TMP_DIR)/debwrt-empty-rootfs/debwrt-empty-rootfs
     26+       $(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)
     27+   endef
    2628+endif
    2729 
    28  ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),)
    29      define Image/mkfs/ubifs
     30 # $(1): board name
     31 # $(2): rootfs type
Note: See TracChangeset for help on using the changeset viewer.