Changeset 637 for branches


Ignore:
Timestamp:
Nov 3, 2014, 7:40:02 AM (5 years ago)
Author:
ehem
Message:

Get the libnl-tiny package directory to properly conform to Debian
standards, notably dpkg-buildpackage can be invoked in the directory to
cause the package to be built.

Adjust Makefiles to support utilizing this mode of operation.

Add automated addition to libnl-tiny/debian/changelog based on OpenWRT
Subversion revision. This makes it possible to identify which revision a
given build came from.

Location:
branches/contrib/debian/package-host
Files:
1 deleted
4 edited

Legend:

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

    r635 r637  
    1616# along with this program.  If not, see <http://www.gnu.org/licenses/>.
    1717
     18build_buildpackage:=1
    1819
    1920include debian/package-host/shared.mk
    2021
    2122
    22 debian/package-host/libnl-tiny/build: debian/package-host/libnl/chrootinstall
    23 
    24 debian/package-host/libnl-tiny/prepare: debian/buildenv/create
    25 
    2623debian/package-host/libnl-tiny/all: debian/package-host/libnl-tiny/chrootinstall
    2724
  • branches/contrib/debian/package-host/libnl-tiny/debian/control

    r127 r637  
    33Priority: extra
    44Maintainer: Amain (DebWrt.net) <amain@debwrt.net>
    5 Build-Depends: debhelper (>= 7.0.50~)
     5Build-Depends: debhelper (>= 7.0.50~), devscripts, subversion
    66Standards-Version: 3.8.4
    77Homepage: https://dev.openwrt.org/browser/trunk/package/libnl-tiny
  • branches/contrib/debian/package-host/libnl-tiny/debian/rules

    r633 r637  
    1010export DH_VERBOSE=1
    1111
     12OPENWRT_URL=svn://svn.openwrt.org/openwrt/trunk/package/libs/libnl-tiny/src
    1213DEB_HOST_GNU_TYPE?=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
    1314CC=$(DEB_HOST_GNU_TYPE)-gcc
     
    1718        dh $@
    1819
    19 build:
     20build: checkout
    2021        dh_testdir
    2122        dh_auto_configure
     
    2425
    2526        dh_auto_test
     27
     28checkout:
     29        svn co $(OPENWRT_URL) src
    2630
    2731override_dh_auto_install:
     
    3236        find debian/libnl-tiny-dev/usr/include/netlink-tiny -type d -name .svn -prune -print0 | xargs -0 rm -rf
    3337
     38        [ -f debian/changelog.base ] || mv debian/changelog debian/changelog.base
     39        cp -f debian/changelog.base debian/changelog
     40        rev=`svnversion -c src | sed -e's/^\([0-9]\+:\)\?\([0-9]\+\)[^0-9]*$$/\2/'` ; \
     41        debchange -l -"$$rev" -D unstable "Checkout OpenWRT version $$rev."
     42
    3443override_dh_auto_clean:
    3544        rm -f src/libnl-tiny.so src/*.o
     45        [ -f debian/changelog.base ] && mv debian/changelog.base debian/changelog || true
    3646
     47.PHONY: checkout
     48
  • branches/contrib/debian/package-host/shared.mk

    r636 r637  
    2222TOPDIR:=$(CURDIR)
    2323
    24 LC_ALL:=C
     24export LC_ALL:=C
     25
     26export DEBFULLNAME:="Amain (DebWrt.net)"
     27
     28export VERBOSE:=1
    2529
    2630include rules/functions.mk
     
    3034include rules/help.mk
    3135include config/config.mk
    32 include debian/debian.mk
    3336include plugins/plugins.mk
    3437
     
    4043debian/package-host/%/all: debian/package-host/%/deliver
    4144        touch $@
     45
     46
     47ifdef build_buildpackage
     48
     49$(info build_buildpackage is defined)
     50
     51debian/package-host/%/prepare:
     52        rm -rf   $(DEBIAN_BUILD_DIR)/usr/src/$*
     53        mkdir -p $(DEBIAN_BUILD_DIR)/usr/src/$*
     54        cp -arl $(DEBIAN_PACKAGES_HOST_DIR)/$* $(DEBIAN_BUILD_DIR)/usr/src/$*
     55        touch $@
     56
     57debian/package-host/%/build: debian/package-host/%/prepare
     58        -cd $(DEBIAN_BUILD_DIR)/usr/src/$*/$*; dpkg-buildpackage -a$(TARGET_ARCH) -b
     59        cd $(DEBIAN_BUILD_DIR)/usr/src/$*; dpkg-cross -a $(TARGET_ARCH) -b *_$(TARGET_ARCH).deb
     60        touch $@
     61
     62else
    4263
    4364debian/package-host/%/prepare:
     
    5677        $(CHROOT_USER) bash -c "cd /usr/src/$*; export ARCH=$(TARGET_ARCH); export DEBIAN_BUILD_VERSION=$(DEBIAN_BUILD_VERSION) ./build.sh"
    5778        touch $@
     79
     80endif
     81
    5882
    5983debian/package-host/%/deliver: debian/package-host/%/build
Note: See TracChangeset for help on using the changeset viewer.