Changeset 517 for trunk/debian/rootfs


Ignore:
Timestamp:
Jun 26, 2013, 11:25:44 PM (6 years ago)
Author:
amain
Message:

Merge contrib branch 340:516. Main features added:

  • updated plugin architecture
  • improved patch system
  • bitten continous integration support
  • sever build fixed over time to remain in sync with OpenWrt
Location:
trunk
Files:
3 edited
3 copied

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/debian/rootfs/debian.mk

    r314 r517  
    2121DEBWRT_MODULES_ARCHIVE=$(shell ls $(INSTALL_DIR)/debwrt-modules-*.tar.gz 2>/dev/null)
    2222MODULES_VERSION=$(shell echo `basename $(DEBWRT_MODULES_ARCHIVE) 2>/dev/null` | awk -F '-' '{print $$6}')
     23DEBIAN_ROOTFS_INCLUDE_PACKAGES_DEBIAN_VERSION:=$(wildcard debian/rootfs/include_packages.list.$(DEBIAN_BUILD_VERSION))
    2324
    2425define qemu-prepare-enter
     
    4647               debian/rootfs/modules-install   \
    4748               debian/rootfs/post-setup        \
    48                debian/rootfs/second-stage-qemu
     49               debian/rootfs/second-stage-qemu \
     50               debian/rootfs/save
    4951        @echo "I: root filesystem $(DEBIAN_BUILD_VERSION) $(TARGET_ARCH) prepared in $(ROOTFS_BUILD_DIR)"
    5052        @echo "I: if the DebWrt kernel wasn't build, then no kernel modules have been installed, install them by:"
     
    6971
    7072debian/rootfs/save:
     73ifeq ($(DEBIAN_ROOTFS_QEMU_2ND_STAGE),y)
     74        sudo bash -c "tar cjf $(INSTALL_DIR)/$(ROOTFS_TAR_BZ2) -C $(ROOTFS_BUILD_DIR) ."
     75else
    7176        if [ -d /media/DEBWRT_ROOT ]; then \
    72                 sudo bash -c "tar cjf debwrt-rootfs-$(TARGET_ARCH)-$(VERSION).tar.bz2 -C /media/DEBWRT_ROOT ."; \
     77                sudo bash -c "tar cjf $(ROOTFS_TAR_BZ2) -C /media/DEBWRT_ROOT ."; \
    7378        fi
     79endif
    7480
    7581debian/rootfs/files-install: debian/rootfs/bootstrap
     
    102108        sudo debootstrap --arch=$(TARGET_ARCH)\
    103109                     --foreign \
    104                      --include=$(shell grep -v '^#' \
    105                        $(DEBIAN_ROOTFS_INCLUDE_PACKAGES) \
    106                          | tr '\n' , | sed -e 's/^/"/' -e 's/,$$/"/' ) \
     110                     --include=$(shell grep -hv '^#' \
     111                       $(DEBIAN_ROOTFS_INCLUDE_PACKAGES) $(DEBIAN_ROOTFS_INCLUDE_PACKAGES_DEBIAN_VERSION) \
     112                         | sort -u | tr '\n' , | sed -e 's/^/"/' -e 's/,$$/"/' ) \
    107113                     $(DEBIAN_BUILD_VERSION) \
    108114                     $(ROOTFS_BUILD_DIR) \
     
    160166        touch $@
    161167
    162 debian/rootfs/clean: 
     168debian/rootfs/clean:
    163169        sudo rm -rf $(ROOTFS_BUILD_DIR)
    164170        rm -f debian/rootfs/debwrt-packages
  • trunk/debian/rootfs/files/usr/sbin/PostInstall

    r311 r517  
    4141fi
    4242
    43 if [ -d /lib/modules/$( uname -r ) ] ; then
    44   : # most likely are the kernel modules available in the root file system
    45 else
     43if [ $(find /lib/modules/ -maxdepth 1 -mindepth 1 -type d | wc -l) -lt 1 ]
     44then
    4645  cat << HERE
    4746
    48 W: Kernel modules top directory /lib/modules/$( uname -r ) NOT found!
     47W: No kernel modules directory found in /lib/modules.
    4948   See /lib/modules/debwrt.README for more information.
    5049
Note: See TracChangeset for help on using the changeset viewer.