| Message ID | 20240105111552.664182-1-srinuvasan_a@mentor.com |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | classes/image-tools-extension.bbclass: remove prepare isar-apt part | expand |
On 05.01.24 12:15, Srinuvasan Arjunan wrote: > From: Srinuvasan <srinuvasan.a@siemens.com> > > Now isar-apt configured during sbuildchroot generation, hence remove the prepare > isar-apt part from the imager_run method. > > This changes depends on [1] > > [1]: https://groups.google.com/g/isar-users/c/k8ZNw3OkWLw > > Signed-off-by: Srinuvasan <srinuvasan.a@siemens.com> > --- > meta/classes/image-tools-extension.bbclass | 13 ------------- > 1 file changed, 13 deletions(-) > > diff --git a/meta/classes/image-tools-extension.bbclass b/meta/classes/image-tools-extension.bbclass > index 58799fcf..46bdf78b 100644 > --- a/meta/classes/image-tools-extension.bbclass > +++ b/meta/classes/image-tools-extension.bbclass > @@ -44,19 +44,6 @@ imager_run() { > distro="${HOST_BASE_DISTRO}-${BASE_DISTRO_CODENAME}" > fi > > - # prepare isar-apt > - schroot -r -c ${session_id} -d / -u root -- sh -c " \ > - mkdir -p '/etc/apt/sources.list.d' > - echo 'deb [trusted=yes] file:///isar-apt ${DEBDISTRONAME} main' > \ > - '/etc/apt/sources.list.d/isar-apt.list' > - > - mkdir -p '/etc/apt/preferences.d' > - cat << EOF > '/etc/apt/preferences.d/isar-apt' > -Package: * > -Pin: release n=${DEBDISTRONAME} > -Pin-Priority: 1000 > -EOF" > - > E="${@ isar_export_proxies(d)}" > deb_dl_dir_import ${schroot_dir} ${distro} > schroot -r -c ${session_id} -d / -u root -- sh -c " \ Good catch! I assume this is just redundant but harmless code now, right? If not, it should better be folded into a v4 of my patch. Jan
On Friday, January 5, 2024 at 6:21:42 PM UTC+5:30 Jan Kiszka wrote: On 05.01.24 12:15, Srinuvasan Arjunan wrote: > From: Srinuvasan <srinuv...@siemens.com> > > Now isar-apt configured during sbuildchroot generation, hence remove the prepare > isar-apt part from the imager_run method. > > This changes depends on [1] > > [1]: https://groups.google.com/g/isar-users/c/k8ZNw3OkWLw > > Signed-off-by: Srinuvasan <srinuv...@siemens.com> > --- > meta/classes/image-tools-extension.bbclass | 13 ------------- > 1 file changed, 13 deletions(-) > > diff --git a/meta/classes/image-tools-extension.bbclass b/meta/classes/image-tools-extension.bbclass > index 58799fcf..46bdf78b 100644 > --- a/meta/classes/image-tools-extension.bbclass > +++ b/meta/classes/image-tools-extension.bbclass > @@ -44,19 +44,6 @@ imager_run() { > distro="${HOST_BASE_DISTRO}-${BASE_DISTRO_CODENAME}" > fi > > - # prepare isar-apt > - schroot -r -c ${session_id} -d / -u root -- sh -c " \ > - mkdir -p '/etc/apt/sources.list.d' > - echo 'deb [trusted=yes] file:///isar-apt ${DEBDISTRONAME} main' > \ > - '/etc/apt/sources.list.d/isar-apt.list' > - > - mkdir -p '/etc/apt/preferences.d' > - cat << EOF > '/etc/apt/preferences.d/isar-apt' > -Package: * > -Pin: release n=${DEBDISTRONAME} > -Pin-Priority: 1000 > -EOF" > - > E="${@ isar_export_proxies(d)}" > deb_dl_dir_import ${schroot_dir} ${distro} > schroot -r -c ${session_id} -d / -u root -- sh -c " \ Good catch! I assume this is just redundant but harmless code now, right? If not, it should better be folded into a v4 of my patch. Jan
diff --git a/meta/classes/image-tools-extension.bbclass b/meta/classes/image-tools-extension.bbclass index 58799fcf..46bdf78b 100644 --- a/meta/classes/image-tools-extension.bbclass +++ b/meta/classes/image-tools-extension.bbclass @@ -44,19 +44,6 @@ imager_run() { distro="${HOST_BASE_DISTRO}-${BASE_DISTRO_CODENAME}" fi - # prepare isar-apt - schroot -r -c ${session_id} -d / -u root -- sh -c " \ - mkdir -p '/etc/apt/sources.list.d' - echo 'deb [trusted=yes] file:///isar-apt ${DEBDISTRONAME} main' > \ - '/etc/apt/sources.list.d/isar-apt.list' - - mkdir -p '/etc/apt/preferences.d' - cat << EOF > '/etc/apt/preferences.d/isar-apt' -Package: * -Pin: release n=${DEBDISTRONAME} -Pin-Priority: 1000 -EOF" - E="${@ isar_export_proxies(d)}" deb_dl_dir_import ${schroot_dir} ${distro} schroot -r -c ${session_id} -d / -u root -- sh -c " \