| Message ID | 20241119132250.1028420-1-felix.moessbauer@siemens.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | [1/1] sbuild: make dist configurable | expand |
On Tue, 2024-11-19 at 14:22 +0100, 'Felix Moessbauer' via isar-users wrote: > The output distro name of isar can be changed by setting > DEBDISTRONAME. > However, in the sbuild invocation the value is hard-coded to "isar". > We now use the variable there as well. > > Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com> > --- > meta/classes/dpkg.bbclass | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass > index 7eba7521..ef85890a 100644 > --- a/meta/classes/dpkg.bbclass > +++ b/meta/classes/dpkg.bbclass > @@ -121,7 +121,7 @@ dpkg_runbuild() { > --finished-build-commands="rm -f ${deb_dir}/sbuild-build- > depends-main-dummy_*.deb" \ > --finished-build-commands="find ${deb_dir} -maxdepth 1 -type > f -name '*.deb' -print -exec cp ${CP_FLAGS} -t ${ext_deb_dir}/ {} +" > \ > --finished-build-commands="cp /var/log/dpkg.log > ${ext_root}/dpkg_partial.log" \ > - --build-dir=${WORKDIR} --dist="isar" ${DSC_FILE} > + --build-dir=${WORKDIR} --dist="${DEBDISTRONAME}" ${DSC_FILE} > > sbuild_dpkg_log_export "${WORKDIR}/rootfs/dpkg_partial.log" > deb_dl_dir_export "${WORKDIR}/rootfs" "${distro}" > -- > 2.39.5 > Applied to next, thanks.
diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 7eba7521..ef85890a 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -121,7 +121,7 @@ dpkg_runbuild() { --finished-build-commands="rm -f ${deb_dir}/sbuild-build-depends-main-dummy_*.deb" \ --finished-build-commands="find ${deb_dir} -maxdepth 1 -type f -name '*.deb' -print -exec cp ${CP_FLAGS} -t ${ext_deb_dir}/ {} +" \ --finished-build-commands="cp /var/log/dpkg.log ${ext_root}/dpkg_partial.log" \ - --build-dir=${WORKDIR} --dist="isar" ${DSC_FILE} + --build-dir=${WORKDIR} --dist="${DEBDISTRONAME}" ${DSC_FILE} sbuild_dpkg_log_export "${WORKDIR}/rootfs/dpkg_partial.log" deb_dl_dir_export "${WORKDIR}/rootfs" "${distro}"
The output distro name of isar can be changed by setting DEBDISTRONAME. However, in the sbuild invocation the value is hard-coded to "isar". We now use the variable there as well. Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com> --- meta/classes/dpkg.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)