Fix wheezy variants (older "dpkg-architecture", no "--query")

tianon · tianon · commit a33fcb6adc83 · 2017-05-10T09:31:26.000-07:00
diff --git a/2.7/wheezy/Dockerfile b/2.7/wheezy/Dockerfile
@@ -35,7 +35,7 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+	&& gnuArch="$(dpkg-architecture -qDEB_BUILD_GNU_TYPE)" \
 	&& ./configure \
 		--build="$gnuArch" \
 		--enable-shared \
diff --git a/3.3/wheezy/Dockerfile b/3.3/wheezy/Dockerfile
@@ -41,7 +41,7 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+	&& gnuArch="$(dpkg-architecture -qDEB_BUILD_GNU_TYPE)" \
 	&& ./configure \
 		--build="$gnuArch" \
 		--enable-loadable-sqlite-extensions \
diff --git a/3.4/wheezy/Dockerfile b/3.4/wheezy/Dockerfile
@@ -41,7 +41,7 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& cd /usr/src/python \
-	&& gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
+	&& gnuArch="$(dpkg-architecture -qDEB_BUILD_GNU_TYPE)" \
 	&& ./configure \
 		--build="$gnuArch" \
 		--enable-loadable-sqlite-extensions \
diff --git a/update.sh b/update.sh
@@ -94,7 +94,11 @@ for version in "${versions[@]}"; do
 			done
 			if [ -d "$version/wheezy" ]; then
 				cp "$version/Dockerfile" "$version/wheezy/Dockerfile"
-				sed -ri 's/:jessie/:wheezy/g' "$version/wheezy/Dockerfile"
+				# wheezy-only: dpkg-architecture: unknown option `--query'
+				sed -ri \
+					-e 's/:jessie/:wheezy/g' \
+					-e 's/dpkg-architecture --query /dpkg-architecture -q/g' \
+					"$version/wheezy/Dockerfile"
 			fi
 		fi
 		(

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ RUN set -ex \`
`35`	`35`	`&& rm python.tar.xz \`
`36`	`36`	`\`
`37`	`37`	`&& cd /usr/src/python \`
`38`		`- && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \`
	`38`	`+ && gnuArch="$(dpkg-architecture -qDEB_BUILD_GNU_TYPE)" \`
`39`	`39`	`&& ./configure \`
`40`	`40`	`--build="$gnuArch" \`
`41`	`41`	`--enable-shared \`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ RUN set -ex \`
`41`	`41`	`&& rm python.tar.xz \`
`42`	`42`	`\`
`43`	`43`	`&& cd /usr/src/python \`
`44`		`- && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \`
	`44`	`+ && gnuArch="$(dpkg-architecture -qDEB_BUILD_GNU_TYPE)" \`
`45`	`45`	`&& ./configure \`
`46`	`46`	`--build="$gnuArch" \`
`47`	`47`	`--enable-loadable-sqlite-extensions \`