emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support to switch arch via XBPS_TARGET_ARCH env var.

Browse Source
This commit is contained in:
Juan RP 2013-02-03 09:45:03 +01:00
parent 0812ef2c35
commit 90cde72283
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/initend.c
View File

@ -1,5 +1,5 @@
/*- /*-
* Copyright (c) 2011-2012 Juan Romero Pardines. * Copyright (c) 2011-2013 Juan Romero Pardines.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -165,6 +165,7 @@ xbps_init(struct xbps_handle *xhp)
struct utsname un; struct utsname un;
int rv, cc, cch; int rv, cc, cch;
bool syslog_enabled = false; bool syslog_enabled = false;
char *tarch;
assert(xhp != NULL); assert(xhp != NULL);
@ -244,9 +245,15 @@ xbps_init(struct xbps_handle *xhp)
return ENOMEM; return ENOMEM;
xhp->metadir = xhp->metadir_priv; xhp->metadir = xhp->metadir_priv;
uname(&un); /* Override target arch if XBPS_TARGET_ARCH is set in the environment */
xhp->un_machine = strdup(un.machine); tarch = getenv("XBPS_TARGET_ARCH");
assert(xhp->un_machine); if (tarch != NULL) {
xhp->un_machine = strdup(tarch);
} else {
uname(&un);
xhp->un_machine = strdup(un.machine);
assert(xhp->un_machine);
}
if (xhp->cfg == NULL) { if (xhp->cfg == NULL) {
xhp->flags |= XBPS_FLAG_SYSLOG; xhp->flags |= XBPS_FLAG_SYSLOG;