Changeset 584


Ignore:
Timestamp:
Dec 26, 2013, 12:09:39 PM (6 years ago)
Author:
amain
Message:

debian/rootfs: debwrt-packages - wrong list inclusion fix

Location:
trunk/debian/rootfs
Files:
1 edited
1 moved

Legend:

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

    r583 r584  
    4040endef
    4141
     42define rootfs-package-list
     43$(shell echo "$(DEBWRT_ROOTFS_PKGLST_DEPS)" \
     44         | tr ' ' '\n' \
     45         >$(TMP_DIR)/include_packages_list.debwrt-package-deps; \
     46        grep -hv '^#' \
     47                 $(DEBIAN_ROOTFS_INCLUDE_PACKAGES) \
     48                 $(DEBIAN_ROOTFS_INCLUDE_PACKAGES_DEBIAN_VERSION) \
     49                 $(TMP_DIR)/include_packages_list.debwrt-package-deps \
     50          | sort -u | tr '\n' ',' | sed 's/,$$//')
     51endef
     52
    4253chr:
    4354        $(call qemu-prepare)
     
    5364               debian/rootfs/unpack               \
    5465               debian/rootfs/files-install        \
    55                debian/rootfs/debwrt-packages-deps \
    5666               debian/rootfs/debwrt-packages      \
    5767               debian/rootfs/modules-install      \
     
    131141        sudo debootstrap --arch=$(TARGET_ARCH)\
    132142                     --foreign \
    133                      --include=$(shell grep -hv '^#' \
    134                        $(DEBIAN_ROOTFS_INCLUDE_PACKAGES) $(DEBIAN_ROOTFS_INCLUDE_PACKAGES_DEBIAN_VERSION) $(DEBWRT_ROOTFS_PKGLST_DEPS) \
    135                          | sort -u | tr '\n' , | sed -e 's/^/"/' -e 's/,$$/"/' ) \
     143                     --include=$(call rootfs-package-list) \
    136144                     $(DEBIAN_BUILD_VERSION) \
    137145                     $(ROOTFS_BUILD_DIR) \
Note: See TracChangeset for help on using the changeset viewer.