Browse code

Include distro name into .deb filename

Right now we do have a problem to store the .debs for raspbian-jessie and
debian-jessie distro version for armhf arch. Both .debs have the same filename
so we have to include the distro version, too.

Signed-off-by: Dieter Reuter <dieter.reuter@me.com>

Dieter Reuter authored on 2016/10/28 03:04:38
Showing 2 changed files
... ...
@@ -78,7 +78,7 @@ set -e
78 78
 		EOF
79 79
 		cat >> "$DEST/$version/Dockerfile.build" <<-EOF
80 80
 			RUN cp -aL hack/make/.build-deb debian
81
-			RUN { echo '$debSource (${debVersion}-0~${suite}) $suite; urgency=low'; echo; echo '  * Version: $VERSION'; echo; echo " -- $debMaintainer  $debDate"; } > debian/changelog && cat >&2 debian/changelog
81
+			RUN { echo '$debSource (${debVersion}-0~${version}) $suite; urgency=low'; echo; echo '  * Version: $VERSION'; echo; echo " -- $debMaintainer  $debDate"; } > debian/changelog && cat >&2 debian/changelog
82 82
 			RUN dpkg-buildpackage -uc -us -I.git
83 83
 		EOF
84 84
 		tempImage="docker-temp/build-deb:$version"
... ...
@@ -132,6 +132,7 @@ for dir in bundles/$VERSION/build-deb/*/; do
132 132
 
133 133
 	# update the filelist for this codename/component
134 134
 	find "$APTDIR/pool/$component" \
135
+		-name *~${codename}*.deb -o \
135 136
 		-name *~${codename#*-}*.deb > "$APTDIR/dists/$codename/$component/filelist"
136 137
 done
137 138