diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /sys-apps/hwsetup | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
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 <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sys-apps/hwsetup')
-rw-r--r-- | sys-apps/hwsetup/Manifest | 1 | ||||
-rw-r--r-- | sys-apps/hwsetup/files/1.2-3-fastprobe.patch | 74 | ||||
-rw-r--r-- | sys-apps/hwsetup/files/1.2-7-dyn_blacklist.patch | 62 | ||||
-rw-r--r-- | sys-apps/hwsetup/files/1.2-7-gentoo.patch | 20 | ||||
-rw-r--r-- | sys-apps/hwsetup/files/1.2-7-openchrome.patch | 11 | ||||
-rw-r--r-- | sys-apps/hwsetup/files/1.2-strip.patch | 11 | ||||
-rw-r--r-- | sys-apps/hwsetup/hwsetup-1.2-r3.ebuild | 70 | ||||
-rw-r--r-- | sys-apps/hwsetup/metadata.xml | 5 |
8 files changed, 254 insertions, 0 deletions
diff --git a/sys-apps/hwsetup/Manifest b/sys-apps/hwsetup/Manifest new file mode 100644 index 000000000000..f38729f843fb --- /dev/null +++ b/sys-apps/hwsetup/Manifest @@ -0,0 +1 @@ +DIST hwsetup_1.2-7.tar.gz 10706 SHA256 aa72b37ce306b5191cabd31eb5f19ab2a5e635697a263c6735d10c7bf99f9589 SHA512 ef252c748ecf1fc17d107fa413a76df5d9daab84b10eb1ca2c5c320207e0be522c4ae6204c1c85c613403e40312c9c876bcab04eeaa1a2e1724b7bb1c6d41a1e WHIRLPOOL 083111b1aa8d3fd547b25fe16fcf10929ed65effbdf5d566a18d652ee339392c335d93d8605e9b52aa9403da9e9c6a2c209f6f317f8e25f218487f867e25184c diff --git a/sys-apps/hwsetup/files/1.2-3-fastprobe.patch b/sys-apps/hwsetup/files/1.2-3-fastprobe.patch new file mode 100644 index 000000000000..600b8c4002d6 --- /dev/null +++ b/sys-apps/hwsetup/files/1.2-3-fastprobe.patch @@ -0,0 +1,74 @@ +--- a/hwsetup.c ++++ b/hwsetup.c +@@ -140,14 +140,15 @@ + + int syntax(char *option) + { +- printf(VERSION); ++ puts(VERSION); + if(option) fprintf(stderr,"hwsetup: Unknown option '%s'\n\n",option); +- printf("Usage: hwsetup\n" +- " -v be verbose\n" +- " -p print rotating prompt\n" +- " -a ignore audio devices\n" +- " -s ignore scsi controllers\n" +- " -n probe only, don't configure anything.\n"); ++ puts("Usage: hwsetup\n" ++ "\t\t-v\tbe verbose\n" ++ "\t\t-p\tprint rotating prompt\n" ++ "\t\t-a\tignore audio devices\n" ++ "\t\t-s\tignore scsi controllers\n" ++ "\t\t-n\tprobe only, don't configure anything.\n" ++ "\t\t-f\trun a fast probe."); + return option?1:0; + } + +@@ -425,7 +426,7 @@ + { + signal(SIGALRM,SIG_IGN); + fprintf(stderr,"\nWARNING: Autodetection seems to hang,\n" +- "please check your computers BIOS settings.\n"); ++ "please check your computer's BIOS settings.\n"); + fflush(stderr); + if(wpid) { kill(wpid,SIGTERM); usleep(2500000); kill(wpid,SIGKILL); wpid=0; } + exit(1); /* exit program */ +@@ -591,12 +592,13 @@ + return 0; + } + +-int hw_setup(enum deviceClass dc, int verbose, int probeonly, int skip) ++int hw_setup(enum deviceClass dc, int verbose, int probeonly, int skip, int fastprobe) + { + int i,mouse=0,cdrom=0,modem=0,scanner=0; ++ int probeopt=fastprobe?PROBE_SAFE:PROBE_ALL; + struct device **currentDevs, *d, *serialmouse=NULL, *usbmouse=NULL; + if(verbose&VERBOSE_PROMPT) wpid=startwheel(); +- currentDevs=probeDevices(dc,BUS_UNSPEC,PROBE_ALL); ++ currentDevs=probeDevices(dc,BUS_UNSPEC,probeopt); + if(verbose&VERBOSE_PROMPT&&wpid>0) { kill(wpid,SIGTERM); wpid=0; usleep(160000); write(2,"\033[0m Done.\n",11); } + if(currentDevs==NULL) return -1; + check_proc_modules(); /* Get currently loaded module list */ +@@ -650,7 +652,7 @@ + + int main(int argc, char **argv) + { +- int i, verbose=0, probeonly=0, skip=0; ++ int i, verbose=0, probeonly=0, skip=0, fast=0; + enum deviceClass dc=CLASS_UNSPEC; + for(i=1;i<argc;i++) + { +@@ -659,6 +661,7 @@ + else if(!strcasecmp(argv[i],"-a")) skip|=SKIP_AUDIO; + else if(!strcasecmp(argv[i],"-s")) skip|=SKIP_SCSI; + else if(!strcasecmp(argv[i],"-n")) probeonly=1; ++ else if(!strcasecmp(argv[i],"-f")) fast=1; + else return syntax(argv[i]); + } + /* Allow SIGTERM, SIGINT: rmmod depends on this. */ +@@ -667,5 +670,5 @@ + #ifdef BLACKLIST + gen_blacklist(); + #endif +- return hw_setup(dc,verbose,probeonly,skip); ++ return hw_setup(dc,verbose,probeonly,skip,fast); + } diff --git a/sys-apps/hwsetup/files/1.2-7-dyn_blacklist.patch b/sys-apps/hwsetup/files/1.2-7-dyn_blacklist.patch new file mode 100644 index 000000000000..efbe0f6abfed --- /dev/null +++ b/sys-apps/hwsetup/files/1.2-7-dyn_blacklist.patch @@ -0,0 +1,62 @@ +--- a/hwsetup.c ++++ b/hwsetup.c +@@ -51,13 +51,40 @@ + /* Do not, under any circumstances, load these modules automatically, */ + /* even if in pcitable. (libkudzu may ignore this, and the KNOPPIX */ + /* autoconfig scripts may probe them, too) */ +-char *blacklist[] = ++char *blacklist[200][200] = + { "apm","agpgart","yenta_socket","i82092","i82365","tcic", + "pcmcia_core","ds","ohci1394","hisax", "hisax_fcpcipnp", + "hisax_isac","hisax_st5481", + /* Winmodems, unusable, can block sound slot */ + "snd-atiixp-modem", "snd-intel8x0m","snd-via82xx-modem" + }; ++ ++int blacklistsize = 13; ++void gen_blacklist(){ ++ int n = 13; ++ int size = 0; ++ char *comment; ++ char module[1024]; ++ FILE *stream; ++ ++ if((stream = fopen ("/usr/share/hwdata/blacklist", "r")) != (FILE *)0) { ++ while((fgets(module, 1023, stream)) != (char *)0 ) { ++ ++ comment = strchr(module, '#'); ++ if (comment != 0) *comment = '\0'; ++ comment = strchr(module, '\n'); ++ if (comment != 0) *comment = '\0'; ++ size = strlen(module); ++ if (size < 2) continue; ++ strcat (module , " \0"); ++ strcpy(blacklist[n] , module); ++ n++; ++ if ( n == 200 ) break; ++ //printf(module); ++ } ++ blacklistsize = n; ++ } ++} + #endif + + /* If a conflicting module in a row is already loaded, the new module will not be probed anymore */ +@@ -547,7 +574,7 @@ + char *cc; + if((m==NULL)||(!strcmp("unknown",m))||(!strcmp("ignore",m))|| check_loaded(m)) return 0; + #ifdef BLACKLIST +- for(i=0;i<(sizeof(blacklist)/sizeof(char*));i++) ++ for(i=0;i<blacklistsize;i++) + { + if(!modcmp(blacklist[i],m)) + { +@@ -781,5 +808,8 @@ + /* Allow SIGTERM, SIGINT: rmmod depends on this. */ + signal(SIGTERM,SIG_DFL); signal(SIGINT,SIG_DFL); + signal(SIGALRM,alarm_handler); alarm(MAX_TIME); ++#ifdef BLACKLIST ++ gen_blacklist(); ++#endif + return hw_setup(dc,verbose,probeonly,skip); + } diff --git a/sys-apps/hwsetup/files/1.2-7-gentoo.patch b/sys-apps/hwsetup/files/1.2-7-gentoo.patch new file mode 100644 index 000000000000..e4fc590393fd --- /dev/null +++ b/sys-apps/hwsetup/files/1.2-7-gentoo.patch @@ -0,0 +1,20 @@ +--- a/hwsetup.c ++++ b/hwsetup.c +@@ -388,7 +388,7 @@ + sprintf(fullpath,"%.90s%.32s",xpath,server[i]); + if(!exists(fullpath)) continue; + strncpy(xi.xserver,server[i],sizeof(xi.xserver)); +- } ++ } + } + } + if((xpos=strstr(d->driver,xorg))!=NULL) /* Check for Xorg */ +@@ -653,7 +653,7 @@ + int writeconfig(char *name,struct device *d,int verbose) + { + FILE *f,*k; +- const char *kconfig="/etc/sysconfig/knoppix"; ++ const char *kconfig="/etc/sysconfig/gentoo"; + char *desc; + unlink(name); + if((f=fopen(name,"w"))==NULL) diff --git a/sys-apps/hwsetup/files/1.2-7-openchrome.patch b/sys-apps/hwsetup/files/1.2-7-openchrome.patch new file mode 100644 index 000000000000..fb80f9dfcb1a --- /dev/null +++ b/sys-apps/hwsetup/files/1.2-7-openchrome.patch @@ -0,0 +1,11 @@ +--- a/hwsetup.c ++++ b/hwsetup.c +@@ -456,7 +456,7 @@ + else if(strcasestr(xi.xdesc,"Newport")) strcpy(xi.xmodule,"newport"); + else if(strcasestr(xi.xdesc,"Siliconmotion")||strcasestr(xi.xdesc,"Silicon Motion")) strcpy(xi.xmodule,"siliconmotion"); + else if(strcasestr(xi.xdesc,"Chips")) strcpy(xi.xmodule,"chips"); +- else if(strcasestr(xi.xdesc,"VIA ")) strcpy(xi.xmodule,"via"); ++ else if(strcasestr(xi.xdesc,"VIA ")) strcpy(xi.xmodule,"openchrome"); + } + else strcpy(xi.xmodule,xvesa4); + } diff --git a/sys-apps/hwsetup/files/1.2-strip.patch b/sys-apps/hwsetup/files/1.2-strip.patch new file mode 100644 index 000000000000..17de636a5dc7 --- /dev/null +++ b/sys-apps/hwsetup/files/1.2-strip.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -3,7 +3,7 @@ + # define BLACKLIST to avoid loading potentially dangerous modules + CFLAGS=-DBLACKLIST -Wall -fPIC + OPT=-O2 +-LDFLAGS=-s ++#LDFLAGS=-s + LIBS=-lkudzu -lpci + CC=gcc + diff --git a/sys-apps/hwsetup/hwsetup-1.2-r3.ebuild b/sys-apps/hwsetup/hwsetup-1.2-r3.ebuild new file mode 100644 index 000000000000..4891f16ea17b --- /dev/null +++ b/sys-apps/hwsetup/hwsetup-1.2-r3.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils toolchain-funcs flag-o-matic + +MY_PV=${PV}-7 +DESCRIPTION="Hardware setup program from Knoppix - used only on LiveCD" +HOMEPAGE="http://www.knopper.net/" +SRC_URI="http://debian-knoppix.alioth.debian.org/sources/${PN}_${MY_PV}.tar.gz" +#http://developer.linuxtag.net/knoppix/sources/${PN}_${MY_PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 hppa ia64 -mips ppc ppc64 sparc x86" +IUSE="zlib" + +COMMON_DEPEND=" + sys-apps/pciutils[zlib?] + zlib? ( sys-libs/zlib ) +" +DEPEND=" + ${COMMON_DEPEND} + sys-libs/libkudzu +" +RDEPEND=" + ${COMMON_DEPEND} + sys-apps/hwdata-gentoo +" + +pkg_setup() { + ewarn "This package is designed for use on the LiveCD only and will do " + ewarn "unspeakably horrible and unexpected things on a normal system." + ewarn "YOU HAVE BEEN WARNED!!!" +} + +src_prepare() { + epatch \ + "${FILESDIR}"/${MY_PV}-dyn_blacklist.patch \ + "${FILESDIR}"/${PV}-3-fastprobe.patch \ + "${FILESDIR}"/${MY_PV}-gentoo.patch \ + "${FILESDIR}"/${PV}-strip.patch \ + "${FILESDIR}"/${MY_PV}-openchrome.patch +} + +src_configure() { + if use zlib ; then + sed -i \ + -e '/^LIBS=/s,-lpci,-lz -lpci,g' \ + Makefile + fi +} + +src_compile() { + emake LDFLAGS="${LDFLAGS}" OPT="${CFLAGS}" CC="$(tc-getCC)" +} + +src_install() { + emake DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man + dosbin ${PN} + keepdir /etc/sysconfig +} + +pkg_postinst() { + ewarn "This package is intended for use on the Gentoo release media. If" + ewarn "you are not building a CD, remove this package. It will not work" + ewarn "properly on a running system, as Gentoo does not use any of the" + ewarn "Knoppix-style detection except for CD builds." +} diff --git a/sys-apps/hwsetup/metadata.xml b/sys-apps/hwsetup/metadata.xml new file mode 100644 index 000000000000..88653ddd7172 --- /dev/null +++ b/sys-apps/hwsetup/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>livecd</herd> +</pkgmetadata> |