Changeset 632


Ignore:
Timestamp:
Oct 31, 2014, 2:22:50 AM (5 years ago)
Author:
ehem
Message:

More script consistency work. Break the dpkg -i step off of the
dpkg-cross step used by these build scripts, move this to a separate step
in the Makefiles. This breaks another root-required step away from the
build scripts.

Location:
branches/contrib/debian/package-host
Files:
20 edited

Legend:

Unmodified
Added
Removed
  • branches/contrib/debian/package-host/broadcom-wl/build.sh

    r516 r632  
    7272   dch -v ${VERSION}-${RELEASE} -m -t "Automated packet generation"
    7373   dpkg-buildpackage -a${ARCH} -rfakeroot
    74    find ${BUILD_BASE_DIR} -maxdepth 1 -name "*.deb"  | xargs -r -t -i sudo dpkg-cross -a ${ARCH} -i {} || true
     74   find ${BUILD_BASE_DIR} -maxdepth 1 -name "*_${ARCH}.deb" | xargs -r -t -i dpkg-cross -a ${ARCH} -b {} || true
    7575fi
  • branches/contrib/debian/package-host/debwrt-hostapd/build.mk

    r630 r632  
    2020
    2121
    22 debian/package-host/debwrt-hostapd/build: debian/package-host/libnl/all
     22debian/package-host/debwrt-hostapd/build: debian/package-host/libnl/chrootinstall
    2323
    2424debian/package-host/debwrt-hostapd/prepare: debian/buildenv/create
  • branches/contrib/debian/package-host/debwrt-hostapd/build.sh

    r628 r632  
    9292   cd ${BUILD_DIR}
    9393   dpkg-buildpackage -a${ARCH} -rfakeroot
    94    find ${BUILD_BASE_DIR} -maxdepth 1 -name "*.deb"  | xargs -r -t -i sudo dpkg-cross -a ${ARCH} -i {} || true
     94   find ${BUILD_BASE_DIR} -maxdepth 1 -name "*_${ARCH}.deb" | xargs -r -t -i dpkg-cross -a ${ARCH} -b {} || true
    9595fi
    9696
  • branches/contrib/debian/package-host/debwrt-kernel-headers/build.mk

    r630 r632  
    4646        touch $@
    4747
     48debian/package-host/debwrt-kernel-headers/all: debian/package-host/debwrt-kernel-headers/chrootinstall
     49
  • branches/contrib/debian/package-host/debwrt-kernel-headers/build.sh

    r629 r632  
    4343   dch -v ${VERSION}-${RELEASE} -b -m -t "Automated packet generation"
    4444   dpkg-buildpackage -a${ARCH} -rfakeroot -b
    45    find ${BUILD_BASE_DIR} -maxdepth 1 -name "*.deb"  | xargs -r -t -i sudo dpkg-cross -a ${ARCH} -i {} || true
     45   find ${BUILD_BASE_DIR} -maxdepth 1 -name "*_${ARCH}.deb" | xargs -r -t -i dpkg-cross -a ${ARCH} -b {} || true
    4646fi
    4747
  • branches/contrib/debian/package-host/iw/build.sh

    r627 r632  
    3939   cd ${BUILD_DIR}
    4040   dpkg-buildpackage -a${ARCH} -rfakeroot
    41    #find ${BUILD_BASE_DIR} -maxdepth 1 -name "*.deb"  | xargs -r -t -i sudo dpkg-cross -a ${ARCH} -i {} || true
     41   #find ${BUILD_BASE_DIR} -maxdepth 1 -name "*_${ARCH}.deb" | xargs -r -t -i dpkg-cross -a ${ARCH} -b {} || true
    4242fi
    4343
  • branches/contrib/debian/package-host/libnl-tiny/build.mk

    r630 r632  
    1919
    2020
    21 debian/package-host/libnl-tiny/build: debian/package-host/libnl/all
     21debian/package-host/libnl-tiny/build: debian/package-host/libnl/chrootinstall
    2222
    2323debian/package-host/libnl-tiny/prepare: debian/buildenv/create
    2424
     25debian/package-host/libnl-tiny/all: debian/package-host/libnl-tiny/chrootinstall
     26
  • branches/contrib/debian/package-host/libnl-tiny/build.sh

    r628 r632  
    4343   # build and install deb cross packages
    4444   cd ${BUILD_BASE_DIR}
    45    find ${BUILD_BASE_DIR} -maxdepth 1 -name "*.deb"  | grep -v _all.deb | xargs -r -t sudo dpkg-cross -a ${ARCH} -b || true
    46    find ${BUILD_BASE_DIR} -maxdepth 1 -name "*.deb"  | grep    _all.deb | xargs -r -t sudo dpkg -i                  || true
     45   find ${BUILD_BASE_DIR} -maxdepth 1 -name "*_${ARCH}.deb" | xargs -r -t dpkg-cross -a ${ARCH} -b || true
    4746fi
    4847
  • branches/contrib/debian/package-host/libnl/build.mk

    r630 r632  
    2020
    2121
    22 debian/package-host/libnl/build: debian/package-host/debwrt-kernel-headers/all
     22debian/package-host/libnl/build: debian/package-host/debwrt-kernel-headers/chrootinstall
    2323
    2424debian/package-host/libnl/prepare: debian/buildenv/create
    2525
     26debian/package-host/libnl/all: debian/package-host/libnl/chrootinstall
     27
  • branches/contrib/debian/package-host/libnl/build.sh

    r627 r632  
    4242# build and install deb cross packages
    4343cd ${BUILD_BASE_DIR}
    44 find ${BUILD_BASE_DIR} -maxdepth 1 -name "*.deb"  | grep -v _all.deb | xargs -r -t sudo dpkg-cross -a ${ARCH} -b || true
    45 find ${BUILD_BASE_DIR} -maxdepth 1 -name "*.deb"  | grep    _all.deb | xargs -r -t sudo dpkg -i                  || true
     44find ${BUILD_BASE_DIR} -maxdepth 1 -name "*_${ARCH}.deb" | xargs -r -t dpkg-cross -a ${ARCH} -b || true
  • branches/contrib/debian/package-host/libpar2/build.mk

    r630 r632  
    2222debian/package-host/libpar2/prepare: debian/buildenv/create
    2323
     24debian/package-host/libpar2/all: debian/package-host/libpar2/chrootinstall
     25
  • branches/contrib/debian/package-host/libpar2/build.sh

    r130 r632  
    4343# build and install deb cross packages
    4444cd ${BUILD_BASE_DIR}
    45 find ${BUILD_BASE_DIR} -maxdepth 1 -name "*.deb"  | grep -v _all.deb | xargs -r -t sudo dpkg-cross -a ${ARCH} -b || true
    46 find ${BUILD_BASE_DIR} -maxdepth 1 -name "*.deb"  | grep    _all.deb | xargs -r -t sudo dpkg -i                  || true
     45find ${BUILD_BASE_DIR} -maxdepth 1 -name "*_${ARCH}.deb" | xargs -r -t dpkg-cross -a ${ARCH} -b || true
    4746
  • branches/contrib/debian/package-host/nvram/build.sh

    r628 r632  
    3636   cd ${BUILD_DIR}
    3737   dpkg-buildpackage -a${ARCH} -rfakeroot
    38    find ${BUILD_BASE_DIR} -maxdepth 1 -name "*.deb"  | xargs -r -t -i sudo dpkg-cross -a ${ARCH} -i {} || true
     38   find ${BUILD_BASE_DIR} -maxdepth 1 -name "*_${ARCH}.deb" | xargs -r -t -i dpkg-cross -a ${ARCH} -b {} || true
    3939fi
    4040
  • branches/contrib/debian/package-host/nzbget/build.sh

    r631 r632  
    6060# build and install cross package
    6161cd ${BUILD_BASE_DIR}
    62 find ${BUILD_BASE_DIR} -maxdepth 1 -name "*.deb" | xargs -r -t sudo dpkg-cross -a ${ARCH} -i || true
     62find ${BUILD_BASE_DIR} -maxdepth 1 -name "*_${ARCH}.deb" | xargs -r -t dpkg-cross -a ${ARCH} -b || true
    6363
  • branches/contrib/debian/package-host/robocfg/build.mk

    r630 r632  
    2020
    2121
    22 debian/package-host/robocfg/build: debian/package-host/libnl/all
     22debian/package-host/robocfg/build: debian/package-host/libnl/chrootinstall
    2323
    2424debian/package-host/robocfg/prepare: debian/buildenv/create
  • branches/contrib/debian/package-host/robocfg/build.sh

    r631 r632  
    3535   cd ${BUILD_DIR}
    3636   dpkg-buildpackage -a${ARCH} -rfakeroot
    37    find ${BUILD_BASE_DIR} -maxdepth 1 -name "*.deb"  | xargs -r -t -i sudo dpkg-cross -a ${ARCH} -i {} || true
     37   find ${BUILD_BASE_DIR} -maxdepth 1 -name "*_${ARCH}.deb" | xargs -r -t -i dpkg-cross -a ${ARCH} -b {} || true
    3838fi
    3939
  • branches/contrib/debian/package-host/shared.mk

    r630 r632  
    5353        touch $@
    5454
     55debian/package-host/%/build: debian/package-host/%/prepare
     56        $(CHROOT_USER) bash -c "cd /usr/src/$*; export ARCH=$(TARGET_ARCH); export DEBIAN_BUILD_VERSION=$(DEBIAN_BUILD_VERSION) ./build.sh"
     57        touch $@
     58
    5559debian/package-host/%/deliver: debian/package-host/%/build
    5660        mkdir -p $(INSTALL_DIR_DEBIAN_PACKAGES)
     
    6165        touch $@
    6266
    63 debian/package-host/%/build: debian/package-host/%/prepare
    64         $(CHROOT_USER) bash -c "cd /usr/src/$*; export ARCH=$(TARGET_ARCH); export DEBIAN_BUILD_VERSION=$(DEBIAN_BUILD_VERSION) ./build.sh"
    65         touch $@
     67debian/package-host/%/chrootinstall: debian/package-host/%/build
     68        $(CHROOT) sh -c "dpkg -i /usr/src/$*/*_all.deb"
    6669
    6770debian/package-host/%/clean:
     
    7073        rm -f debian/package-host/$*/prepare
    7174        rm -f debian/package-host/$*/deliver
     75        rm -f debian/package-host/$*/chrootinstall
    7276
    7377.PHONY: debian/package-host/%/clean
  • branches/contrib/debian/package-host/shellinabox/build.sh

    r631 r632  
    2525
    2626# install build dependencies
    27 sudo apt-get -y install binutils libssl-dev libpam0g-dev libz-dev
     27${SUROOT:-sudo} apt-get -y install binutils libssl-dev libpam0g-dev libz-dev
    2828
    2929rm -rf ${BUILD_DIR}
     
    4040#         or dpkg-buildpackage does not understand dpkg-cross package naming scheme anymore.
    4141dpkg-buildpackage -d -a${ARCH} -rfakeroot
    42 find ${BUILD_BASE_DIR} -maxdepth 1 -name "*.deb"  | xargs -r -t -i sudo dpkg-cross -a ${ARCH} -i {} || true
     42find ${BUILD_BASE_DIR} -maxdepth 1 -name "*_${ARCH}.deb" | xargs -r -t -i dpkg-cross -a ${ARCH} -b {} || true
    4343
  • branches/contrib/debian/package-host/swconfig/build.mk

    r630 r632  
    2020
    2121
    22 debian/package-host/swconfig/build: debian/package-host/libnl-tiny/all
     22debian/package-host/swconfig/build: debian/package-host/libnl-tiny/chrootinstall
    2323
    2424debian/package-host/swconfig/prepare: debian/buildenv/create
  • branches/contrib/debian/package-host/swconfig/build.sh

    r631 r632  
    4949   # build dependency checks broken for wheezy, checking it manually above
    5050   dpkg-buildpackage -d -a${ARCH} -rfakeroot
    51    find ${BUILD_BASE_DIR} -maxdepth 1 -name "*.deb"  | xargs -r -t -i sudo dpkg-cross -a ${ARCH} -i {} || true
     51   find ${BUILD_BASE_DIR} -maxdepth 1 -name "*_${ARCH}.deb" | xargs -r -t -i dpkg-cross -a ${ARCH} -b {} || true
    5252fi
    5353
Note: See TracChangeset for help on using the changeset viewer.