diff --git a/pkg/build.sh b/pkg/build.sh index 239e63bd..6b23fc06 100755 --- a/pkg/build.sh +++ b/pkg/build.sh @@ -16,9 +16,12 @@ cp ../opteadm/target/release/opteadm proto/opt/oxide/opte/bin/ cp ../xde/target/x86_64-unknown-unknown/release/xde proto/kernel/drv/amd64/xde cp ../xde/xde.conf proto/kernel/drv/ +API_VSN=$(./print-api-version.sh) + # create the package sed -e "s/%PUBLISHER%/$PUBLISHER/g" \ -e "s/%COMMIT_COUNT%/$COMMIT_COUNT/g" \ + -e "s/%API_VSN%/$API_VSN/g" \ opte.template.p5m | pkgmogrify -v -O opte.base.p5m pkgdepend generate -d proto opte.base.p5m > opte.generate.p5m @@ -32,4 +35,5 @@ pkgrepo create $REPO pkgrepo add-publisher -s $REPO $PUBLISHER pkgsend publish -d proto -s $REPO opte.final.p5m -pkgrecv -a -d packages/repo/opte-0.1.$COMMIT_COUNT.p5p -s $REPO -v -m latest '*' +pkgrecv -a -d packages/repo/opte-0.$API_VSN.$COMMIT_COUNT.p5p -s $REPO \ + -v -m latest '*' diff --git a/pkg/opte.template.p5m b/pkg/opte.template.p5m index fc9c5824..1a3a9cba 100644 --- a/pkg/opte.template.p5m +++ b/pkg/opte.template.p5m @@ -1,6 +1,6 @@ default variant.opensolaris.zone global> set name=pkg.fmri \ - value=pkg://%PUBLISHER%/driver/network/opte@0.1.%COMMIT_COUNT% + value=pkg://%PUBLISHER%/driver/network/opte@0.%API_VSN%.%COMMIT_COUNT% set name=pkg.summary value="The Oxide Packet Transformation Engine" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Networking @@ -32,5 +32,5 @@ file path=kernel/drv/amd64/xde owner=root group=sys mode=0755 \ pkg.depend.bypass-generate=.*dld.* \ pkg.depend.bypass-generate=.*mac.* driver name=xde -depend type=incorporate fmri=pkg:/driver/network/opte@0.1.%COMMIT_COUNT% -depend type=require fmri=pkg:/driver/network/opte@0.1.%COMMIT_COUNT% +depend type=incorporate fmri=pkg:/driver/network/opte@0.%API_VSN%.%COMMIT_COUNT% +depend type=require fmri=pkg:/driver/network/opte@0.%API_VSN%.%COMMIT_COUNT% diff --git a/pkg/print-api-version.sh b/pkg/print-api-version.sh new file mode 100755 index 00000000..0e4e3be6 --- /dev/null +++ b/pkg/print-api-version.sh @@ -0,0 +1,5 @@ +#!/bin/sh +# +# This script assumes you are running it from the opte/pkg dir. + +grep 'API_VERSION' ../opte-api/src/lib.rs | awk '{ print $6 }' | sed 's/;//'