Changeset 770


Ignore:
Timestamp:
Nov 19, 2016, 2:03:12 PM (2 years ago)
Author:
amain
Message:

Install target dependent files during boot (sysV or systemd). This is needed because DebWrt rootfs image now are target independent. The target dependent files are installed via the debwrt-modules-*.gz file, which contains the target depending moduels and two files: /lib/modules/debwrt.target and /lib/modules/debwrt.subtarget. In case systemd does not work, sysvinit is installed as well (jessie+).

Location:
trunk
Files:
8 added
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/debian/rootfs/debian.mk

    r724 r770  
    2222ROOTFS_DEBIAN_INCLUDE_PACKAGES:=$(call qstrip,$(CONFIG_ROOTFS_DEBIAN_INCLUDE_PACKAGES))
    2323ROOTFS_DEBIAN_QEMU_2ND_STAGE:=$(call qstrip, $(CONFIG_ROOTFS_DEBIAN_QEMU_2ND_STAGE))
    24 DEBWRT_EXTRA_ROOTFS_FILES_DIR:=$(TOPDIR)/debian/rootfs/files/all
    25 DEBWRT_EXTRA_ROOTFS_FILES_BOARD_DIR:=$(TOPDIR)/debian/rootfs/files/$(call qstrip, $(CONFIG_TARGET_BOARD))
     24DEBWRT_EXTRA_ROOTFS_FILES_DIR:=$(TOPDIR)/debian/rootfs/files
    2625MODULES_VERSION=$(shell echo `basename $(DEBWRT_MODULES_ARCHIVE) 2>/dev/null` | awk -F '-' '{print $$6}')
    2726ROOTFS_DEBIAN_INCLUDE_PACKAGES_DEBIAN_VERSION:=$(wildcard debian/rootfs/include_packages.list.$(ROOTFS_DEBIAN_RELEASE))
     
    4847         | tr ' ' '\n' \
    4948         >$(TMP_DIR)/include_packages_list.debwrt-package-deps; \
    50         grep -hv '^#' \
     49        grep -hv -e '^#' -v -e '^$$' \
    5150                 $(ROOTFS_DEBIAN_INCLUDE_PACKAGES) \
    5251                 $(ROOTFS_DEBIAN_INCLUDE_PACKAGES_DEBIAN_VERSION) \
     
    121120        chmod 600 $(DEBWRT_EXTRA_ROOTFS_FILES_DIR)/etc/ssh/ssh_host_rsa_key
    122121        chmod 600 $(DEBWRT_EXTRA_ROOTFS_FILES_DIR)/etc/ssh/ssh_host_dsa_key
    123         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"
     122        @echo "Installing generic files (all):"
     123        sudo bash -c "tar cf - --exclude=".svn" -C $(DEBWRT_EXTRA_ROOTFS_FILES_DIR)/all . | tar -xovf - -C $(ROOTFS_BUILD_DIR)"
     124        @echo "Installing all targets files:"
     125        sudo mkdir -p $(ROOTFS_BUILD_DIR)/target
     126        sudo bash -c "tar cf - --exclude=".svn" --exclude ./all -C $(DEBWRT_EXTRA_ROOTFS_FILES_DIR) . | tar -xovf - -C $(ROOTFS_BUILD_DIR)/target"
    125127        sudo cat $(ROOTFS_BUILD_DIR)/etc/securetty \
    126128                $(TOPDIR)/debian/rootfs/securetty.tail \
     
    142144        sudo bash -c "cd $(ROOTFS_BUILD_DIR)/dev ; /sbin/MAKEDEV -v consoleonly"
    143145        sudo bash -c "cd $(ROOTFS_BUILD_DIR)/dev ; /sbin/MAKEDEV -v sda"
     146        sudo bash -c "cd $(ROOTFS_BUILD_DIR)/dev ; mknod -m 555 /dev/ttyS0 c 4 64; chown :tty ttyS0"
    144147        touch $@
    145148
  • trunk/debian/rootfs/include_packages.list

    r724 r770  
    11#
    22# this list is during build converted with
    3 #   grep -v '^#' | tr '\n' , | sed -e 's/^/"/' -e 's/,$/"/'
     3#   grep -v -e '^#' -v -e '^$' | tr '\n' , | sed -e 's/^/"/' -e 's/,$/"/'
    44# so it can and will be use as value for the parameter
    55#   --include=
  • trunk/debian/rootfs/include_packages.list.jessie

    r690 r770  
    11#
    22# this list is during build converted with
    3 #   grep -v '^#' | tr '\n' , | sed -e 's/^/"/' -e 's/,$/"/'
     3#   grep -v -e '^#' -v -e '^$' | tr '\n' , | sed -e 's/^/"/' -e 's/,$/"/'
    44# so it can and will be use as value for the parameter
    55#   --include=
     
    88#
    99fake-hwclock
     10
     11# Include sysvinit for fallback. Default is systemd as of jessie. 
     12sysvinit
  • trunk/debian/rootfs/include_packages.list.sid

    r517 r770  
    11#
    22# this list is during build converted with
    3 #   grep -v '^#' | tr '\n' , | sed -e 's/^/"/' -e 's/,$/"/'
     3#   grep -v -e '^#' -v -e '^$' | tr '\n' , | sed -e 's/^/"/' -e 's/,$/"/'
    44# so it can and will be use as value for the parameter
    55#   --include=
     
    88#
    99fake-hwclock
     10
     11# Include sysvinit for fallback. Default is systemd as of jessie. 
     12sysvinit
  • trunk/debian/rootfs/include_packages.list.squeeze

    r517 r770  
    11#
    22# this list is during build converted with
    3 #   grep -v '^#' | tr '\n' , | sed -e 's/^/"/' -e 's/,$/"/'
     3#   grep -v -e '^#' -v -e '^$' | tr '\n' , | sed -e 's/^/"/' -e 's/,$/"/'
    44# so it can and will be use as value for the parameter
    55#   --include=
  • trunk/debian/rootfs/include_packages.list.stretch

    r694 r770  
    11#
    22# this list is during build converted with
    3 #   grep -v '^#' | tr '\n' , | sed -e 's/^/"/' -e 's/,$/"/'
     3#   grep -v -e '^#' -v -e '^$' | tr '\n' , | sed -e 's/^/"/' -e 's/,$/"/'
    44# so it can and will be use as value for the parameter
    55#   --include=
  • trunk/debian/rootfs/include_packages.list.wheezy

    r584 r770  
    11#
    22# this list is during build converted with
    3 #   grep -v '^#' | tr '\n' , | sed -e 's/^/"/' -e 's/,$/"/'
     3#   grep -v -e '^#' -v -e '^$' | tr '\n' , | sed -e 's/^/"/' -e 's/,$/"/'
    44# so it can and will be use as value for the parameter
    55#   --include=
  • trunk/openwrt/openwrt-deliver.mk

    r724 r770  
    8888        done
    8989        PATH="/sbin:/bin:/usr/sbin:/usr/bin" depmod -a -b $(INSTALL_DIR_OPENWRT_MODULES) $(OPENWRT_LINUX_UNAME_VERSION)
     90        echo $(TARGET) >$(INSTALL_DIR_OPENWRT_MODULES)/lib/modules/debwrt.target
     91        echo $(SUB_TARGET) >$(INSTALL_DIR_OPENWRT_MODULES)/lib/modules/debwrt.subtarget
    9092        tar czf $(INSTALL_DIR_OPENWRT)/$(MODULES_TAR_GZ) -C $(INSTALL_DIR_OPENWRT_MODULES) .
    9193
Note: See TracChangeset for help on using the changeset viewer.