libpakfire: Automatically detect system architecture

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index 282e768612ea40d2f0bed0a34b50844cfa9ca117..fa524580e20931319f694bec3b3af8e43660b909 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -258,6 +258,7 @@ libpakfire_la_SOURCES = \
        src/libpakfire/solution.c \
        src/libpakfire/solver.c \
        src/libpakfire/step.c \
+       src/libpakfire/system.c \
        src/libpakfire/transaction.c \
        src/libpakfire/util.c
 
@@ -285,6 +286,7 @@ pkginclude_HEADERS += \
        src/libpakfire/include/pakfire/solution.h \
        src/libpakfire/include/pakfire/solver.h \
        src/libpakfire/include/pakfire/step.h \
+       src/libpakfire/include/pakfire/system.h \
        src/libpakfire/include/pakfire/transaction.h \
        src/libpakfire/include/pakfire/types.h \
        src/libpakfire/include/pakfire/util.h

diff --git a/src/_pakfire/pakfire.c b/src/_pakfire/pakfire.c
index 2b45a07990556325d434437860693f2753588d4f..bdcc3a92b171ba6dda269227ba8ed26940c4b412 100644 (file)
--- a/src/_pakfire/pakfire.c
+++ b/src/_pakfire/pakfire.c
@@ -39,7 +39,7 @@ static int Pakfire_init(PakfireObject* self, PyObject* args, PyObject* kwds) {
        const char* path = NULL;
     const char* arch = NULL;
 
-       if (!PyArg_ParseTuple(args, "ss", &path, &arch))
+       if (!PyArg_ParseTuple(args, "s|s", &path, &arch))
                return -1;
 
     self->pakfire = pakfire_create(path, arch);

diff --git a/src/libpakfire/include/pakfire/system.h b/src/libpakfire/include/pakfire/system.h
new file mode 100644 (file)
index 0000000..d713714
--- /dev/null
+++ b/src/libpakfire/include/pakfire/system.h
@@ -0,0 +1,26 @@
+/*#############################################################################
+#                                                                             #
+# Pakfire - The IPFire package management system                              #
+# Copyright (C) 2017 Pakfire development team                                 #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+#############################################################################*/
+
+#ifndef PAKFIRE_SYSTEM_H
+#define PAKFIRE_SYSTEM_H
+
+const char* system_machine();
+
+#endif /* PAKFIRE_SYSTEM_H */

diff --git a/src/libpakfire/pakfire.c b/src/libpakfire/pakfire.c
index 3c38df96775835350adc936ef94e8b3c4eb5ce04..7552055ae75e263702001fd660256b73580cbc49 100644 (file)
--- a/src/libpakfire/pakfire.c
+++ b/src/libpakfire/pakfire.c
@@ -20,6 +20,7 @@
 
 #include <pakfire/pakfire.h>
 #include <pakfire/pool.h>
+#include <pakfire/system.h>
 #include <pakfire/types.h>
 #include <pakfire/util.h>
 
@@ -29,6 +30,9 @@ Pakfire pakfire_create(const char* path, const char* arch) {
                pakfire->nrefs = 1;
 
                pakfire->path = pakfire_strdup(path);
+               if (!arch) {
+                       arch = system_machine();
+               }
                pakfire->arch = pakfire_strdup(arch);
 
                // Initialize the pool

diff --git a/src/libpakfire/system.c b/src/libpakfire/system.c
new file mode 100644 (file)
index 0000000..cc0b9d2
--- /dev/null
+++ b/src/libpakfire/system.c
@@ -0,0 +1,42 @@
+/*#############################################################################
+#                                                                             #
+# Pakfire - The IPFire package management system                              #
+# Copyright (C) 2017 Pakfire development team                                 #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+#############################################################################*/
+
+#include <string.h>
+#include <sys/utsname.h>
+
+#include <pakfire/constants.h>
+#include <pakfire/system.h>
+#include <pakfire/util.h>
+
+const char* system_machine() {
+    static char __system_machine[STRING_SIZE] = "";
+
+    if (!*__system_machine) {
+        struct utsname buf;
+
+        int r = uname(&buf);
+        if (!r)
+            return NULL;
+
+        strncpy(__system_machine, buf.machine, sizeof(*__system_machine));
+    }
+
+    return __system_machine;
+}