[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#752410: marked as done (libdebian-installer: ppc64el support)



Your message dated Tue, 26 Aug 2014 19:57:45 +0200
with message-id <20140826175745.GI15914@hall.aurel32.net>
and subject line Re: Bug#752410: libdebian-installer: ppc64el support
has caused the Debian Bug report #752410,
regarding libdebian-installer: ppc64el support
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
752410: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752410
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: libdebian-installer
Version: 0.91
Severity: normal
Tags: patch
User: debian-powerpc@lists.debian.org
Usertags: ppc64el


Dear Maintainer,

here is a patch from Ubuntu for ppc64el support in libdebian-installer.

F.

-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: ppc64el (ppc64le)

Kernel: Linux 3.14-1-powerpc64le (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to en_US.UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru libdebian-installer-0.91/src/system/Makefile.am libdebian-installer-0.91/src/system/Makefile.am
--- libdebian-installer-0.91/src/system/Makefile.am	2013-12-28 08:51:24.000000000 +0000
+++ libdebian-installer-0.91/src/system/Makefile.am	2014-05-20 10:28:31.000000000 +0000
@@ -21,6 +21,7 @@
 	subarch-mips-linux.c \
 	subarch-mipsel-linux.c \
 	subarch-powerpc-linux.c \
+	subarch-ppc64el-linux.c \
 	subarch-sh4-linux.c \
 	subarch-sparc-linux.c \
 	subarch-x86-linux.c \
diff -Nru libdebian-installer-0.91/src/system/subarch-ppc64el-linux.c libdebian-installer-0.91/src/system/subarch-ppc64el-linux.c
--- libdebian-installer-0.91/src/system/subarch-ppc64el-linux.c	1970-01-01 00:00:00.000000000 +0000
+++ libdebian-installer-0.91/src/system/subarch-ppc64el-linux.c	2014-05-20 10:28:31.000000000 +0000
@@ -0,0 +1,92 @@
+#include <ctype.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <strings.h>
+
+#include <debian-installer/system/subarch.h>
+
+struct map {
+	char *entry;
+	char *ret;
+};
+
+static struct map map_generation[] = {
+	{ "OldWorld", "powermac_oldworld" },
+	{ "NewWorld", "powermac_newworld" },
+	{ "NuBus", "powermac_nubus" },
+	{ NULL, NULL }
+};
+
+static struct map map_machine[] = {
+	{ "PReP", "prep" },
+	{ "CHRP Pegasos", "chrp_pegasos" },
+	{ "EFIKA", "chrp_pegasos" },
+	{ "CHRP IBM", "chrp_rs6k" },
+	{ "CHRP", "chrp" },
+	{ "Amiga", "amiga" },
+	{ "64-bit iSeries Logical Partition", "iseries" },
+	{ NULL, NULL }
+};
+
+static struct map map_platform[] = {
+	{ "PS3", "ps3" },
+	{ "Cell", "cell" },
+	{ "PA Semi", "pasemi" },
+	{ "Maple", "chrp_ibm" },
+	{ "pSeries", "chrp_ibm" },
+	{ "P4080 DS", "fsl" },
+	{ "QEMU e500", "fsl" },
+	{ NULL, NULL }
+};
+
+static char *check_map(struct map map[], const char *entry)
+{
+	for (; map->entry; map++)
+		if (!strncasecmp(map->entry, entry, strlen(map->entry)))
+			return map->ret;
+
+	return NULL;
+}
+
+const char *di_system_subarch_analyze(void)
+{
+	FILE *cpuinfo;
+	char line[1024];
+	char cpuinfo_platform[256], cpuinfo_machine[256], cpuinfo_generation[256];
+	char *ret, *pos;
+
+	cpuinfo = fopen("/proc/cpuinfo", "r");
+	if (cpuinfo == NULL)
+		return "unknown";
+
+	while (fgets(line, sizeof(line), cpuinfo) != NULL) {
+		pos = strchr(line, ':');
+		if (pos == NULL)
+			continue;
+		while (*++pos && (*pos == '\t' || *pos == ' '));
+
+		if (strstr(line, "platform") == line)
+			strncpy(cpuinfo_platform, pos, sizeof(cpuinfo_platform));
+
+		if (strstr(line, "machine") == line)
+			strncpy(cpuinfo_machine, pos, sizeof(cpuinfo_machine));
+
+		if (strstr(line, "pmac-generation") == line)
+			strncpy(cpuinfo_generation, pos, sizeof(cpuinfo_generation));
+	}
+
+	fclose(cpuinfo);
+
+	ret = check_map(map_platform, cpuinfo_platform);
+	if (ret)
+		return ret;
+	ret = check_map(map_machine, cpuinfo_machine);
+	if (ret)
+		return ret;
+	ret = check_map(map_generation, cpuinfo_generation);
+	if (ret)
+		return ret;
+
+	return "unknown";
+}

--- End Message ---
--- Begin Message ---
Version: 0.95

On Tue, Aug 26, 2014 at 07:02:28PM +0200, Cyril Brulebois wrote:
> Ben Hutchings <ben@decadent.org.uk> (2014-08-25):
> > On Mon, 2014-08-25 at 14:11 -0300, Breno Leitao wrote:
> > > HI Ben,
> > > 
> > > Do you still have any feedback about the new patch?
> > 
> > I have no objections, but I am not a maintainer for this package so
> > it is not for me to apply.
> 
> I suppose I could blindly apply it, but I'd rather have someone else
> review it to make sure. Aurelien maybe?

Oh I fixed that in version 0.95, but I just realized I forgot to add a
closes entry in the changelog. Closing the bug with this mail

-- 
Aurelien Jarno                          GPG: 4096R/1DDD8C9B
aurelien@aurel32.net                 http://www.aurel32.net

--- End Message ---

Reply to: