From: Jan Kiszka <jan.kiszka@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Cc: Uladzimir Bely <ubely@ilbers.de>
Subject: [PATCH] dpkg: Align apt configuration of devshell with build
Date: Wed, 11 Jan 2023 22:27:49 +0100 [thread overview]
Message-ID: <5e1b8d0a-7394-40f5-db29-2a0dedba5717@siemens.com> (raw)
From: Jan Kiszka <jan.kiszka@siemens.com>
That was missing in e9bdd210c43c and 8e524d6787e2.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
meta/classes/dpkg-base.bbclass | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass
index 61bf48ef..05fd0650 100644
--- a/meta/classes/dpkg-base.bbclass
+++ b/meta/classes/dpkg-base.bbclass
@@ -292,6 +292,7 @@ python do_devshell() {
pkg_arch = d.getVar('PACKAGE_ARCH', True)
build_arch = d.getVar('SBUILD_HOST_ARCH', True)
pp_pps = os.path.join(d.getVar('PP'), d.getVar('PPS'))
+ debdistroname = d.getVar('DEBDISTRONAME')
install_deps = ":" if d.getVar('BB_CURRENTTASK') == "devshell_nodeps" else f"mk-build-deps -i \
--host-arch {pkg_arch} --build-arch {build_arch} \
@@ -301,12 +302,14 @@ python do_devshell() {
termcmd = "schroot -d / -c {0} -u root -- sh -c ' \
cd {1}; \
echo {2} > /etc/apt/sources.list.d/isar_apt.list; \
+ echo \"Package: *\nPin: release n={3}\nPin-Priority: 1000\" > /etc/apt/preferences.d/isar-apt; \
+ echo \"APT::Get::allow-downgrades 1;\" > /etc/apt/apt.conf.d/50isar-apt; \
apt-get -y -q update; \
- {3}; \
+ {4}; \
export PATH=$PATH_PREPEND:$PATH; \
$SHELL -i \
'"
- oe_terminal(termcmd.format(schroot, pp_pps, isar_apt, install_deps), "Isar devshell", d)
+ oe_terminal(termcmd.format(schroot, pp_pps, isar_apt, debdistroname, install_deps), "Isar devshell", d)
bb.build.exec_func('schroot_delete_configs', d)
}
--
2.35.3
next reply other threads:[~2023-01-11 21:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-11 21:27 Jan Kiszka [this message]
2023-01-25 7:19 ` Uladzimir Bely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5e1b8d0a-7394-40f5-db29-2a0dedba5717@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=isar-users@googlegroups.com \
--cc=ubely@ilbers.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox