diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-04-01 10:58:47 +0100 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2020-04-23 15:54:19 +0200 |
| commit | 6cc72509541404dc0af57bf2b29dfaaa1ee3e1a4 (patch) | |
| tree | c91a79037457e7bb2c0630fa8c065bee6c465bad /scripts/build/binary_package-lists | |
| parent | 6def2c27be28169cf3e0757a6928e3f13de157a8 (diff) | |
| download | vyos-live-build-6cc72509541404dc0af57bf2b29dfaaa1ee3e1a4.tar.gz vyos-live-build-6cc72509541404dc0af57bf2b29dfaaa1ee3e1a4.zip | |
rename LB_ARCHITECTURES to LB_ARCHITECTURE
this was previously not done in 8b109ffb96282a6dd1aa5d61aa935bcba69c56f1
to keep the renaming simple, but leaving the variable plural is a cause
for confusion.
since this property is stored in the INI style config/build config file
rather than a shell script based one, at the property there is already
singular, there was no need for a backwards compatibility hack.
Gbp-Dch: Short
Diffstat (limited to 'scripts/build/binary_package-lists')
| -rwxr-xr-x | scripts/build/binary_package-lists | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/build/binary_package-lists b/scripts/build/binary_package-lists index 2cbadce61..60ec76b7b 100755 --- a/scripts/build/binary_package-lists +++ b/scripts/build/binary_package-lists @@ -132,9 +132,9 @@ then SECTION="$(basename ${SECTION})" - mkdir -p ${DISTS}/${LB_PARENT_DISTRIBUTION_BINARY}/${SECTION}/binary-${LB_ARCHITECTURES} - apt-ftparchive packages ${POOL}/${SECTION} > ${DISTS}/${LB_PARENT_DISTRIBUTION_BINARY}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages - gzip -9 -c ${DISTS}/${LB_PARENT_DISTRIBUTION_BINARY}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages > ${DISTS}/${LB_PARENT_DISTRIBUTION_BINARY}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages.gz + mkdir -p ${DISTS}/${LB_PARENT_DISTRIBUTION_BINARY}/${SECTION}/binary-${LB_ARCHITECTURE} + apt-ftparchive packages ${POOL}/${SECTION} > ${DISTS}/${LB_PARENT_DISTRIBUTION_BINARY}/${SECTION}/binary-${LB_ARCHITECTURE}/Packages + gzip -9 -c ${DISTS}/${LB_PARENT_DISTRIBUTION_BINARY}/${SECTION}/binary-${LB_ARCHITECTURE}/Packages > ${DISTS}/${LB_PARENT_DISTRIBUTION_BINARY}/${SECTION}/binary-${LB_ARCHITECTURE}/Packages.gz done if [ -d dists/${LB_PARENT_DISTRIBUTION_BINARY} ]; then @@ -145,7 +145,7 @@ then ${_LB_APT_VERSION_OPT} \ -o APT::FTPArchive::Release::Codename="${LB_PARENT_DISTRIBUTION_BINARY}" \ -o APT::FTPArchive::Release::Date="$(date -R)" \ - -o APT::FTPArchive::Release::Architectures="${LB_ARCHITECTURES}" \ + -o APT::FTPArchive::Release::Architectures="${LB_ARCHITECTURE}" \ -o APT::FTPArchive::Release::Components="${LB_PARENT_ARCHIVE_AREAS}" \ -o APT::FTPArchive::Release::Description="Last updated: $(date -R)" \ release dists/${LB_PARENT_DISTRIBUTION_BINARY} \ |