From 50ca9f6c7334da63aa416f9302d8cc242167ef04 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pj@pehjota.net>
Date: Fri, 04 Jul 2014 19:11:12 -0400
Subject: Add architecture to package control file names

Signed-off-by: P. J. McDermott <pj@pehjota.net>
---
(limited to 'libopkg/opkg_configure.c')

diff --git a/libopkg/opkg_configure.c b/libopkg/opkg_configure.c
index 169828d..90e9d50 100644
--- a/libopkg/opkg_configure.c
+++ b/libopkg/opkg_configure.c
@@ -15,6 +15,8 @@
    General Public License for more details.
 */
 
+#include "config.h"
+
 #include <stdio.h>
 
 #include "sprintf_alloc.h"
@@ -36,9 +38,17 @@ opkg_configure(pkg_t *pkg)
     err = pkg_run_script(pkg, "postinst", "configure");
     if (err) {
         if (!conf->offline_root)
+#ifdef HAVE_MULTIARCH
+	     opkg_msg(ERROR, "%s:%s.postinst returned %d.\n", pkg->name, pkg->architecture, err);
+#else
 	     opkg_msg(ERROR, "%s.postinst returned %d.\n", pkg->name, err);
+#endif
         else
+#ifdef HAVE_MULTIARCH
+	     opkg_msg(NOTICE, "%s:%s.postinst returned %d, marking as unpacked only, configuration required on target.\n", pkg->name, pkg->architecture, err);
+#else
 	     opkg_msg(NOTICE, "%s.postinst returned %d, marking as unpacked only, configuration required on target.\n", pkg->name, err);
+#endif
 	return err;
     }
 
--
cgit v0.9.1