Changeset 583


Ignore:
Timestamp:
Dec 26, 2013, 12:49:55 AM (6 years ago)
Author:
amain
Message:

debian/rootfs: for now statically configure and install debwrt-packages dependencies

Location:
trunk/debian
Files:
2 edited

Legend:

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

    r581 r583  
    1616# along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717
    18 run_in_chroot        = $(CHROOT_USER) bash -c "cd /usr/src/$(PKG_NAME); export ARCH=$(TARGET_ARCH); $(1)"
    19 run_in_chrootr       = $(CHROOT)      bash -c "cd /usr/src/$(PKG_NAME); export ARCH=$(TARGET_ARCH); $(1)"
     18run_in_chroot              = $(CHROOT_USER) bash -c "cd /usr/src/$(PKG_NAME); export ARCH=$(TARGET_ARCH); $(1)"
     19run_in_chrootr             = $(CHROOT)      bash -c "cd /usr/src/$(PKG_NAME); export ARCH=$(TARGET_ARCH); $(1)"
    2020
    21 CH                  := "[\(\)]"
     21CH                        := "[\(\)]"
    2222
    23 DEBWRT_ROOTFS_PKGLST:= libnl iw debwrt-kernel-headers robocfg nvram \
    24                        debwrt-hostapd shellinabox libnl-tiny swconfig \
    25                        broadcom-wl debwrt-net mjpg-streamer
     23DEBWRT_ROOTFS_PKGLST      := libnl iw debwrt-kernel-headers robocfg nvram \
     24                             debwrt-hostapd shellinabox libnl-tiny swconfig \
     25                             broadcom-wl debwrt-net mjpg-streamer
     26
     27DEBWRT_ROOTFS_PKGLST_DEPS := libjpeg8
    2628
    2729debian/package/rootfs:
  • trunk/debian/rootfs/debian.mk

    r576 r583  
    5050        $(call qemu-cleanup)
    5151
    52 debian/rootfs: debian/rootfs/bootstrap         \
    53                debian/rootfs/unpack            \
    54                debian/rootfs/files-install     \
    55                debian/rootfs/debwrt-packages   \
    56                debian/rootfs/modules-install   \
    57                debian/rootfs/post-setup        \
    58                debian/rootfs/second-stage-qemu \
    59                debian/rootfs/verify            \
     52debian/rootfs: debian/rootfs/bootstrap            \
     53               debian/rootfs/unpack               \
     54               debian/rootfs/files-install        \
     55               debian/rootfs/debwrt-packages-deps \
     56               debian/rootfs/debwrt-packages      \
     57               debian/rootfs/modules-install      \
     58               debian/rootfs/post-setup           \
     59               debian/rootfs/second-stage-qemu    \
     60               debian/rootfs/verify               \
    6061               debian/rootfs/save
    6162        @echo "I: root filesystem $(DEBIAN_BUILD_VERSION) $(TARGET_ARCH) prepared in $(ROOTFS_BUILD_DIR)"
     
    125126        touch $@
    126127
     128# Fow now: Include debwrt-packages dependencies staticly. This
     129#          list(DEBWRT_ROOTFS_PKGLST_DEPS) is managed in debian/package/debian.mk.
    127130debian/rootfs/bootstrap: debian/rootfs/clean-rootfs-dir
    128131        sudo debootstrap --arch=$(TARGET_ARCH)\
    129132                     --foreign \
    130133                     --include=$(shell grep -hv '^#' \
    131                        $(DEBIAN_ROOTFS_INCLUDE_PACKAGES) $(DEBIAN_ROOTFS_INCLUDE_PACKAGES_DEBIAN_VERSION) \
     134                       $(DEBIAN_ROOTFS_INCLUDE_PACKAGES) $(DEBIAN_ROOTFS_INCLUDE_PACKAGES_DEBIAN_VERSION) $(DEBWRT_ROOTFS_PKGLST_DEPS) \
    132135                         | sort -u | tr '\n' , | sed -e 's/^/"/' -e 's/,$$/"/' ) \
    133136                     $(DEBIAN_BUILD_VERSION) \
Note: See TracChangeset for help on using the changeset viewer.