Changeset 621


Ignore:
Timestamp:
Oct 16, 2014, 12:40:38 AM (5 years ago)
Author:
ehem
Message:

Reorganize debian/package. This splits the packages into 3 directories.
First, debian/package-host, all of these are intended for the target
devices. Second, debian/package-build, these packages are intended for
build/development hosts, not target devices. Third, debian/linux-image,
this is aimed at being able to generate packaged kernels for target
devices based purely on Debian kernel source (security updates!).

Location:
branches/contrib
Files:
2 added
18 edited
25 copied

Legend:

Unmodified
Added
Removed
  • branches/contrib/debian/debian.mk

    r494 r621  
    1616# along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717
     18DEBIAN_BUILD_METHOD:=sudo
     19SUROOT:=sudo
     20CHROOT:=chroot
     21
     22# add - onto this? (consistency between these macros)
     23chroot_root=$(SUROOT) $(CHROOT) $(1)
     24# add -c onto chroot_user? (consistency between these macros)
     25chroot_user=$(SUROOT) $(CHROOT) $(1) su - $(USER)
     26
     27ifeq (0,1)
     28# hopefully something along these lines will work to make use of fakeroot...
     29# the main issue is: http://bugs.debian.org/650234
     30DEBIAN_BUILD_METHOD:=fake
     31FAKEROOT_DB:=$(DEBIAN_BUILD_DIR).fakeroot.perms
     32
     33SUROOT:=fakeroot -i $(FAKEROOT_DB) -s $(FAKEROOT_DB)
     34CHROOT:=fakechroot chroot
     35
     36chroot_root=$(SUROOT) $(CHROOT) $(1)
     37chroot_user=$(CHROOT) $(1)
     38endif
     39
     40export SUROOT CHROOT
     41
    1842include $(TOPDIR)/debian/buildenv/debian.mk
    19 include $(TOPDIR)/debian/package/debian.mk
     43include $(TOPDIR)/debian/package-build/package-build.mk
     44include $(TOPDIR)/debian/package-host/package-host.mk
    2045include $(TOPDIR)/debian/rootfs/debian.mk
    2146
    2247debian/all:
    2348
    24 debian/clean: debian/package/clean debian/buildenv/clean debian/rootfs/clean
     49debian/clean: debian/package-build/clean debian/package-host/clean debian/buildenv/clean debian/rootfs/clean
    2550
    2651.PHONY: debian/all \
  • branches/contrib/debian/package-build/package-build.mk

    r614 r621  
    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)"
    20 
    21 CH                        := "[\(\)]"
    22 
    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
    26 
    27 DEBWRT_ROOTFS_PKGLST_DEPS := libjpeg8
    28 
    2918DEBWRT_BUILD_PKGLST     :=      linux-module-switch-source linux-patch-brcm4716\
    3019                                linux-patch-brcm47xx linux-patch-ocf \
     
    3221
    3322
    34 debian/package/rootfs:
    35         for pkg in $(DEBWRT_ROOTFS_PKGLST); do \
    36                 $(MAKE) -f $(DEBIAN_PACKAGES_DIR)/$${pkg}/build.mk debian/package/$${pkg}/all; \
    37                 if [ ! 0 -eq $$? ]; then echo "Failed building package for rootfs: $${pkg}"; exit 1; fi; \
    38         done
    39         touch $@
    40 
    41 debian/package/buildhost: $(DEBIAN_BUILD_PKG_DIR) $(INSTALL_DIR_DEBIAN_BUILD)
     23debian/package-build/buildhost: $(DEBIAN_BUILD_PKG_DIR) $(INSTALL_DIR_DEBIAN_BUILD)
    4224        for pkg in $(DEBWRT_BUILD_PKGLST); do \
    4325                rm -rf $(DEBIAN_BUILD_PKG_DIR)/$${pkg}*; \
     
    5133        touch $@
    5234
    53 debian/package/clean:
    54         rm -rf $(DEBIAN_BUILD_DIR)/usr/src/*   
    55         rm -rf $(DEBIAN_BUILD_PKG_DIR)
    56         rm -f $(TOPDIR)/debian/package/rootfs
    57         rm -f $(TOPDIR)/debian/package/*/build
    58         rm -f $(TOPDIR)/debian/package/*/prepare
    59         rm -f $(TOPDIR)/debian/package/*/deliver
    6035
    61 debian/package/%:
    62         echo make me: $@
    63         $(MAKE) -f debian/package/$(dir $(subst debian/package/,,$@))build.mk $@
     36debian/package-build/clean:
     37        /bin/true
    6438
     39#debian/package-build/%:
     40#       echo make me: $@
     41#       $(MAKE) -f debian/package-build/$(dir $(subst debian/package-build/,,$@))build.mk $@
     42
  • branches/contrib/debian/package-host/broadcom-wl/build.mk

    r596 r621  
    1818include $(TOPDIR)/Makefile
    1919
    20 debian/package/broadcom-wl/all: debian/package/broadcom-wl/deliver
     20debian/package-host/broadcom-wl/all: debian/package-host/broadcom-wl/deliver
    2121        touch $@
    2222
    23 debian/package/broadcom-wl/deliver: debian/package/broadcom-wl/build
     23debian/package-host/broadcom-wl/deliver: debian/package-host/broadcom-wl/build
    2424        mkdir -p ${INSTALL_DIR_DEBIAN_PACKAGES}
    2525        cp -rav $(DEBIAN_BUILD_DIR)/usr/src/broadcom-wl/*.deb ${INSTALL_DIR_DEBIAN_PACKAGES}
     
    2929        touch $@
    3030
    31 debian/package/broadcom-wl/build: debian/package/broadcom-wl/prepare
     31debian/package-host/broadcom-wl/build: debian/package-host/broadcom-wl/prepare
    3232        $(CHROOT_USER) bash -c "cd /usr/src/broadcom-wl; export ARCH=$(TARGET_ARCH); ./build.sh"
    3333        touch $@
    3434
    35 debian/package/broadcom-wl/prepare: debian/buildenv/create
     35debian/package-host/broadcom-wl/prepare: debian/buildenv/create
    3636        rm -rf   $(DEBIAN_BUILD_DIR)/usr/src/broadcom-wl
    3737        mkdir -p $(DEBIAN_BUILD_DIR)/usr/src/broadcom-wl
     
    4545        touch $@
    4646
    47 debian/package/broadcom-wl/clean:
    48         rm -f debian/package/broadcom-wl/all
    49         rm -f debian/package/broadcom-wl/build
    50         rm -f debian/package/broadcom-wl/prepare
    51         rm -f debian/package/broadcom-wl/deliver
     47debian/package-host/broadcom-wl/clean:
     48        rm -f debian/package-host/broadcom-wl/all
     49        rm -f debian/package-host/broadcom-wl/build
     50        rm -f debian/package-host/broadcom-wl/prepare
     51        rm -f debian/package-host/broadcom-wl/deliver
    5252
  • branches/contrib/debian/package-host/debwrt-hostapd/build.mk

    r596 r621  
    1818include $(TOPDIR)/Makefile
    1919
    20 debian/package/debwrt-hostapd/all: debian/package/debwrt-hostapd/deliver
     20debian/package-host/debwrt-hostapd/all: debian/package-host/debwrt-hostapd/deliver
    2121        touch $@
    2222
    23 debian/package/debwrt-hostapd/deliver: debian/package/debwrt-hostapd/build
     23debian/package-host/debwrt-hostapd/deliver: debian/package-host/debwrt-hostapd/build
    2424        mkdir -p ${INSTALL_DIR_DEBIAN_PACKAGES}
    2525        cp -rav $(DEBIAN_BUILD_DIR)/usr/src/debwrt-hostapd/*.deb ${INSTALL_DIR_DEBIAN_PACKAGES}
     
    2929        touch $@
    3030
    31 debian/package/debwrt-hostapd/build: debian/package/debwrt-hostapd/prepare debian/package/libnl/all
     31debian/package-host/debwrt-hostapd/build: debian/package-host/debwrt-hostapd/prepare debian/package-host/libnl/all
    3232        $(CHROOT_USER) bash -c "cd /usr/src/debwrt-hostapd; export ARCH=$(TARGET_ARCH); ./build.sh"
    3333        touch $@
    3434
    35 debian/package/debwrt-hostapd/prepare: debian/buildenv/create
     35debian/package-host/debwrt-hostapd/prepare: debian/buildenv/create
    3636        rm -rf   $(DEBIAN_BUILD_DIR)/usr/src/debwrt-hostapd
    3737        mkdir -p $(DEBIAN_BUILD_DIR)/usr/src/debwrt-hostapd
     
    4343        touch $@
    4444
    45 debian/package/debwrt-hostapd/version:
     45debian/package-host/debwrt-hostapd/version:
    4646        @rm -rf   $(DEBIAN_BUILD_DIR)/usr/src/debwrt-hostapdversion
    4747        @mkdir -p $(DEBIAN_BUILD_DIR)/usr/src/debwrt-hostapdversion
    4848        @svn checkout --quiet --depth files \
    49                 svn://svn.openwrt.org/openwrt/trunk/package/hostapd \
     49                svn://svn.openwrt.org/openwrt/trunk/package-host/hostapd \
    5050                 $(DEBIAN_BUILD_DIR)/usr/src/debwrt-hostapdversion
    5151        @grep ^PKG_VERSION $(DEBIAN_BUILD_DIR)/usr/src/debwrt-hostapdversion/Makefile
    5252        @rm -rf   $(DEBIAN_BUILD_DIR)/usr/src/debwrt-hostapdversion
    5353
    54 debian/package/debwrt-hostapd/clean:
    55         rm -f debian/package/debwrt-hostapd/all
    56         rm -f debian/package/debwrt-hostapd/build
    57         rm -f debian/package/debwrt-hostapd/prepare
    58         rm -f debian/package/debwrt-hostapd/deliver
     54debian/package-host/debwrt-hostapd/clean:
     55        rm -f debian/package-host/debwrt-hostapd/all
     56        rm -f debian/package-host/debwrt-hostapd/build
     57        rm -f debian/package-host/debwrt-hostapd/prepare
     58        rm -f debian/package-host/debwrt-hostapd/deliver
    5959
  • branches/contrib/debian/package-host/debwrt-kernel-headers/build.mk

    r596 r621  
    1818include $(TOPDIR)/Makefile
    1919
    20 debian/package/debwrt-kernel-headers/all: openwrt/deliver/check debian/package/debwrt-kernel-headers/deliver
     20debian/package-host/debwrt-kernel-headers/all: openwrt/deliver/check debian/package-host/debwrt-kernel-headers/deliver
    2121        touch $@
    2222
    23 debian/package/debwrt-kernel-headers/deliver: debian/package/debwrt-kernel-headers/build
     23debian/package-host/debwrt-kernel-headers/deliver: debian/package-host/debwrt-kernel-headers/build
    2424        mkdir -p ${INSTALL_DIR_DEBIAN_PACKAGES}
    2525        cp -rav $(DEBIAN_BUILD_DIR)/usr/src/debwrt-kernel-headers/*.deb ${INSTALL_DIR_DEBIAN_PACKAGES}
     
    2929        touch $@
    3030
    31 debian/package/debwrt-kernel-headers/build: debian/package/debwrt-kernel-headers/prepare
     31debian/package-host/debwrt-kernel-headers/build: debian/package-host/debwrt-kernel-headers/prepare
    3232        $(CHROOT_USER) bash -c "cd /usr/src/debwrt-kernel-headers; export ARCH=$(TARGET_ARCH); ./debwrt-kernel-headers.sh"
    3333        touch $@
    3434
    35 debian/package/debwrt-kernel-headers/prepare: debian/buildenv/create
     35debian/package-host/debwrt-kernel-headers/prepare: debian/buildenv/create
    3636        rm -rf   $(DEBIAN_BUILD_DIR)/usr/src/debwrt-kernel-headers
    3737        mkdir -p $(DEBIAN_BUILD_DIR)/usr/src/debwrt-kernel-headers
     
    4747        touch $@
    4848
    49 debian/package/debwrt-kernel-headers/clean:
    50         rm -f debian/package/debwrt-kernel-headers/build
    51         rm -f debian/package/debwrt-kernel-headers/build
    52         rm -f debian/package/debwrt-kernel-headers/prepare
    53         rm -f debian/package/debwrt-kernel-headers/deliver
     49debian/package-host/debwrt-kernel-headers/clean:
     50        rm -f debian/package-host/debwrt-kernel-headers/build
     51        rm -f debian/package-host/debwrt-kernel-headers/build
     52        rm -f debian/package-host/debwrt-kernel-headers/prepare
     53        rm -f debian/package-host/debwrt-kernel-headers/deliver
    5454
  • branches/contrib/debian/package-host/debwrt-net/build.mk

    r596 r621  
    2323PKG_NAME_VERSION  = $(shell head -1 $(DEBIAN_PACKAGES_DIR)/$(PKG_NAME)/debian/changelog | awk '{gsub(/'$(CH)'/,"",$$2); print $$1"-"$$2}')
    2424
    25 debian/package/$(PKG_NAME)/all: debian/package/$(PKG_NAME)/deliver
     25debian/package-host/$(PKG_NAME)/all: debian/package-host/$(PKG_NAME)/deliver
    2626        touch $@
    2727
    28 debian/package/$(PKG_NAME)/deliver: debian/package/$(PKG_NAME)/build
     28debian/package-host/$(PKG_NAME)/deliver: debian/package-host/$(PKG_NAME)/build
    2929        mkdir -p ${INSTALL_DIR_DEBIAN_PACKAGES}
    3030        cp -rav $(DEBIAN_BUILD_DIR)/usr/src/$(PKG_NAME)/*.deb ${INSTALL_DIR_DEBIAN_PACKAGES}
     
    3434        touch $@
    3535
    36 debian/package/$(PKG_NAME)/build: debian/package/$(PKG_NAME)/prepare
     36debian/package-host/$(PKG_NAME)/build: debian/package-host/$(PKG_NAME)/prepare
    3737        $(call run_in_chroot,cd /usr/src/$(PKG_NAME)/$(PKG_NAME_VERSION);dpkg-buildpackage -a${ARCH} -rfakeroot)
    3838        $(call run_in_chroot,find -maxdepth 1 -name "*.deb" | xargs -r -t -i sudo dpkg-cross -a ${TARGET_ARCH} -i {} || true)
    3939        touch $@
    4040
    41 debian/package/$(PKG_NAME)/prepare: debian/buildenv/create
     41debian/package-host/$(PKG_NAME)/prepare: debian/buildenv/create
    4242        rm -rf   $(DEBIAN_BUILD_DIR)/usr/src/$(PKG_NAME)
    4343        mkdir -p $(DEBIAN_BUILD_DIR)/usr/src/$(PKG_NAME)/$(PKG_NAME_VERSION)
     
    4646        touch $@
    4747
    48 debian/package/$(PKG_NAME)/clean:
    49         rm -f debian/package/$(PKG_NAME)/all-
    50         rm -f debian/package/$(PKG_NAME)/build
    51         rm -f debian/package/$(PKG_NAME)/prepare
    52         rm -f debian/package/$(PKG_NAME)/deliver
     48debian/package-host/$(PKG_NAME)/clean:
     49        rm -f debian/package-host/$(PKG_NAME)/all-
     50        rm -f debian/package-host/$(PKG_NAME)/build
     51        rm -f debian/package-host/$(PKG_NAME)/prepare
     52        rm -f debian/package-host/$(PKG_NAME)/deliver
    5353
  • branches/contrib/debian/package-host/iw/build.mk

    r596 r621  
    1818include $(TOPDIR)/Makefile
    1919
    20 debian/package/iw/all: debian/package/iw/deliver
     20debian/package-host/iw/all: debian/package-host/iw/deliver
    2121        touch $@
    2222
    23 debian/package/iw/deliver: debian/package/iw/build
     23debian/package-host/iw/deliver: debian/package-host/iw/build
    2424        mkdir -p ${INSTALL_DIR_DEBIAN_PACKAGES}
    2525        cp -rav $(DEBIAN_BUILD_DIR)/usr/src/iw/*.deb ${INSTALL_DIR_DEBIAN_PACKAGES}
     
    2929        touch $@
    3030
    31 debian/package/iw/build: debian/package/iw/prepare debian/package/libnl/all
     31debian/package-host/iw/build: debian/package-host/iw/prepare debian/package-host/libnl/all
    3232        $(CHROOT_USER) bash -c "cd /usr/src/iw; export ARCH=$(TARGET_ARCH); ./iw.sh"
    3333        touch $@
    3434
    35 debian/package/iw/prepare: debian/buildenv/create
     35debian/package-host/iw/prepare: debian/buildenv/create
    3636        rm -rf   $(DEBIAN_BUILD_DIR)/usr/src/iw
    3737        mkdir -p $(DEBIAN_BUILD_DIR)/usr/src/iw
     
    4040        touch $@
    4141
    42 debian/package/iw/clean:
    43         rm -f debian/package/iw/all
    44         rm -f debian/package/iw/build
    45         rm -f debian/package/iw/prepare
    46         rm -f debian/package/iw/deliver
     42debian/package-host/iw/clean:
     43        rm -f debian/package-host/iw/all
     44        rm -f debian/package-host/iw/build
     45        rm -f debian/package-host/iw/prepare
     46        rm -f debian/package-host/iw/deliver
  • branches/contrib/debian/package-host/led/build.mk

    r596 r621  
    1818include $(TOPDIR)/Makefile
    1919
    20 debian/package/led/all: debian/package/led/deliver
     20debian/package-host/led/all: debian/package-host/led/deliver
    2121        touch $@
    2222
    23 debian/package/led/deliver: debian/package/led/build
     23debian/package-host/led/deliver: debian/package-host/led/build
    2424        mkdir -p ${INSTALL_DIR_DEBIAN_PACKAGES}
    2525        cp $(DEBIAN_BUILD_DIR)/usr/src/led/*.deb ${INSTALL_DIR_DEBIAN_PACKAGES}
     
    2929        touch $@
    3030
    31 debian/package/led/build: debian/package/led/prepare
     31debian/package-host/led/build: debian/package-host/led/prepare
    3232        $(CHROOT_USER) bash \
    3333                -c "cd /usr/src/led; export ARCH=$(TARGET_ARCH); ./build.sh"
    3434        touch $@
    3535
    36 debian/package/led/prepare: # debian/buildenv/create
     36debian/package-host/led/prepare: # debian/buildenv/create
    3737        rm -rf   $(DEBIAN_BUILD_DIR)/usr/src/led
    3838        mkdir -p $(DEBIAN_BUILD_DIR)/usr/src/led
     
    4444        touch $@
    4545
    46 debian/package/led/clean:
    47         rm -f debian/package/led/all
    48         rm -f debian/package/led/build
    49         rm -f debian/package/led/prepare
    50         rm -f debian/package/led/deliver
     46debian/package-host/led/clean:
     47        rm -f debian/package-host/led/all
     48        rm -f debian/package-host/led/build
     49        rm -f debian/package-host/led/prepare
     50        rm -f debian/package-host/led/deliver
  • branches/contrib/debian/package-host/libnl-tiny/build.mk

    r596 r621  
    1818include $(TOPDIR)/Makefile
    1919
    20 debian/package/libnl-tiny/all: debian/package/libnl-tiny/deliver
     20debian/package-host/libnl-tiny/all: debian/package-host/libnl-tiny/deliver
    2121        touch $@
    2222
    23 debian/package/libnl-tiny/deliver: debian/package/libnl-tiny/build
     23debian/package-host/libnl-tiny/deliver: debian/package-host/libnl-tiny/build
    2424        mkdir -p ${INSTALL_DIR_DEBIAN_PACKAGES}
    2525        cp -rav $(DEBIAN_BUILD_DIR)/usr/src/libnl-tiny/*.deb ${INSTALL_DIR_DEBIAN_PACKAGES}
     
    2929        touch $@
    3030
    31 debian/package/libnl-tiny/build: debian/package/libnl-tiny/prepare debian/package/libnl/all
     31debian/package-host/libnl-tiny/build: debian/package-host/libnl-tiny/prepare debian/package-host/libnl/all
    3232        $(CHROOT_USER) bash -c "cd /usr/src/libnl-tiny; export ARCH=$(TARGET_ARCH); ./build.sh"
    3333        touch $@
    3434
    35 debian/package/libnl-tiny/prepare: debian/buildenv/create
     35debian/package-host/libnl-tiny/prepare: debian/buildenv/create
    3636        rm -rf   $(DEBIAN_BUILD_DIR)/usr/src/libnl-tiny
    3737        mkdir -p $(DEBIAN_BUILD_DIR)/usr/src/libnl-tiny
     
    4545        touch $@
    4646
    47 debian/package/libnl-tiny/clean:
    48         rm -f debian/package/libnl-tiny/all
    49         rm -f debian/package/libnl-tiny/build
    50         rm -f debian/package/libnl-tiny/prepare
    51         rm -f debian/package/libnl-tiny/deliver
     47debian/package-host/libnl-tiny/clean:
     48        rm -f debian/package-host/libnl-tiny/all
     49        rm -f debian/package-host/libnl-tiny/build
     50        rm -f debian/package-host/libnl-tiny/prepare
     51        rm -f debian/package-host/libnl-tiny/deliver
    5252
  • branches/contrib/debian/package-host/libnl/build.mk

    r596 r621  
    1818include $(TOPDIR)/Makefile
    1919
    20 debian/package/libnl/all: debian/package/libnl/deliver
     20debian/package-host/libnl/all: debian/package-host/libnl/deliver
    2121        touch $@
    2222
    23 debian/package/libnl/deliver: debian/package/libnl/build
     23debian/package-host/libnl/deliver: debian/package-host/libnl/build
    2424        mkdir -p ${INSTALL_DIR_DEBIAN_PACKAGES}
    2525        cp -rav $(DEBIAN_BUILD_DIR)/usr/src/libnl/*.deb ${INSTALL_DIR_DEBIAN_PACKAGES}
     
    2929        touch $@
    3030
    31 debian/package/libnl/build: debian/package/libnl/prepare debian/package/debwrt-kernel-headers/all
     31debian/package-host/libnl/build: debian/package-host/libnl/prepare debian/package-host/debwrt-kernel-headers/all
    3232        #exit 1
    3333        $(CHROOT_USER) bash -c "cd /usr/src/libnl; export ARCH=$(TARGET_ARCH); ./libnl.sh"
    3434        touch $@
    3535
    36 debian/package/libnl/prepare: debian/buildenv/create
     36debian/package-host/libnl/prepare: debian/buildenv/create
    3737        rm -rf   $(DEBIAN_BUILD_DIR)/usr/src/libnl
    3838        mkdir -p $(DEBIAN_BUILD_DIR)/usr/src/libnl
     
    4141        touch $@
    4242
    43 debian/package/libnl/clean:
    44         rm -f debian/package/libnl/all
    45         rm -f debian/package/libnl/build
    46         rm -f debian/package/libnl/prepare
    47         rm -f debian/package/libnl/deliver
     43debian/package-host/libnl/clean:
     44        rm -f debian/package-host/libnl/all
     45        rm -f debian/package-host/libnl/build
     46        rm -f debian/package-host/libnl/prepare
     47        rm -f debian/package-host/libnl/deliver
  • branches/contrib/debian/package-host/libpar2/build.mk

    r596 r621  
    1818include $(TOPDIR)/Makefile
    1919
    20 debian/package/libpar2/all: debian/package/libpar2/deliver
     20debian/package-host/libpar2/all: debian/package-host/libpar2/deliver
    2121        touch $@
    2222
    23 debian/package/libpar2/deliver: debian/package/libpar2/build
     23debian/package-host/libpar2/deliver: debian/package-host/libpar2/build
    2424        mkdir -p ${INSTALL_DIR_DEBIAN_PACKAGES}
    2525        cp -rav $(DEBIAN_BUILD_DIR)/usr/src/libpar2/*.deb ${INSTALL_DIR_DEBIAN_PACKAGES}
     
    2929        touch $@
    3030
    31 debian/package/libpar2/build: debian/package/libpar2/prepare
     31debian/package-host/libpar2/build: debian/package-host/libpar2/prepare
    3232        $(CHROOT_USER) bash -c "cd /usr/src/libpar2; export ARCH=$(TARGET_ARCH); export DEBIAN_BUILD_VERSION=$(DEBIAN_BUILD_VERSION); ./build.sh"
    3333        touch $@
    3434
    35 debian/package/libpar2/prepare: debian/buildenv/create
     35debian/package-host/libpar2/prepare: debian/buildenv/create
    3636        rm -rf   $(DEBIAN_BUILD_DIR)/usr/src/libpar2
    3737        mkdir -p $(DEBIAN_BUILD_DIR)/usr/src/libpar2
     
    4545        touch $@
    4646
    47 debian/package/libpar2/clean:
    48         rm -f debian/package/libpar2/all
    49         rm -f debian/package/libpar2/build
    50         rm -f debian/package/libpar2/prepare
    51         rm -f debian/package/libpar2/deliver
     47debian/package-host/libpar2/clean:
     48        rm -f debian/package-host/libpar2/all
     49        rm -f debian/package-host/libpar2/build
     50        rm -f debian/package-host/libpar2/prepare
     51        rm -f debian/package-host/libpar2/deliver
    5252
  • branches/contrib/debian/package-host/mjpg-streamer/build.mk

    r596 r621  
    2222PKG_RELEASE    = 1
    2323
    24 debian/package/$(PKG_NAME)/all: debian/package/$(PKG_NAME)/deliver
     24debian/package-host/$(PKG_NAME)/all: debian/package-host/$(PKG_NAME)/deliver
    2525        touch $@
    2626
    27 debian/package/$(PKG_NAME)/deliver: debian/package/$(PKG_NAME)/build
     27debian/package-host/$(PKG_NAME)/deliver: debian/package-host/$(PKG_NAME)/build
    2828        mkdir -p ${INSTALL_DIR_DEBIAN_PACKAGES}
    2929        cp -rav $(DEBIAN_BUILD_DIR)/usr/src/$(PKG_NAME)/*.deb     ${INSTALL_DIR_DEBIAN_PACKAGES}
     
    3333        touch $@
    3434
    35 debian/package/$(PKG_NAME)/rebuild: debian/package/$(PKG_NAME)/clean-build debian/package/$(PKG_NAME)/build
     35debian/package-host/$(PKG_NAME)/rebuild: debian/package-host/$(PKG_NAME)/clean-build debian/package-host/$(PKG_NAME)/build
    3636
    37 debian/package/$(PKG_NAME)/build: debian/package/$(PKG_NAME)/prepare
     37debian/package-host/$(PKG_NAME)/build: debian/package-host/$(PKG_NAME)/prepare
    3838        $(call run_in_chroot,cd /usr/src/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION); \
    3939                             dpkg-buildpackage -d -a${TARGET_ARCH} -rfakeroot)
     
    4141        touch $@
    4242
    43 debian/package/$(PKG_NAME)/prepare: debian/buildenv/create
     43debian/package-host/$(PKG_NAME)/prepare: debian/buildenv/create
    4444        mkdir -p $(DEBIAN_BUILD_DIR)/usr/src/$(PKG_NAME)
    4545        cp -ar $(DEBIAN_PACKAGES_DIR)/$(PKG_NAME)/* $(DEBIAN_BUILD_DIR)/usr/src/$(PKG_NAME)
     
    5050        touch $@
    5151
    52 debian/package/$(PKG_NAME)/clean-build:
    53         rm -f debian/package/$(PKG_NAME)/build
     52debian/package-host/$(PKG_NAME)/clean-build:
     53        rm -f debian/package-host/$(PKG_NAME)/build
    5454
    55 debian/package/$(PKG_NAME)/clean:
    56         rm -f debian/package/$(PKG_NAME)/all
    57         rm -f debian/package/$(PKG_NAME)/prepare
    58         rm -f debian/package/$(PKG_NAME)/build
    59         rm -f debian/package/$(PKG_NAME)/deliver
     55debian/package-host/$(PKG_NAME)/clean:
     56        rm -f debian/package-host/$(PKG_NAME)/all
     57        rm -f debian/package-host/$(PKG_NAME)/prepare
     58        rm -f debian/package-host/$(PKG_NAME)/build
     59        rm -f debian/package-host/$(PKG_NAME)/deliver
    6060        rm -rf $(DEBIAN_BUILD_DIR)/usr/src/$(PKG_NAME)
    6161
    62 .PHONY: debian/package/$(PKG_NAME)/clean \
    63         debian/package/$(PKG_NAME)/clean-build \
    64         debian/package/$(PKG_NAME)/rebuild
     62.PHONY: debian/package-host/$(PKG_NAME)/clean \
     63        debian/package-host/$(PKG_NAME)/clean-build \
     64        debian/package-host/$(PKG_NAME)/rebuild
    6565
  • branches/contrib/debian/package-host/nvram/build.mk

    r596 r621  
    1818include $(TOPDIR)/Makefile
    1919
    20 debian/package/nvram/all: debian/package/nvram/deliver
     20debian/package-host/nvram/all: debian/package-host/nvram/deliver
    2121        touch $@
    2222
    23 debian/package/nvram/deliver: debian/package/nvram/build
     23debian/package-host/nvram/deliver: debian/package-host/nvram/build
    2424        mkdir -p ${INSTALL_DIR_DEBIAN_PACKAGES}
    2525        cp -rav $(DEBIAN_BUILD_DIR)/usr/src/nvram/*.deb ${INSTALL_DIR_DEBIAN_PACKAGES}
     
    2929        touch $@
    3030
    31 debian/package/nvram/build: debian/package/nvram/prepare
     31debian/package-host/nvram/build: debian/package-host/nvram/prepare
    3232        $(CHROOT_USER) bash -c "cd /usr/src/nvram; export ARCH=$(TARGET_ARCH); ./build.sh"
    3333        touch $@
    3434
    35 debian/package/nvram/prepare: debian/buildenv/create
     35debian/package-host/nvram/prepare: debian/buildenv/create
    3636        rm -rf   $(DEBIAN_BUILD_DIR)/usr/src/nvram
    3737        mkdir -p $(DEBIAN_BUILD_DIR)/usr/src/nvram
     
    4242        touch $@
    4343
    44 debian/package/nvram/clean:
    45         rm -f debian/package/nvram/all
    46         rm -f debian/package/nvram/build
    47         rm -f debian/package/nvram/prepare
    48         rm -f debian/package/nvram/deliver
     44debian/package-host/nvram/clean:
     45        rm -f debian/package-host/nvram/all
     46        rm -f debian/package-host/nvram/build
     47        rm -f debian/package-host/nvram/prepare
     48        rm -f debian/package-host/nvram/deliver
    4949
  • branches/contrib/debian/package-host/nzbget/build.mk

    r596 r621  
    1818include $(TOPDIR)/Makefile
    1919
    20 debian/package/nzbget/all: debian/package/nzbget/deliver
     20debian/package-host/nzbget/all: debian/package-host/nzbget/deliver
    2121        touch $@
    2222
    23 debian/package/nzbget/deliver: debian/package/nzbget/build
     23debian/package-host/nzbget/deliver: debian/package-host/nzbget/build
    2424        mkdir -p ${INSTALL_DIR_DEBIAN_PACKAGES}
    2525        cp -rav $(DEBIAN_BUILD_DIR)/usr/src/nzbget/*.deb ${INSTALL_DIR_DEBIAN_PACKAGES}
     
    2929        touch $@
    3030
    31 debian/package/nzbget/build: debian/package/nzbget/prepare debian/package/libpar2/build
     31debian/package-host/nzbget/build: debian/package-host/nzbget/prepare debian/package-host/libpar2/build
    3232        $(CHROOT_USER) bash -c "cd /usr/src/nzbget; export ARCH=$(TARGET_ARCH); export DEBIAN_BUILD_VERSION=$(DEBIAN_BUILD_VERSION); ./build.sh"
    3333        touch $@
    3434
    35 debian/package/nzbget/prepare: debian/buildenv/create
     35debian/package-host/nzbget/prepare: debian/buildenv/create
    3636        rm -rf   $(DEBIAN_BUILD_DIR)/usr/src/nzbget
    3737        mkdir -p $(DEBIAN_BUILD_DIR)/usr/src/nzbget
     
    4545        touch $@
    4646
    47 debian/package/nzbget/clean:
    48         rm -f debian/package/nzbget/all
    49         rm -f debian/package/nzbget/build
    50         rm -f debian/package/nzbget/prepare
    51         rm -f debian/package/nzbget/deliver
     47debian/package-host/nzbget/clean:
     48        rm -f debian/package-host/nzbget/all
     49        rm -f debian/package-host/nzbget/build
     50        rm -f debian/package-host/nzbget/prepare
     51        rm -f debian/package-host/nzbget/deliver
    5252
  • branches/contrib/debian/package-host/package-host.mk

    r620 r621  
    3232
    3333
    34 debian/package/rootfs:
     34debian/package-host/rootfs:
    3535        for pkg in $(DEBWRT_ROOTFS_PKGLST); do \
    36                 $(MAKE) -f $(DEBIAN_PACKAGES_DIR)/$${pkg}/build.mk debian/package/$${pkg}/all; \
     36                $(MAKE) -f $(DEBIAN_PACKAGES_DIR)/$${pkg}/build.mk debian/package-host/$${pkg}/all; \
    3737                if [ ! 0 -eq $$? ]; then echo "Failed building package for rootfs: $${pkg}"; exit 1; fi; \
    3838        done
    3939        touch $@
    4040
    41 debian/package/buildhost: $(DEBIAN_BUILD_PKG_DIR) $(INSTALL_DIR_DEBIAN_BUILD)
     41debian/package-host/buildhost: $(DEBIAN_BUILD_PKG_DIR) $(INSTALL_DIR_DEBIAN_BUILD)
    4242        for pkg in $(DEBWRT_BUILD_PKGLST); do \
    4343                rm -rf $(DEBIAN_BUILD_PKG_DIR)/$${pkg}*; \
     
    5151        touch $@
    5252
    53 debian/package/clean:
     53debian/package-host/clean:
    5454        rm -rf $(DEBIAN_BUILD_DIR)/usr/src/*   
    5555        rm -rf $(DEBIAN_BUILD_PKG_DIR)
    56         rm -f $(TOPDIR)/debian/package/rootfs
    57         rm -f $(TOPDIR)/debian/package/*/build
    58         rm -f $(TOPDIR)/debian/package/*/prepare
    59         rm -f $(TOPDIR)/debian/package/*/deliver
     56        rm -f $(TOPDIR)/debian/package-host/rootfs
     57        rm -f $(TOPDIR)/debian/package-host/*/build
     58        rm -f $(TOPDIR)/debian/package-host/*/prepare
     59        rm -f $(TOPDIR)/debian/package-host/*/deliver
     60        rm -f $(TOPDIR)/debian/package-host/linux-image/stamp.*
    6061
    61 debian/package/%:
     62debian/package-host/%:
    6263        echo make me: $@
    63         $(MAKE) -f debian/package/$(dir $(subst debian/package/,,$@))build.mk $@
     64        $(MAKE) -f debian/package-host/$(dir $(subst debian/package-host/,,$@))build.mk $@
    6465
  • branches/contrib/debian/package-host/robocfg/build.mk

    r596 r621  
    1818include $(TOPDIR)/Makefile
    1919
    20 debian/package/robocfg/all: debian/package/robocfg/deliver
     20debian/package-host/robocfg/all: debian/package-host/robocfg/deliver
    2121        touch $@
    2222
    23 debian/package/robocfg/deliver: debian/package/robocfg/build
     23debian/package-host/robocfg/deliver: debian/package-host/robocfg/build
    2424        mkdir -p ${INSTALL_DIR_DEBIAN_PACKAGES}
    2525        cp -rav $(DEBIAN_BUILD_DIR)/usr/src/robocfg/*.deb ${INSTALL_DIR_DEBIAN_PACKAGES}
     
    2929        touch $@
    3030
    31 debian/package/robocfg/build: debian/package/robocfg/prepare debian/package/libnl/all
     31debian/package-host/robocfg/build: debian/package-host/robocfg/prepare debian/package-host/libnl/all
    3232        $(CHROOT_USER) bash -c "cd /usr/src/robocfg; export ARCH=$(TARGET_ARCH); ./build.sh"
    3333        touch $@
    3434
    35 debian/package/robocfg/prepare: debian/buildenv/create
     35debian/package-host/robocfg/prepare: debian/buildenv/create
    3636        rm -rf   $(DEBIAN_BUILD_DIR)/usr/src/robocfg
    3737        mkdir -p $(DEBIAN_BUILD_DIR)/usr/src/robocfg
     
    4242        touch $@
    4343
    44 debian/package/robocfg/clean:
    45         rm -f debian/package/robocfg/all
    46         rm -f debian/package/robocfg/build
    47         rm -f debian/package/robocfg/prepare
    48         rm -f debian/package/robocfg/deliver
     44debian/package-host/robocfg/clean:
     45        rm -f debian/package-host/robocfg/all
     46        rm -f debian/package-host/robocfg/build
     47        rm -f debian/package-host/robocfg/prepare
     48        rm -f debian/package-host/robocfg/deliver
    4949
  • branches/contrib/debian/package-host/shellinabox/build.mk

    r596 r621  
    1818include $(TOPDIR)/Makefile
    1919
    20 debian/package/shellinabox/all: debian/package/shellinabox/deliver
     20debian/package-host/shellinabox/all: debian/package-host/shellinabox/deliver
    2121        touch $@
    2222
    23 debian/package/shellinabox/deliver: debian/package/shellinabox/build
     23debian/package-host/shellinabox/deliver: debian/package-host/shellinabox/build
    2424        mkdir -p ${INSTALL_DIR_DEBIAN_PACKAGES}
    2525        cp -rav $(DEBIAN_BUILD_DIR)/usr/src/shellinabox/*.deb ${INSTALL_DIR_DEBIAN_PACKAGES}
     
    2929        touch $@
    3030
    31 debian/package/shellinabox/build: debian/package/shellinabox/prepare
     31debian/package-host/shellinabox/build: debian/package-host/shellinabox/prepare
    3232        $(CHROOT_USER) bash -c "cd /usr/src/shellinabox; export ARCH=$(TARGET_ARCH); ./build.sh"
    3333        touch $@
    3434
    35 debian/package/shellinabox/prepare: debian/buildenv/create
     35debian/package-host/shellinabox/prepare: debian/buildenv/create
    3636        rm -rf   $(DEBIAN_BUILD_DIR)/usr/src/shellinabox
    3737        mkdir -p $(DEBIAN_BUILD_DIR)/usr/src/shellinabox
     
    4545        touch $@
    4646
    47 debian/package/shellinabox/clean:
    48         rm -f debian/package/shellinabox/all
    49         rm -f debian/package/shellinabox/build
    50         rm -f debian/package/shellinabox/prepare
    51         rm -f debian/package/shellinabox/deliver
     47debian/package-host/shellinabox/clean:
     48        rm -f debian/package-host/shellinabox/all
     49        rm -f debian/package-host/shellinabox/build
     50        rm -f debian/package-host/shellinabox/prepare
     51        rm -f debian/package-host/shellinabox/deliver
    5252
  • branches/contrib/debian/package-host/swconfig/build.mk

    r596 r621  
    1818include $(TOPDIR)/Makefile
    1919
    20 debian/package/swconfig/all: debian/package/swconfig/deliver
     20debian/package-host/swconfig/all: debian/package-host/swconfig/deliver
    2121        touch $@
    2222
    23 debian/package/swconfig/deliver: debian/package/swconfig/build
     23debian/package-host/swconfig/deliver: debian/package-host/swconfig/build
    2424        mkdir -p ${INSTALL_DIR_DEBIAN_PACKAGES}
    2525        cp -rav $(DEBIAN_BUILD_DIR)/usr/src/swconfig/*.deb ${INSTALL_DIR_DEBIAN_PACKAGES}
     
    2929        touch $@
    3030
    31 debian/package/swconfig/build: debian/package/swconfig/prepare debian/package/libnl/all
     31debian/package-host/swconfig/build: debian/package-host/swconfig/prepare debian/package-host/libnl/all
    3232        $(CHROOT_USER) bash -c "cd /usr/src/swconfig; export ARCH=$(TARGET_ARCH); ./build.sh"
    3333        touch $@
    3434
    35 debian/package/swconfig/prepare: debian/buildenv/create
     35debian/package-host/swconfig/prepare: debian/buildenv/create
    3636        rm -rf   $(DEBIAN_BUILD_DIR)/usr/src/swconfig
    3737        mkdir -p $(DEBIAN_BUILD_DIR)/usr/src/swconfig
     
    4545        touch $@
    4646
    47 debian/package/swconfig/clean:
    48         rm -f debian/package/swconfig/all
    49         rm -f debian/package/swconfig/build
    50         rm -f debian/package/swconfig/prepare
    51         rm -f debian/package/swconfig/deliver
     47debian/package-host/swconfig/clean:
     48        rm -f debian/package-host/swconfig/all
     49        rm -f debian/package-host/swconfig/build
     50        rm -f debian/package-host/swconfig/prepare
     51        rm -f debian/package-host/swconfig/deliver
    5252
  • branches/contrib/debian/rootfs/debian.mk

    r614 r621  
    137137
    138138# Fow now: Include debwrt-packages dependencies staticly. This
    139 #          list(DEBWRT_ROOTFS_PKGLST_DEPS) is managed in debian/package/debian.mk.
     139#          list(DEBWRT_ROOTFS_PKGLST_DEPS) is managed in debian/package-host/debian.mk.
    140140debian/rootfs/bootstrap: debian/rootfs/clean-rootfs-dir
    141141        sudo debootstrap --arch=$(TARGET_ARCH)\
     
    160160
    161161# install all available cross-compiled debwrt debian packages, except for the kernel-headers package and the cross packages
    162 debian/rootfs/debwrt-packages: debian/rootfs/bootstrap debian/package/rootfs
     162debian/rootfs/debwrt-packages: debian/rootfs/bootstrap debian/package-host/rootfs
    163163        ls ${INSTALL_DIR_DEBIAN_PACKAGES}/*.deb | grep -v -e"debwrt-kernel-headers" -e"cross" | while read package; do \
    164164                pfname=`basename $$package`; \
  • branches/contrib/rules/help.txt

    r469 r621  
    5656debian/buildenv/clean            : Clean build environment ( entire chroot is deleted )
    5757
    58 debian/package/rootfs            : Build all DebWrt Debian packages use in the target Debian root filesystem
    59 debian/package/clean             : Clean all DebWrt Debian packages
    60 debian/package/<pkg-name>/deliver: Deliver DebWrt Debian package <pkg-name>
    61 debian/package/<pkg-name>/build  : Build DebWrt Debian package <pkg-name>
    62 debian/package/<pkg-name>/prepare: Prepare DebWrt Debian package <pkg-name>
    63 debian/package/<pkg-name>/clean  : Clean DebWrt Debian package <pkg-name>
     58debian/package-host/rootfs            : Build all DebWrt Debian packages use in the target Debian root filesystem
     59debian/package-host/clean             : Clean all DebWrt Debian packages
     60debian/package-host/<pkg-name>/deliver: Deliver DebWrt Debian package <pkg-name>
     61debian/package-host/<pkg-name>/build  : Build DebWrt Debian package <pkg-name>
     62debian/package-host/<pkg-name>/prepare: Prepare DebWrt Debian package <pkg-name>
     63debian/package-host/<pkg-name>/clean  : Clean DebWrt Debian package <pkg-name>
    6464
    6565debian/rootfs                    : Create target Debian root filesystem
Note: See TracChangeset for help on using the changeset viewer.