manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config: rename --architectures to --architecture 

this has only ever supported specifying a single arch, thus was confusing
being plural

Gbp-Dch: Short
Closes: #952892
This commit is contained in:
Lyndon Brown 2020-02-28 21:01:30 +00:00 committed by Luca Boccassi
parent 49e4608cff
commit 8b109ffb96
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manpages/en/lb_config.1
View File

@ -28,7 +28,7 @@
.br
[\fB\-\-aptitude\-options\fR \fIOPTION\fR|"\fIOPTIONS\fR"]
.br
[\-a|\fB\-\-architectures\fR \fIARCHITECTURE\fR]
[\-a|\fB\-\-architecture\fR \fIARCHITECTURE\fR]
.br
[\fB\-\-archive\-areas\fR \fIARCHIVE_AREA\fR|\fI"ARCHIVE_AREAS"\fR]
.br
@ -273,7 +273,7 @@ defines if apt should check repository signatures. This is true by default.
defines if deb-src entries should be included in the resulting live image's apt sources.list or not, defaults to true.
.IP "\fB\-\-aptitude\-options\fR \fIOPTION\fR|""\fIOPTIONS\fR""" 4
defines the default options that will be appended to every aptitude call that is made inside chroot during building of the image. By default, this is set to \-\-assume\-yes to allow non-interactive installation of packages.
.IP "\-a|\fB\-\-architectures\fR \fIARCHITECTURE\fR" 4
.IP "\-a|\fB\-\-architecture\fR \fIARCHITECTURE\fR" 4
defines the architecture of the to be built image. By default, this is set to the host architecture. Note that you cannot crossbuild for another architecture if your host system is not able to execute binaries for the target architecture natively. For example, building amd64 images on i386 and vice versa is possible if you have a 64bit capable i386 processor and the right kernel. But building powerpc images on an i386 system is not possible.
.IP "\fB\-\-archive\-areas\fR \fIARCHIVE_AREA\fR|""\fIARCHIVE_AREAS\fR""" 4
defines which package archive areas of a debian packages archive should be used for configured debian package mirrors. By default, this is set to main. Remember to check the licenses of each package with respect to their redistributability in your juristiction when enabling contrib or non\-free with this mechanism.

4
scripts/build/config
View File

@ -26,7 +26,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--apt-secure true|false]\n\
\t [--apt-source-archives true|false]\n\
\t [--aptitude-options OPTION|\"OPTIONS\"]\n\
\t [-a|--architectures ARCHITECTURE]\n\
\t [-a|--architecture ARCHITECTURE]\n\
\t [--archive-areas ARCHIVE_AREA|\"ARCHIVE_AREAS\"]\n\
\t [--backports true|false]\n\
\t [--binary-filesystem fat16|fat32|ext2|ext3|ext4|ntfs]\n\
@ -349,7 +349,7 @@ Local_arguments ()
;;
# config/bootstrap
-a|--architectures)
-a|--architecture|--architectures)
LB_ARCHITECTURES="${2}"
shift 2
;;