Skip to content
This repository was archived by the owner on Feb 10, 2022. It is now read-only.

Commit a9c5063

Browse files
swalner-pivotalswalner-pivotal
committed
Use package and version variables in packaging scripts
1 parent d1a051c commit a9c5063

File tree

10 files changed

+85
-36
lines changed

10 files changed

+85
-36
lines changed

‎packages/cifs-utils/packaging

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,52 +3,58 @@ set -e
33
temp_path=${PWD}/temp
44
mkdir $temp_path
55

6-
tar xf autoconf-2.69.tar.gz
7-
8-
pushd autoconf-2.69
6+
AUTOCONF_PACKAGE=autoconf
7+
AUTOCONF_VERSION=2.69
8+
tar xf $AUTOCONF_PACKAGE-$AUTOCONF_VERSION.tar.gz
9+
pushd $AUTOCONF_PACKAGE-$AUTOCONF_VERSION
910
./configure --prefix=${temp_path}
1011
make
1112
make install
1213
export PATH=${PATH}:${temp_path}/bin
1314
popd
1415

15-
tar xf automake-1.15.tar.gz
16-
17-
pushd automake-1.15
16+
AUTOMAKE_PACKAGE=automake
17+
AUTOMAKE_VERSION=1.15
18+
tar xf $AUTOMAKE_PACKAGE-$AUTOMAKE_VERSION.tar.gz
19+
pushd $AUTOMAKE_PACKAGE-$AUTOMAKE_VERSION
1820
./configure --prefix=${temp_path}
1921
make
2022
make install
2123
popd
2224

23-
tar xf libtool-2.4.6.tar.gz
24-
25-
pushd libtool-2.4.6
25+
LIBTOOL_PACKAGE=libtool
26+
LIBTOOL_VERSION=2.4.6
27+
tar xf $LIBTOOL_PACKAGE-$LIBTOOL_VERSION.tar.gz
28+
pushd $LIBTOOL_PACKAGE-$LIBTOOL_VERSION
2629
./configure --prefix=${temp_path}
2730
make
2831
make install
2932
popd
3033

31-
tar xf talloc-2.1.9.tar.gz
32-
33-
pushd talloc-2.1.9
34+
TALLOC_PACKAGE=talloc
35+
TALLOC_VERSION=2.1.9
36+
tar xf $TALLOC_PACKAGE-$TALLOC_VERSION.tar.gz
37+
pushd $TALLOC_PACKAGE-$TALLOC_VERSION
3438
./configure --prefix=${temp_path}
3539
make
3640
make install
3741
popd
3842

39-
tar xf pkg-config-0.29.2.tar.gz
40-
41-
pushd pkg-config-0.29.2
43+
PKG_CONFIG_PACKAGE=pkg-config
44+
PKG_CONFIG_VERSION=0.29.2
45+
tar xf $PKG_CONFIG_PACKAGE-$PKG_CONFIG_VERSION.tar.gz
46+
pushd $PKG_CONFIG_PACKAGE-$PKG_CONFIG_VERSION
4247
./configure --prefix=${temp_path} --with-internal-glib
4348
make
4449
make install
4550
popd
4651

47-
tar jxf cifs-utils-6.7.tar.bz2
48-
49-
pushd cifs-utils-6.7
52+
CIFS_PACKAGE=cifs-utils
53+
CIFS_VERSION=6.7
54+
tar jxf $CIFS_PACKAGE-$CIFS_VERSION.tar.bz2
55+
pushd $CIFS_PACKAGE-$CIFS_VERSION
5056
autoreconf -i
5157
./configure --prefix=${temp_path}
5258
make CPPFLAGS="-I${temp_path}/include"
53-
cp mount.cifs ${BOSH_INSTALL_TARGET}
59+
cp -a mount.cifs ${BOSH_INSTALL_TARGET}
5460
popd

‎packages/cni/packaging

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
set -exu
22

33
mkdir -p ${BOSH_INSTALL_TARGET}/bin
4-
tar -xzf cni/cni-plugins-amd64*.tgz -C ${BOSH_INSTALL_TARGET}/bin/
4+
5+
CNI_PACKAGE="cni-plugins"
6+
CNI_VERSION="0.7.1"
7+
8+
tar -xzf cni/${CNI_PACKAGE}-amd64-${CNI_VERSION}.tgz -C ${BOSH_INSTALL_TARGET}/bin/
59

610
mkdir -p utillocal
711
dpkg -x cni/util-linux*.deb utillocal/
812

9-
cp utillocal/usr/bin/nsenter ${BOSH_INSTALL_TARGET}/bin
13+
cp -a utillocal/usr/bin/nsenter ${BOSH_INSTALL_TARGET}/bin
1014

1115
chmod +x ${BOSH_INSTALL_TARGET}/bin/*

‎packages/conntrack/packaging

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
set -e
22

33
mkdir -p "${BOSH_INSTALL_TARGET:?}/"
4-
cp -a conntrack/* "${BOSH_INSTALL_TARGET:?}"
5-
cp libmnl0* "${BOSH_INSTALL_TARGET:?}"
64

5+
CONNTRACK_PACKAGE=conntrack
6+
CONNTRACK_VERSION="1.4.3"
7+
cp -a conntrack/${CONNTRACK_PACKAGE}_${CONNTRACK_VERSION}-3_amd64.deb "${BOSH_INSTALL_TARGET:?}/"
8+
9+
LIBNETFILTER_PACKAGE=libnetfilter-conntrack3
10+
LIBNETFILTER_VERSION="1.0.5"
11+
cp -a conntrack/${LIBNETFILTER_PACKAGE}_${LIBNETFILTER_VERSION}-1_amd64.deb "${BOSH_INSTALL_TARGET:?}/"
12+
13+
LIBMN_PACKABE=libmnl0
14+
LIBMN_VERSION="1.0.3"
15+
cp -a ${LIBMN_PACKAGE}_${LIBMN_VERSION}-5_amd64.deb "${BOSH_INSTALL_TARGET:?}/"

‎packages/etcdctl/packaging

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
set -e
22

3+
ETCDCTL_PACKAGE=etcdctl
34
ETCDCTL_VERSION="3.0.7"
45

56
main() {
@@ -8,11 +9,11 @@ main() {
89
}
910

1011
copy_binary() {
11-
cp -a etcdctl-${ETCDCTL_VERSION} "${BOSH_INSTALL_TARGET:?}/etcdctl"
12+
cp -a ${ETCDCTL_PACKAGE}-${ETCDCTL_VERSION} "${BOSH_INSTALL_TARGET:?}/etcdctl"
1213
}
1314

1415
make_executable() {
1516
chmod +x "${BOSH_INSTALL_TARGET:?}/etcdctl"
1617
}
1718

18-
main
19+
main

‎packages/flanneld/packaging

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
set -e
22

3+
FLANNELD_PACKAGE=flannel
34
FLANNELD_VERSION="0.11.0"
4-
tar xvf flannel-v${FLANNELD_VERSION}-linux-amd64.tar.gz
5+
tar xvf ${FLANNEL_PACKAGE}-v${FLANNELD_VERSION}-linux-amd64.tar.gz
56
cp -a flanneld "${BOSH_INSTALL_TARGET:?}/flanneld"
67
chmod +x "${BOSH_INSTALL_TARGET:?}/flanneld"

‎packages/ipset/packaging

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
set -e
22

33
mkdir -p "${BOSH_INSTALL_TARGET:?}/"
4-
cp -a ipset/* "${BOSH_INSTALL_TARGET:?}"
4+
5+
IPSET_PACKAGE=ipset
6+
IPSET_VERSION=6.20.1
7+
LIBIPSET_PACKAGE=libipset3
8+
LIBIPSET_VERSION=6.20.1
9+
cp -a ipset/${IPSET_PACKAGE}_${IPSET_VERSION}-1_amd64.deb "${BOSH_INSTALL_TARGET:?}/"
10+
cp -a ipset/${LIBIPSET_PACKAGE}_${LIBIPSET_VERSION}-1_amd64.deb "${BOSH_INSTALL_TARGET:?}/"

‎packages/jq/packaging

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
set -e # exit immediately if a simple command exits with a non-zero status
2-
set -u # report the usage of uninitialized variables
1+
set -eu
32

43
mkdir -p $BOSH_INSTALL_TARGET/bin
5-
cp -a jq-linux64-1.6 $BOSH_INSTALL_TARGET/bin/jq
4+
5+
JQ_PACKAGE=jq
6+
JQ_VERSION="1.6"
7+
8+
cp -a ${JQ_PACKAGE}-linux64-${JQ_VERSION} $BOSH_INSTALL_TARGET/bin/jq/
69
chmod +x $BOSH_INSTALL_TARGET/bin/jq

‎packages/kubernetes/packaging

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
set -e
22

3+
KUBERNETES_PACKAGE=kubernetes
34
KUBERNETES_VERSION="1.15.5"
45

56
main() {
@@ -15,7 +16,7 @@ create_target_dir() {
1516

1617
copy_depedencies_to_bosh() {
1718
cp -a container-images/* "${BOSH_INSTALL_TARGET:?}/container-images"
18-
cp -a kubernetes-${KUBERNETES_VERSION}/* "${BOSH_INSTALL_TARGET:?}/bin"
19+
cp -a ${KUBERNETES_PACKAGE}-${KUBERNETES_VERSION}/* "${BOSH_INSTALL_TARGET:?}/bin"
1920
}
2021

2122
make_binaries_executable() {

‎packages/nfs/packaging

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
11
set -e
22

3+
NFSCOMMON_PACKAGE="nfs-common"
4+
NFSCOMMON_VERSION="1.2.8"
5+
KEYUTILS_PACKAGE=keyutils
6+
KEYUTILS_VERSION="1.5.9"
7+
LIBEVENT_PACKAGE=libevent
8+
LIBEVENT_VERSION="2.0.21"
9+
LIBNFSIDMAP_PACKAGE=libnfsidmap2
10+
LIBNFSIDMAP_VERSION="0.25"
11+
RPCBIND_PACKAGE=rpcbind
12+
RPCBIND_VERSION="0.2.3"
13+
314
mkdir -p "${BOSH_INSTALL_TARGET:?}/"
4-
cp -a nfs-debs/* "${BOSH_INSTALL_TARGET:?}"
15+
cp -a nfs-debs/${NFSCOMMON_PACKAGE}_1:${NFSCOMMON_VERSION}-9ubuntu12.1_amd64.deb "${BOSH_INSTALL_TARGET:?}/"
16+
cp -a nfs-debs/${KEYUTILS_PACKAGE}_${KEYUTILS_VERSION}-8ubuntu1_amd64.deb "${BOSH_INSTALL_TARGET:?}/"
17+
cp -a nfs-debs/${LIBEVENT_PACKAGE}-2.0-5_${LIBNFSIDMAP_VERSION}-stable-2ubuntu0.16.04.1_amd64.deb "${BOSH_INSTALL_TARGET:?}/"
18+
cp -a nfs-debs/${LIBNFSIDMAP_PACKAGE}_${LIBNFSIDMAP_VERSION}-5_amd64.deb "${BOSH_INSTALL_TARGET:?}/"
19+
cp -a nfs-debs/${RPCBIND_PACKAGE}_${RPCBIND_VERSION}-0.2_amd64.deb "${BOSH_INSTALL_TARGET:?}/"

‎packages/socat/packaging

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1-
set -e # exit immediately if a simple command exits with a non-zero status
2-
set -u # report the usage of uninitialized variables
1+
set -eu
32

43
mkdir -p $BOSH_INSTALL_TARGET/bin
5-
tar xzf socat-1.7.3.2.tar.gz
4+
5+
SOCAT_PACKAGE=socat
6+
SOCAT_VERSION="1.7.3.2"
7+
8+
tar xzf ${SOCAT_PACKAGE}-${SOCAT_VERSION}.tar.gz
69
pushd socat-1.7.3.2
710
./configure
811
make
9-
cp socat ${BOSH_INSTALL_TARGET}/bin
12+
cp -a socat ${BOSH_INSTALL_TARGET}/bin
1013
chmod 755 ${BOSH_INSTALL_TARGET}/bin/socat
1114
popd
1215
chmod +x $BOSH_INSTALL_TARGET/bin/socat

0 commit comments

Comments
 (0)