Skip to content

Commit

Permalink
Merge pull request #310 from adrianschroeter/minor_stuff
Browse files Browse the repository at this point in the history
Minor stuff
  • Loading branch information
adrianschroeter authored Oct 27, 2023
2 parents c737c90 + fa0252e commit a710a5c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
11 changes: 8 additions & 3 deletions xml/obs_build_config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
<title>About the Project Configuration</title>
<para>
Each project has a <firstterm>project configuration</firstterm> which
defines the setup of the build system. Usually it is empty and you do
not need to change anything. However, when you change it, it can be
used for the following reasons:
defines the setup of the build system and the publish behaviour. Usually
it is empty and you do not need to change anything. However, when you
change it, it can be used for the following reasons:
</para>
<remark>toms 2017-08-18: Add more reasons why it is needed</remark>
<itemizedlist>
Expand All @@ -42,6 +42,11 @@
macros, packages, or flags in the build environment.
</para>
</listitem>
<listitem>
<para>
Modify publish behaviour, eg. define metadata or filter binaries.
</para>
</listitem>
</itemizedlist>
<para>
To view the project configuration, use one of the following methods
Expand Down
2 changes: 1 addition & 1 deletion xml/obs_build_containers.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<listitem>
<para>
Docker images can be built either via the &kiwi; tool or from
Dockerfiles.
Dockerfile build descriptions.
</para>
</listitem>
</varlistentry>
Expand Down
3 changes: 2 additions & 1 deletion xml/obs_multibuild.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@
kernel-source.spec or kernel-obs-build.dsc) inside of the sources. There
will be another build in case there is also a matching file for the source
package container name, otherwise it will turn into an
<quote>excluded</quote> state.
<quote>excluded</quote> state. Dockerfile based build descriptions may provide
own build descriptions for each flavor via Dockerfile.FLAVOR suffixed files.
</para>
</sect1>
</chapter>

0 comments on commit a710a5c

Please sign in to comment.