Mercurial > hg-stable
diff contrib/dockerdeb @ 27210:9b86d29867a5
builddeb: add --distid option to specify Distributor ID
This allows builddeb to handle distributions that are not Debian.
Distributor ID is reported by lsb_release --id, and in case of builddeb it's
usually Debian or Ubuntu.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Wed, 25 Nov 2015 15:15:03 +0800 |
| parents | 7fbab10f812f |
| children | 023f47c5ce79 |
line wrap: on
line diff
--- a/contrib/dockerdeb Wed Nov 25 14:59:43 2015 +0800 +++ b/contrib/dockerdeb Wed Nov 25 15:15:03 2015 +0800 @@ -8,8 +8,9 @@ checkdocker -CODENAME="$1" -PLATFORM="debian-$1" +DISTID="$1" +CODENAME="$2" +PLATFORM="$1-$2" shift # extra params are passed to build process OUTPUTDIR=${OUTPUTDIR:=$ROOTDIR/packages/$PLATFORM} @@ -26,8 +27,8 @@ sh -c "cd /mnt/$dn && make clean && make local" fi $DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \ - sh -c "cd /mnt/$dn && DEB_BUILD_OPTIONS='${DEB_BUILD_OPTIONS:=}' contrib/builddeb --build --codename $CODENAME" -contrib/builddeb --cleanup --codename $CODENAME + sh -c "cd /mnt/$dn && DEB_BUILD_OPTIONS='${DEB_BUILD_OPTIONS:=}' contrib/builddeb --build --distid $DISTID --codename $CODENAME" +contrib/builddeb --cleanup --distid $DISTID --codename $CODENAME if [ $(uname) = "Darwin" ] ; then $DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \ sh -c "cd /mnt/$dn && make clean"