ソースを参照

Fix the value of the Components value in apt {In,}Release files

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Kenfe-Mickael Laventure 9 年 前
コミット
63b0713014
1 ファイル変更4 行追加4 行削除
  1. 4 4
      hack/make/release-deb

+ 4 - 4
hack/make/release-deb

@@ -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