[PATCH v3 1/2] dpkg: Add option --cross-bootstrap
If --cross-bootstrap is set, don't chroot into the target root
directory, but just export DPKG_INSTDIR for the execution of
maintscripts.
This is useful for Yocto/OpenEmbedded, where programs like
update-alternatives, update-rc.d or systemctl run natively or
emulated on the build system when creating the cross-compiled
root filesystem with apt-get.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
Changes since v2:
rebased
Changes since v1:
none
src/main.c | 3 +++
src/main.h | 1 +
src/script.c | 6 ++++--
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main.c b/src/main.c
index 03e328f..218816b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -135,6 +135,7 @@ usage(const struct cmdinfo *ci, const char *value)
" --admindir=<directory> Use <directory> instead of %s.\n"
" --root=<directory> Install on a different root directory.\n"
" --instdir=<directory> Change installation dir without changing admin dir.\n"
+" --cross-bootstrap Don't chroot into root directory for scripts.\n"
" --path-exclude=<pattern> Do not install paths which match a shell pattern.\n"
" --path-include=<pattern> Re-include a pattern after a previous exclusion.\n"
" -O|--selected-only Skip packages not selected for install/upgrade.\n"
@@ -185,6 +186,7 @@ static const char printforhelp[] = N_(
int f_pending=0, f_recursive=0, f_alsoselect=1, f_skipsame=0, f_noact=0;
int f_autodeconf=0, f_nodebsig=0;
int f_triggers = 0;
+int f_cross = 0;
int fc_downgrade=1, fc_configureany=0, fc_hold=0, fc_removereinstreq=0, fc_overwrite=0;
int fc_removeessential=0, fc_conflicts=0, fc_depends=0, fc_dependsversion=0;
int fc_breaks=0, fc_badpath=0, fc_overwritediverted=0, fc_architecture=0;
@@ -726,6 +728,7 @@ static const struct cmdinfo cmdinfos[]= {
{ "abort-after", 0, 1, &errabort, NULL, set_integer, 0 },
{ "admindir", 0, 1, NULL, &admindir, NULL, 0 },
{ "instdir", 0, 1, NULL, NULL, set_instdir, 0 },
+ { "cross-bootstrap", 0, 0, &f_cross, NULL, NULL, 1 },
{ "ignore-depends", 0, 1, NULL, NULL, set_ignore_depends, 0 },
{ "force", 0, 2, NULL, NULL, set_force, 1 },
{ "refuse", 0, 2, NULL, NULL, set_force, 0 },
diff --git a/src/main.h b/src/main.h
index d319af9..63f6878 100644
--- a/src/main.h
+++ b/src/main.h
@@ -133,6 +133,7 @@ extern const char *const statusstrings[];
extern int f_pending, f_recursive, f_alsoselect, f_skipsame, f_noact;
extern int f_autodeconf, f_nodebsig;
extern int f_triggers;
+extern int f_cross;
extern int fc_downgrade, fc_configureany, fc_hold, fc_removereinstreq, fc_overwrite;
extern int fc_removeessential, fc_conflicts, fc_depends, fc_dependsversion;
extern int fc_breaks, fc_badpath, fc_overwritediverted, fc_architecture;
diff --git a/src/script.c b/src/script.c
index 2f5ae86..a9f4555 100644
--- a/src/script.c
+++ b/src/script.c
@@ -105,8 +105,10 @@ maintscript_pre_exec(struct command *cmd)
if (setenv("DPKG_ADMINDIR", admindir + instdirl, 1) < 0)
ohshite(_("unable to setenv for subprocesses"));
- if (chroot(instdir))
+ if (!f_cross && chroot(instdir))
ohshite(_("failed to chroot to `%.250s'"), instdir);
+ if (setenv("DPKG_INSTDIR", f_cross ? instdir : "", 1) < 0)
+ ohshite(_("unable to setenv for subprocesses"));
}
/* Switch to a known good directory to give the maintainer script
* a saner environment, also needed after the chroot(). */
@@ -125,7 +127,7 @@ maintscript_pre_exec(struct command *cmd)
args.buf);
varbuf_destroy(&args);
}
- if (!instdirl)
+ if (f_cross || !instdirl)
return cmd->filename;
assert(strlen(cmd->filename) >= instdirl);
--
1.9.1
Reply to: