diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-09-30 20:14:05 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-09-30 20:14:05 +0200 |
| commit | 26f2278a23a2285208487ef0fec75111d61afe1d (patch) | |
| tree | 2e67a8edeafb0b2afff80667bcab6d38d6de80d8 | |
| parent | ad31a98bf099260405cd00821c9a75ecf8018b6f (diff) | |
| download | vyos-live-build-26f2278a23a2285208487ef0fec75111d61afe1d.tar.gz vyos-live-build-26f2278a23a2285208487ef0fec75111d61afe1d.zip | |
Supporting parent distribution as a variable field in archive definitions.
| -rwxr-xr-x | scripts/build/chroot_archives | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives index 18b686294..e4de5a209 100755 --- a/scripts/build/chroot_archives +++ b/scripts/build/chroot_archives @@ -224,12 +224,14 @@ EOF if [ -e "${_BASE}/archives/${REPOSITORY}.chroot" ] then sed -e "s|@DISTRIBUTION@|${_DISTRIBUTION}|g" \ + -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \ -e "s|@ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \ "${_BASE}/archives/${REPOSITORY}.chroot" > \ "chroot/etc/apt/sources.list.d/${REPOSITORY}.list" elif [ -e "${_BASE}/archives/${REPOSITORY}" ] then sed -e "s|@DISTRIBUTION@|${_DISTRIBUTION}|g" \ + -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \ -e "s|@ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \ "${_BASE}/archives/${REPOSITORY}" > \ "chroot/etc/apt/sources.list.d/${REPOSITORY}.list" @@ -268,8 +270,8 @@ EOF if [ -e "${FILE}" ] then sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \ - -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \ -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \ + -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \ -e "s|@PARENT_ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \ "${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot)" @@ -779,12 +781,14 @@ EOF if [ -e "${_BASE}/archives/${REPOSITORY}.binary" ] then sed -e "s|@DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \ + -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \ -e "s|@ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \ "${_BASE}/archives/${REPOSITORY}.binary" > \ "chroot/etc/apt/sources.list.d/${REPOSITORY}.list" elif [ -e "${_BASE}/archives/${REPOSITORY}" ] then sed -e "s|@DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \ + -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \ -e "s|@ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \ "${_BASE}/archives/${REPOSITORY}" > \ "chroot/etc/apt/sources.list.d/${REPOSITORY}.list" @@ -823,8 +827,8 @@ EOF if [ -e "${FILE}" ] then sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \ - -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \ -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \ + -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \ -e "s|@PARENT_ARCHIVE_AREAS@|${LB_PARENT_ARCHIVE_AREAS}|g" \ "${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .binary)" |