Changeset 636 for branches


Ignore:
Timestamp:
Nov 3, 2014, 6:51:29 AM (6 years ago)
Author:
ehem
Message:

Hrmm, need to split $(DEBIAN_PACKAGES_DIR) apart to
$(DEBIAN_PACKAGES_HOST_DIR) and $(DEBIAN_PACKAGES_BUILD_DIR) with the
directories being split apart.

Location:
branches/contrib
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/contrib/debian/package-build/package-build.mk

    r626 r636  
    2424        for pkg in $(DEBWRT_BUILD_PKGLST); do \
    2525                rm -rf $(DEBIAN_BUILD_PKG_DIR)/$${pkg}*; \
    26                 cp -rpl $(DEBIAN_PACKAGES_DIR)/$${pkg} $(DEBIAN_BUILD_PKG_DIR); \
     26                cp -rpl $(DEBIAN_PACKAGES_BUILD_DIR)/$${pkg} $(DEBIAN_BUILD_PKG_DIR); \
    2727                cd $(DEBIAN_BUILD_PKG_DIR)/$${pkg}; \
    2828                dpkg-buildpackage; \
  • branches/contrib/debian/package-host/package-host.mk

    r626 r636  
    3030debian/package-host/rootfs:
    3131        for pkg in $(DEBWRT_ROOTFS_PKGLST); do \
    32                 $(MAKE) -f $(DEBIAN_PACKAGES_DIR)/$${pkg}/build.mk debian/package-host/$${pkg}/all; \
     32                $(MAKE) -f $(DEBIAN_PACKAGES_HOST_DIR)/$${pkg}/build.mk debian/package-host/$${pkg}/all; \
    3333                if [ ! 0 -eq $$? ]; then echo "Failed building package for rootfs: $${pkg}"; exit 1; fi; \
    3434        done
     
    4545debian/package-host/%:
    4646        echo make me: $@
    47         $(MAKE) -f debian/package-host/$(dir $(subst debian/package-host/,,$@))build.mk $@
     47        $(MAKE) -f debian/package-host/$(dir $*)build.mk $@
    4848
  • branches/contrib/debian/package-host/shared.mk

    r632 r636  
    4444        rm -rf   $(DEBIAN_BUILD_DIR)/usr/src/$*
    4545        mkdir -p $(DEBIAN_BUILD_DIR)/usr/src/$*
    46         if [ -d $(DEBIAN_PACKAGES_DIR)/$*/debian ]; then \
    47             cp -ar $(DEBIAN_PACKAGES_DIR)/$*/debian $(DEBIAN_BUILD_DIR)/usr/src/$*; \
     46        if [ -d $(DEBIAN_PACKAGES_HOST_DIR)/$*/debian ]; then \
     47            cp -ar $(DEBIAN_PACKAGES_HOST_DIR)/$*/debian $(DEBIAN_BUILD_DIR)/usr/src/$*; \
    4848        fi
    49         if [ -d $(DEBIAN_PACKAGES_DIR)/$*/patches ]; then \
    50                 cp -arv $(DEBIAN_PACKAGES_DIR)/$*/patches $(DEBIAN_BUILD_DIR)/usr/src/$*; \
     49        if [ -d $(DEBIAN_PACKAGES_HOST_DIR)/$*/patches ]; then \
     50                cp -arv $(DEBIAN_PACKAGES_HOST_DIR)/$*/patches $(DEBIAN_BUILD_DIR)/usr/src/$*; \
    5151        fi
    52         cp -ar $(DEBIAN_PACKAGES_DIR)/$*/build.sh $(DEBIAN_BUILD_DIR)/usr/src/$*
     52        cp -ar $(DEBIAN_PACKAGES_HOST_DIR)/$*/build.sh $(DEBIAN_BUILD_DIR)/usr/src/$*
    5353        touch $@
    5454
  • branches/contrib/rules/debwrt.mk

    r614 r636  
    122122
    123123# Debian packages dir
    124 DEBIAN_PACKAGES_DIR:=$(TOPDIR)/debian/package
     124DEBIAN_PACKAGES_HOST_DIR:=$(TOPDIR)/debian/package-host
     125DEBIAN_PACKAGES_BUILD_DIR:=$(TOPDIR)/debian/package-build
    125126INSTALL_DIR_DEBIAN_PACKAGES:=$(INSTALL_DIR)/debian
    126127
Note: See TracChangeset for help on using the changeset viewer.