From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- sys-libs/libkudzu/Manifest | 1 + .../libkudzu/files/kudzu-1.2.57.1-sbusfix.patch | 72 ++++++++ .../files/kudzu-1.2.57.1-sparc-keyboard.patch | 195 +++++++++++++++++++++ sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild | 62 +++++++ sys-libs/libkudzu/metadata.xml | 5 + 5 files changed, 335 insertions(+) create mode 100644 sys-libs/libkudzu/Manifest create mode 100644 sys-libs/libkudzu/files/kudzu-1.2.57.1-sbusfix.patch create mode 100644 sys-libs/libkudzu/files/kudzu-1.2.57.1-sparc-keyboard.patch create mode 100644 sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild create mode 100644 sys-libs/libkudzu/metadata.xml (limited to 'sys-libs/libkudzu') diff --git a/sys-libs/libkudzu/Manifest b/sys-libs/libkudzu/Manifest new file mode 100644 index 000000000000..c4bac3a3a1b9 --- /dev/null +++ b/sys-libs/libkudzu/Manifest @@ -0,0 +1 @@ +DIST kudzu-1.2.57.1.tar.gz 165855 SHA256 436a3fe44eb906155b954c85887c15d2d9e7ee5107641437443db8997b300687 SHA512 799e7cea840b7495fc007f4e34adc50fecd2fa7ceda2e2779e39639d0b93b10419bd44a0eb910b2e47024a49a4376330653a6fd96e5560c4828d55e18ab5d641 WHIRLPOOL dbed78dbcde3d73627c7950f9a6b8ee96fed0f7585b936b4ec3fe0839472546e64c81b4b65f0eabec95a00c13741090dd10d1b473c4254bfadebaf2c5479a804 diff --git a/sys-libs/libkudzu/files/kudzu-1.2.57.1-sbusfix.patch b/sys-libs/libkudzu/files/kudzu-1.2.57.1-sbusfix.patch new file mode 100644 index 000000000000..5c186ed631da --- /dev/null +++ b/sys-libs/libkudzu/files/kudzu-1.2.57.1-sbusfix.patch @@ -0,0 +1,72 @@ +--- a/sbus.c ++++ b/sbus.c +@@ -162,6 +162,7 @@ + devClass = CLASS_NETWORK; + } else if (!strcmp(prop, "le")) { + type = "Sun Lance Ethernet"; ++ module = "sunlance"; + devClass = CLASS_NETWORK; + } else if (!strcmp(prop, "qe")) { + prop = prom_getproperty("channel#", &len); +@@ -206,9 +207,11 @@ + devClass = CLASS_SCSI; + } else if (!strcmp(prop, "esp")) { + type = "Sun Enhanced SCSI Processor (ESP)"; ++ module = "esp"; + devClass = CLASS_SCSI; + } else if (!strcmp(prop, "fas")) { + type = "Sun Swift (ESP)"; ++ module = "esp"; + devClass = CLASS_SCSI; + } else if (!strcmp(prop, "ptisp")) { + type = "Performance Technologies ISP"; +@@ -232,19 +235,19 @@ + while ((*prop >= 'A' && *prop <= 'Z') || *prop == ',') + if (*prop++ == ',') break; + if (!strcmp(prop, "audio")) { +- type = "AMD7930"; +- module = "amd7930"; ++ type = "Sun|AMD7930"; ++ module = "snd-sun-amd7930"; + devClass = CLASS_AUDIO; + } else if (!strcmp(prop, "CS4231")) { + if (ebus) +- type = "CS4231 EB2 DMA (PCI)"; ++ type = "Sun|CS4231 EB2 DMA (PCI)"; + else +- type = "CS4231 APC DMA (SBUS)"; +- module = "cs4231"; ++ type = "Sun|CS4231 APC DMA (SBUS)"; ++ module = "snd-sun-cs4231"; + devClass = CLASS_AUDIO; + } else if (!strcmp(prop, "DBRIe")) { +- type = "SS10/SS20 DBRI"; +- module = "dbri"; ++ type = "Sun|SS10/SS20 DBRI"; ++ module = "snd-sun-dbri"; + devClass = CLASS_AUDIO; + } + prop = prom_getproperty("device_type", &len); +@@ -452,22 +455,6 @@ + + struct device *sbusProbe( enum deviceClass probeClass, int probeFlags, + struct device *devlist) { +- if (probeClass & CLASS_MOUSE) { +- int fd; +- struct sbusDevice *mousedev; +- +- if ((fd = open("/dev/sunmouse", O_RDONLY)) != -1) { +- /* FIXME: Should probably talk to the mouse to see +- if the connector is not empty. */ +- close (fd); +- mousedev = sbusNewDevice(NULL); +- mousedev->type = CLASS_MOUSE; +- mousedev->device = strdup("sunmouse"); +- mousedev->desc = strdup("Sun Mouse"); +- mousedev->next = devlist; +- devlist = (struct device *)mousedev; +- } +- } + if ( + (probeClass & CLASS_OTHER) || + (probeClass & CLASS_NETWORK) || diff --git a/sys-libs/libkudzu/files/kudzu-1.2.57.1-sparc-keyboard.patch b/sys-libs/libkudzu/files/kudzu-1.2.57.1-sparc-keyboard.patch new file mode 100644 index 000000000000..5626a357345d --- /dev/null +++ b/sys-libs/libkudzu/files/kudzu-1.2.57.1-sparc-keyboard.patch @@ -0,0 +1,195 @@ +--- a/keyboard.c ++++ b/keyboard.c +@@ -21,7 +21,6 @@ + #include "keyboard.h" + + #ifdef __sparc__ +-#include + #include + #include + #endif +@@ -96,7 +95,15 @@ + {0, 0} + }; + +-#if !defined(__s390__) && !defined(__s390x__) ++#if defined(__sparc__) ++static int termcmp(struct termios *a, struct termios *b) ++{ ++ if (a->c_iflag != b->c_iflag || a->c_oflag != b->c_oflag || ++ a->c_cflag != b->c_cflag || a->c_lflag != b->c_lflag) ++ return 1; ++ return memcmp(a->c_cc, b->c_cc, sizeof(a->c_cc)); ++} ++#elif !defined(__s390__) && !defined(__s390x__) + static int termcmp(struct termios *a, struct termios *b) + { + if (a->c_iflag != b->c_iflag || a->c_oflag != b->c_oflag || +@@ -110,150 +117,6 @@ + struct device *keyboardProbe(enum deviceClass probeClass, int probeFlags, + struct device *devlist) + { +-#ifdef __sparc__ +- int fd; +- char buf[256]; +- struct keyboardDevice *kbddev; +- +- if (probeClass & CLASS_KEYBOARD) { +- static struct { +- int layout0, layout1, layout2; +- char *symbols; +- int use_iso9995_3; +- } sunkbd_translate[] = { +- { 0, 33, 80, "", 0, }, +- { 1, 34, 81, "", 0, }, +- { 2, -1, -1, "fr_BE", 0, }, +- { 3, -1, -1, "ca", 0, }, +- { 4, 36, 83, "dk", 1, }, +- { 5, 37, 84, "de", 1, }, +- { 6, 38, 85, "it", 1, }, +- { 7, 39, 86, "nl", 0, }, +- { 8, 40, 87, "no", 1, }, +- { 9, 41, 88, "pt", 1, }, +- { 10, 42, 89, "es", 1, }, +- { 11, 43, 90, "se", 1, }, +- { 12, 44, 91, "fr_CH",1, }, +- { 13, 45, 92, "de_CH",1, }, +- { 14, 46, 93, "gb", 1, }, +- { 16, 47, 94, "ko", 0, }, +- { 17, 48, 95, "tw", 0, }, +- { 32, 49, 96, "jp", 0, }, +- { 50, 97, -1, "fr_CA",0, }, +- { 51, -1, -1, "hu", 0, }, +- { 52, -1, -1, "pl", 0, }, +- { 53, -1, -1, "cs", 0, }, +- { 54, -1, -1, "ru", 0, }, +- { -1, -1, -1, NULL, 0, } +- }; +- +- char twelve = 12; +- int fdstd = 0; +- char buf[4096]; +- +- for (fd = 0; fd <= 2; fd++) { +- sprintf (buf, "/proc/self/fd/%d", fd); +- if (readlink (buf, buf, 4096) == 12 && +- !strncmp (buf, "/dev/console", 12)) { +- fdstd = 1; +- break; +- } +- } +- if (!fdstd) { +- fd = open("/dev/console", O_RDWR); +- if (fd < 0) return devlist; +- } +- +- kbddev=keyboardNewDevice(NULL); +- kbddev->type=CLASS_KEYBOARD; +- if (devlist) +- kbddev->next = devlist; +- devlist = (struct device *) kbddev; +- +- if (ioctl (fd, TIOCLINUX, &twelve) < 0) { +- /* Serial console */ +- char desc[64]; +- struct serial_struct si; +- int line = 0; +- +- if (ioctl (fd, TIOCGSERIAL, &si) >= 0) { +- if (si.line & 1) +- /* ttyb */ +- line = 1; +- } +- if (!fdstd) close(fd); +- sprintf (desc, "Serial console tty%c", line + 'a'); +- fd = open("/dev/openprom", O_RDONLY); +- if (fd >= 0) { +- struct openpromio *op = (struct openpromio *)buf; +- sprintf (op->oprom_array, "tty%c-mode", line + 'a'); +- op->oprom_size = 4096-128-4; +- if (ioctl (fd, OPROMGETOPT, op) >= 0 && +- op->oprom_size > 0 && op->oprom_size < 40) { +- strcat (desc, " "); +- op->oprom_array [op->oprom_size] = 0; +- strcat (desc, op->oprom_array); +- } +- close (fd); +- } +- kbddev->desc=strdup(desc); +- kbddev->device=strdup("console"); +- return devlist; +- } +- +- if (!fdstd) close(fd); +- fd=open("/dev/kbd", O_RDWR); +- if (fd < 0) { +- /* PS/2 keyboard */ +- kbddev->desc=strdup("Generic PS/2 Keyboard"); +- } else { +- /* Sun keyboard */ +- int kbdtype, kbdlayout, i; +- char *desc, *desclayout = NULL; +- +- kbddev->device=strdup("kbd"); +- desc = "Sun Type4 "; +- if (ioctl(fd, KIOCTYPE, &kbdtype) >= 0) +- switch (kbdtype) { +- case 2: desc = "Sun Type2 "; break; +- case 3: desc = "Sun Type3 "; break; +- case 4: ioctl(fd, KIOCLAYOUT, &kbdlayout); +- if (kbdlayout < 33) +- desc = "Sun Type4 "; +- else switch (kbdlayout) { +- case 33: case 47: case 48: case 49: +- case 80: case 94: case 95: case 96: +- desc = "Sun Type5 "; break; +- case 34: case 81: +- desc = "Sun Type5 Unix "; break; +- default: +- desc = "Sun Type5 Euro "; break; +- } +- for (i = 0; sunkbd_translate[i].layout0 != -1; i++) { +- if (sunkbd_translate[i].layout0 == kbdlayout || +- sunkbd_translate[i].layout1 == kbdlayout || +- sunkbd_translate[i].layout2 == kbdlayout) +- break; +- } +- if (sunkbd_translate[i].layout0 != -1 && +- sunkbd_translate[i].symbols[0]) +- desclayout = sunkbd_translate[i].symbols; +- break; +- } +- if (desclayout) { +- kbddev->desc = malloc(strlen(desc) + strlen(desclayout) + 1 + strlen("Keyboard") + 1); +- strcpy (kbddev->desc, desc); +- strcat (kbddev->desc, desclayout); +- strcat (kbddev->desc, " Keyboard"); +- } else { +- kbddev->desc = malloc(strlen(desc) + strlen("Keyboard") + 1); +- strcpy (kbddev->desc, desc); +- strcat (kbddev->desc, "Keyboard"); +- } +- } +- close (fd); +- } +-#else + int fd; + char twelve = 12; + int fdstd = 0; +@@ -311,7 +174,7 @@ + kbddev->device = strdup("ttySG0"); + } + #endif +-#if defined(__i386__) || defined(__x86_64__) || defined(__ia64__) ++#if defined(__i386__) || defined(__x86_64__) || defined(__ia64__) || defined(__sparc__) + int cfd; + struct termios cmode, mode; + +@@ -397,7 +260,6 @@ + kbddev->device=strdup(desc); + } + } +-#endif + out: + return devlist; + } diff --git a/sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild b/sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild new file mode 100644 index 000000000000..c5b159bc1773 --- /dev/null +++ b/sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils linux-info flag-o-matic toolchain-funcs + +DESCRIPTION="Red Hat Hardware detection tools" +HOMEPAGE="http://rhlinux.redhat.com/kudzu/" +SRC_URI="mirror://gentoo/kudzu-${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 hppa ia64 -mips ppc ppc64 sparc x86" +IUSE="zlib" + +DEPEND=" + dev-libs/popt + >=sys-apps/pciutils-2.2.4[zlib?] + zlib? ( sys-libs/zlib ) +" +RDEPEND=" + ${DEPEND} + sys-apps/hwdata-gentoo + !sys-apps/kudzu +" + +S=${WORKDIR}/kudzu-${PV} + +src_prepare() { + epatch \ + "${FILESDIR}"/kudzu-${PV}-sbusfix.patch \ + "${FILESDIR}"/kudzu-${PV}-sparc-keyboard.patch +} + +src_configure() { + if use zlib; then + sed -i -e 's| -lpci| -lz -lpci|g' Makefile || die + fi + # Fix the modules directory to match Gentoo layout. + sed -i -e 's|/etc/modutils/kudzu|/etc/modules.d/kudzu|g' *.* || die + + tc-export CC +} + +src_compile() { + emake \ + $( usex ppc ARCH='ppc' ARCH=$(tc-arch-kernel) ) \ + AR=$(tc-getAR) \ + RANLIB=$(tc-getRANLIB) \ + RPM_OPT_FLAGS="${CFLAGS}" \ + libkudzu.a libkudzu_loader.a +} + +src_install() { + insinto /usr/include/kudzu + doins *.h + + dolib.a libkudzu.a libkudzu_loader.a + + keepdir /etc/sysconfig +} diff --git a/sys-libs/libkudzu/metadata.xml b/sys-libs/libkudzu/metadata.xml new file mode 100644 index 000000000000..88653ddd7172 --- /dev/null +++ b/sys-libs/libkudzu/metadata.xml @@ -0,0 +1,5 @@ + + + +livecd + -- cgit v1.2.3-65-gdbad