Changeset 676 for trunk/debian/rootfs


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/debian/rootfs
Files:
4 added
1 edited
6 moved

Legend:

Unmodified
Added
Removed
  • 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.