0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #23824 from mlaventure/fix-apt-repo-components-fields

Browse source 
Fix the value of the Components value in apt {In,}Release files
This commit is contained in:
Tibor Vass 2016-06-23 17:54:13 -07:00 • committed by GitHub
commit 45f76db06d
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hack/make/release-deb
View file

@ -92,7 +92,7 @@ done >> "$APTDIR/conf/apt-ftparchive.conf"
cat <<-EOF > "$APTDIR/conf/docker-engine-release.conf"
APT::FTPArchive::Release::Origin "Docker";
APT::FTPArchive::Release::Components "${component}";
APT::FTPArchive::Release::Components "${components[*]}";
APT::FTPArchive::Release::Label "Docker APT Repository";
APT::FTPArchive::Release::Architectures "${arches[*]}";
EOF
@ -144,19 +144,19 @@ for dir in contrib/builder/deb/${PACKAGE_ARCH}/*/; do
codename="${version//debootstrap-}"
apt-ftparchive \
-c "$APTDIR/conf/docker-engine-release.conf" \
-o "APT::FTPArchive::Release::Codename=$codename" \
-o "APT::FTPArchive::Release::Suite=$codename" \
-c "$APTDIR/conf/docker-engine-release.conf" \
release \
"$APTDIR/dists/$codename" > "$APTDIR/dists/$codename/Release"
for arch in "${arches[@]}"; do
apt-ftparchive \
-c "$APTDIR/conf/docker-engine-release.conf" \
-o "APT::FTPArchive::Release::Codename=$codename" \
-o "APT::FTPArchive::Release::Suite=$codename" \
-o "APT::FTPArchive::Release::Component=$component" \
-o "APT::FTPArchive::Release::Components=$component" \
-o "APT::FTPArchive::Release::Architecture=$arch" \
-c "$APTDIR/conf/docker-engine-release.conf" \
release \
"$APTDIR/dists/$codename/$component/binary-$arch" > "$APTDIR/dists/$codename/$component/binary-$arch/Release"
done