Changeset 676


Ignore:
Timestamp:
Oct 4, 2015, 5:18:17 PM (4 years ago)
Author:
amain
Message:

Added full Debian Jessie root filesystem support. Added systemd kernel dependencies. Updated qemu version. Building DebWrt package is now optional. Various other improvements.

Location:
trunk
Files:
17 added
3 deleted
2 edited
19 moved

Legend:

Unmodified
Added
Removed
  • trunk/Config.in

    r517 r676  
    4747mainmenu "DebWrt Configuration"
    4848
    49 source "config/plugin.in"
     49source "config/kernel/config.in"
     50source "config/cross/config.in"
     51source "config/rootfs/config.in"
    5052
    51 source "config/archs.in"
    52 source "config/target.in"
    53 
    54 source "config/image_name.in"
    55 source "config/flash_ip.in"
    56 
    57 source "config/openwrt_version.in"
    58 source "config/openwrt_extra.in"
    59 
    60 source "config/kernel_version.in"
    61 source "config/kernel_config.in"
    62 
    63 source "config/debian_cross.in"
    64 source "config/debian_rootfs.in"
    65 
    66 source "config/debwrt_general.in"
    67 source "config/debwrt_boot.in"
    68 
    69 # End of file
  • trunk/config/cross/config.in

    r672 r676  
    1818# Kconfig documentation: http://lxr.linux.no/#linux+v2.6.34.1/Documentation/kbuild/kconfig-language.txt
    1919
    20 menu "Debian Cross-Compile Environment"
     20menu "Cross Compilation"
    2121       
    2222config DEBIAN_BUILDENV_REPOSITORY
  • trunk/config/kernel/config/boot.in

    r674 r676  
    1616# along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717
    18 menu "DebWrt Boot Options"
     18menu "Boot Options"
    1919
    2020config IMAGE_CMDLINE_HACK
     
    8383          to become ready, before the kernel tries to boot from it.
    8484
    85 source "config/kexec.in"
     85source "config/kernel/config/kexec.in"
    8686
    87 source "config/nfs.in"
     87source "config/kernel/config/nfs.in"
    8888
    8989endmenu
  • trunk/config/kernel/config/nfs.in

    r673 r676  
    5151
    5252config NFS_FS
    53         bool "NFS_FS
     53        bool "NFS_FS"
    5454        depends DEBWRT_NFS_ROOT
    5555        default y
  • trunk/config/kernel/config/options.in

    r673 r676  
    1616# along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717
    18 menu "Kernel Configuration"
     18
     19menu "DebWrt kernel options/overrides"
    1920
    2021menu "Overrides"
     
    6263endmenu
    6364
     65source "config/kernel/config/systemd.in"
     66
    6467menu "General configuration"
     68
     69# systemd kernel requirements/recommendations: http://cgit.freedesktop.org/systemd/systemd/tree/README
     70
     71config NET_NS
     72        bool "Network namespace support"
     73        default y
     74        help
     75          Allow user space to create what appear to be multiple instances of the
     76          network stack.
     77          .
     78          Systemd requirement, starting with Jessie.
     79
     80config BLK_DEV_BSG
     81        bool "Block layer SG support v4"
     82        default y
     83        help
     84          Saying Y here will enable generic SG (SCSI generic) v4 support for any
     85          block device. Unlike SG v3 (aka block/scsi_ioctl.c drivers/scsi/sg.c), SG
     86          v4 can handle complicated SCSI commands: tagged variable length cdbs with
     87          bidirectional data transfers and generic request/response protocols (e.g.
     88          Task Management Functions and SMP in Serial Attached SCSI).
     89          .
     90          This option is required by recent UDEV versions to properly access device
     91          serial numbers, etc.
     92          .
     93          If unsure, say Y.
     94          .
     95          Recommended by systemd, starting with Jessie.
     96
     97
     98config DMIID
     99        bool "Export DMI identification via sysfs to userspace"
     100        default y
     101        help
     102          Say Y here if you want to query SMBIOS/DMI system identification information
     103          from userspace through /sys/class/dmi/id/ or if you want DMI-based module
     104          auto-loading.
     105          loading firmware files as a fallback after the direct file loading in kernel
     106          fails. The user-mode helper is no longer required unless you have a special
     107          .
     108          Recommended for systemd, starting with Jessie.
     109
     110config FW_LOADER_USER_HELPER
     111        bool "Fallback user-helper invocation for firmware loading"
     112        default n
     113        help
     114          This option enables / disables the invocation of user-helper (e.g. udev) for
     115          loading firmware files as a fallback after the direct file loading in kernel
     116          fails. The user-mode helper is no longer required unless you have a special
     117          firmware file that resides in a non-standard path.
     118          .
     119          Required disabled for systemd, starting with Jessie.
     120
     121config UEVENT_HELPER_PATH
     122        string "Path to uevent helper"
     123        default ""
     124        help
     125          To disable user space helper program execution at by default specify an empty
     126          string here. This setting can still be altered via /proc/sys/kernel/hotplug
     127          or via /sys/kernel/uevent_helper later at runtime.
     128          .
     129          Recommended disabled for performance tuning for systemd, starting with Jessie.
     130
     131config FHANDLE
     132        bool "Open by fhandle syscalls"
     133        default y
     134        help
     135          If you say Y here, a user level program will be able to map file names
     136          to handle and then later use the handle for different file system operations.
     137          This is useful in implementing userspace file servers, which now track files
     138          using handles instead of names. The handle would remain the same even if file
     139          names get renamed. Enables open_by_handle_at(2) and name_to_handle_at(2)
     140          syscalls.
     141          .
     142          Required for systemd, starting with Jessie.
     143
     144config IPV6
     145        tristate "The IPv6 protocol"
     146        default m
     147        help
     148          This is complemental support for the IP version 6.
     149          You will still be able to do traditional IPv4 networking as well.
     150          .
     151          Recommended for systemd, starting with Jessie.
     152
     153config AUTOFS4_FS
     154        tristate "Kernel automounter version 4 support (also supports v3)"
     155        default m
     156        help
     157          The automounter is a tool to automatically mount remote file systems
     158          on demand. This implementation is partially kernel-based to reduce
     159          overhead in the already-mounted case; this is unlike the BSD
     160          automounter (amd), which is a pure user space daemon.
     161          .
     162          Recommended for systemd, starting with Jessie.
     163
     164config CGROUPS
     165        bool "Control Group Support"
     166        default y
     167        help
     168          This option adds support for grouping sets of processes together, for
     169          use with process control subsystems such as Cpusets, CFS, memory
     170          controls or device isolation.
     171          .
     172          Required by systemd, starting with Jessie.
     173
     174config DEVTMPFS
     175        bool "Maintain devtmpfs to mount at /dev"
     176        default y
     177        help
     178          This creates a tmpfs/ramfs filesystem instance early at bootup. In this filesystem,
     179          the kernel driver core maintains device nodes with their default names and
     180          permissions for all registered devices with an assigned major/minor number.
     181          .
     182          Debian Jessie requires this.
    65183
    66184#CONFIG_MIPS_FPU_EMU=y
     
    583701        depends on EXT3_FS_XATTR
    584702        select FS_POSIX_ACL
     703        default y
    585704        help
    586705          Posix Access Control Lists (ACLs) support permissions for users and
     
    595714        bool "Ext3 Security Labels"
    596715        depends on EXT3_FS_XATTR
     716        default y
    597717        help
    598718          Security labels support alternative access control models
     
    709829        default n
    710830
     831
    711832endmenu
    712 
  • trunk/config/rootfs/config.in

    r675 r676  
    1616# along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717
    18 source "config/debian_release.in"
     18source "config/rootfs/debian_release.in"
    1919
    20 menu "Debian Root Filesystem"
     20menu "Root Filesystem"
    2121
    2222choice
  • trunk/debian/rootfs/debian.mk

    r675 r676  
    1818DEBIAN_ROOTFS_INCLUDE_PACKAGES:=$(call qstrip,$(CONFIG_DEBIAN_ROOTFS_INCLUDE_PACKAGES))
    1919DEBIAN_ROOTFS_QEMU_2ND_STAGE:=$(call qstrip, $(CONFIG_DEBIAN_ROOTFS_QEMU_2ND_STAGE))
    20 DEBWRT_EXTRA_ROOTFS_FILES_DIR:=$(TOPDIR)/debian/rootfs/files
     20DEBWRT_EXTRA_ROOTFS_FILES_DIR:=$(TOPDIR)/debian/rootfs/files/all
     21DEBWRT_EXTRA_ROOTFS_FILES_BOARD_DIR:=$(TOPDIR)/debian/rootfs/files/$(call qstrip, $(CONFIG_TARGET_BOARD))
    2122DEBWRT_MODULES_ARCHIVE=$(shell ls $(INSTALL_DIR)/debwrt-modules-*.tar.gz 2>/dev/null)
    2223MODULES_VERSION=$(shell echo `basename $(DEBWRT_MODULES_ARCHIVE) 2>/dev/null` | awk -F '-' '{print $$6}')
     
    6768               debian/rootfs/modules-install      \
    6869               debian/rootfs/post-setup           \
    69                debian/rootfs/second-stage-qemu    \
     70               debian/rootfs/second-stage         \
    7071               debian/rootfs/verify               \
    7172               debian/rootfs/save
     
    121122        chmod 600 $(DEBWRT_EXTRA_ROOTFS_FILES_DIR)/etc/ssh/ssh_host_dsa_key
    122123        sudo bash -c "tar cf - --exclude=".svn" -C $(DEBWRT_EXTRA_ROOTFS_FILES_DIR) . | tar -xovf - -C $(ROOTFS_BUILD_DIR)"
     124        sudo bash -c "if [ -d $(DEBWRT_EXTRA_ROOTFS_FILES_BOARD_DIR) ]; then tar cf - --exclude=".svn" -C $(DEBWRT_EXTRA_ROOTFS_FILES_BOARD_DIR) . | tar -xovf - -C $(ROOTFS_BUILD_DIR); fi"
    123125        sudo cat $(ROOTFS_BUILD_DIR)/etc/securetty \
    124126                $(TOPDIR)/debian/rootfs/securetty.tail \
     
    175177else
    176178debian/rootfs/debwrt-packages:
    177         echo "Not installing DebWrt Debian packages in target root filesystem."
     179        @echo "Not installing DebWrt Debian packages in target root filesystem."
    178180        touch $@
    179181endif
     
    193195
    194196ifeq ($(DEBIAN_ROOTFS_QEMU_2ND_STAGE),y)
    195 debian/rootfs/second-stage-qemu: debian/rootfs/bootstrap debian/buildenv/qemu
     197debian/rootfs/second-stage: debian/rootfs/bootstrap debian/buildenv/qemu
    196198        $(call qemu-prepare)
    197199        sudo chroot $(ROOTFS_BUILD_DIR) /usr/sbin/PostInstall && sudo rm -f $(ROOTFS_BUILD_DIR)/usr/sbin/PostInstall
    198200        $(call qemu-cleanup)
    199201else
    200 debian/rootfs/second-stage-qemu: debian/rootfs/bootstrap
     202debian/rootfs/second-stage: debian/rootfs/bootstrap
    201203        @echo "I: Qemu 2nd stage install disabled. Second stage needs now to be performend on the target device itself."
    202204        @echo "I: Qemu 2nd stage install can be enabled using menuconfig (DEBIAN_ROOTFS_QEMU_2ND_STAGE)."
Note: See TracChangeset for help on using the changeset viewer.