diff options
author | 2008-04-08 01:16:02 +0000 | |
---|---|---|
committer | 2008-04-08 01:16:02 +0000 | |
commit | 7fd8e86f15ea5b133e0fb64858c188dca411c2a0 (patch) | |
tree | 366ce2c77bf1de916dc7c7ee23c56a78fe77a8d9 | |
parent | New catalyst version for testing. (diff) | |
download | wolf31o2-7fd8e86f15ea5b133e0fb64858c188dca411c2a0.tar.gz wolf31o2-7fd8e86f15ea5b133e0fb64858c188dca411c2a0.tar.bz2 wolf31o2-7fd8e86f15ea5b133e0fb64858c188dca411c2a0.zip |
Adding hwsetup-1.2-r1 for testing.
svn path=/; revision=162
-rw-r--r-- | profiles/categories | 1 | ||||
-rw-r--r-- | sys-apps/hwsetup/ChangeLog | 222 | ||||
-rw-r--r-- | sys-apps/hwsetup/Manifest | 9 | ||||
-rw-r--r-- | sys-apps/hwsetup/files/hwsetup-1.2-dyn_blacklist.patch | 62 | ||||
-rw-r--r-- | sys-apps/hwsetup/files/hwsetup-1.2-fastprobe.patch | 75 | ||||
-rw-r--r-- | sys-apps/hwsetup/files/hwsetup-1.2-gentoo.patch | 41 | ||||
-rw-r--r-- | sys-apps/hwsetup/hwsetup-1.2-r1.ebuild | 56 | ||||
-rw-r--r-- | sys-apps/hwsetup/hwsetup-1.2.ebuild | 56 | ||||
-rw-r--r-- | sys-apps/hwsetup/metadata.xml | 5 |
9 files changed, 527 insertions, 0 deletions
diff --git a/profiles/categories b/profiles/categories index e1bd657..80b6549 100644 --- a/profiles/categories +++ b/profiles/categories @@ -8,4 +8,5 @@ games-strategy media-gfx media-libs net-misc +sys-apps sys-kernel diff --git a/sys-apps/hwsetup/ChangeLog b/sys-apps/hwsetup/ChangeLog new file mode 100644 index 0000000..f638865 --- /dev/null +++ b/sys-apps/hwsetup/ChangeLog @@ -0,0 +1,222 @@ +# ChangeLog for sys-apps/hwsetup +# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/ChangeLog,v 1.54 2008/04/03 00:27:01 wolf31o2 Exp $ + + 03 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.2.ebuild: + Added keepdir /etc/sysconfig for bug #215824. + + 11 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.2.ebuild: + After the latest fexes, we no longer require libkudzu to exist on our + running system with hwsetup. This should save us a little space on our + minimal CD. + + 07 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.2.ebuild: + Fix compilation when using --as-needed by filtering it, for now. + + 20 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.2.ebuild: + Removing USE=livecd since this package is now masked in the tree. + + 08 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.2.ebuild: + Added USE=livecd to skip the message displayed by hwsetup, since it isn't + necessary on a LiveCD build. + + 14 Aug 2007; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.2.ebuild: + Added a --missing false since not all versions of pciutils support the zlib + USE flag. This was reported to bug #188221 by Ă…smund Grammeltvedt + <asmundg@big-oil.org>. + + 22 Jun 2007; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.2.ebuild: + Modified the zlib linking to use USE=zlib and also check if + sys-apps/pciutils was built with zlib support or not. + + 19 Jun 2007; Chris Gianelloni <wolf31o2@gentoo.org> + -files/hwsetup-1.1-dyn_blacklist.patch, + -files/hwsetup-1.1-fastprobe.patch, -files/hwsetup-1.1-gentoo.patch, + -hwsetup-1.1.ebuild: + Removing older ebuilds and patches, since they're no longer needed. + + 31 Jan 2007; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.2.ebuild: + Added append-ldflags -lz for bug #160937. + +*hwsetup-1.2 (05 Jan 2007) + + 05 Jan 2007; Chris Gianelloni <wolf31o2@gentoo.org> + +files/hwsetup-1.2-dyn_blacklist.patch, + +files/hwsetup-1.2-fastprobe.patch, +files/hwsetup-1.2-gentoo.patch, + hwsetup-1.1.ebuild, +hwsetup-1.2.ebuild: + Version bump to 1.2, which should fix bug #159733 (at least, it works here + w/ sys-apps/pciutils-2.2.3-r2). + + 26 Aug 2006; Michael Sterrett <mr_bones_@gentoo.org> hwsetup-1.1.ebuild: + fix RDEPEND; touchups + + 25 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org> + files/hwsetup-1.1-gentoo.patch: + Make the Gentoo patch work correctly with modular X, now that it is all stable. + + 22 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.1.ebuild: + Make RDEPEND use the DEPEND variable, instead of repeating its contents. + + 31 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org> + files/hwsetup-1.1-gentoo.patch: + Updated patch to work properly for detecting cards. Thanks to Jochen Spang + <jochen.spang@freenet.de> for doing the work on finding this bug and + reporting it to me. + + 09 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.1.ebuild: + Removing dependency on hwdata-knoppix and closing bug #122248. + + 09 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.1.ebuild: + Changed DESCRIPTION in an attempt to keep users from installing this package + on their systems. + + 09 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.1.ebuild: + Added warning to postinst to let users know that this package is 100% + worthless on a live system and really is only used by the packages on the + Gentoo release media to perform autodetection. This package is useless if + you are not building an InstallCD or LiveCD. + + 08 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> + -files/hwsetup-1.0-alsa.patch, -files/hwsetup-1.0-dyn_blacklist.patch, + -files/hwsetup-1.0-fastprobe.patch, -files/hwsetup-1.0-gentoo.patch, + -hwsetup-1.0-r3.ebuild: + Cleaning out older versions. + + 08 Feb 2006; Aron Griffis <agriffis@gentoo.org> hwsetup-1.1.ebuild: + Mark 1.1 stable on alpha + + 07 Feb 2006; Aron Griffis <agriffis@gentoo.org> hwsetup-1.1.ebuild: + Mark 1.1 stable on ia64 + + 06 Jan 2006; Stephanie Lockwood-Childs <wormo@gentoo.org> + hwsetup-1.1.ebuild: + stable on ppc (bug #117911) + + 06 Jan 2006; Gustavo Zacarias <gustavoz@gentoo.org> hwsetup-1.1.ebuild: + Stable on sparc wrt #117911 + + 05 Jan 2006; Markus Rothe <corsair@gentoo.org> hwsetup-1.1.ebuild: + Stable on ppc64; bug #117911 + + 03 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.1.ebuild: + Marking stable on amd64/x86. + + 20 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> + files/hwsetup-1.0-dyn_blacklist.patch, + files/hwsetup-1.1-dyn_blacklist.patch: + Fix potential buffer overflow in dynamic blacklist support and closing bug + #115669. + + 07 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> + files/hwsetup-1.1-gentoo.patch, hwsetup-1.0-r3.ebuild, hwsetup-1.1.ebuild: + Added pciutils to *DEPEND and fixing Gentoo patch. + + 18 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.0-r3.ebuild, + hwsetup-1.1.ebuild: + Added hwdata* dependencies. + + 18 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.0-r3.ebuild, + hwsetup-1.1.ebuild: + Cleaned up dependencies. + +*hwsetup-1.1 (17 Nov 2005) + + 17 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> + +files/hwsetup-1.1-dyn_blacklist.patch, + +files/hwsetup-1.1-fastprobe.patch, +files/hwsetup-1.1-gentoo.patch, + +hwsetup-1.1.ebuild: + Updated to the latest upstream version. + + 12 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.0-r3.ebuild: + Explicitly added items to RDEPEND, rather than having RDEPEND=DEPEND. + + 24 Aug 2005; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.0-r3.ebuild: + Added sys-libs/libkudzu-knoppix to list of possible kudzu* dependencies. + + 12 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.0-r3.ebuild: + Added ia64. + + 12 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.0-r3.ebuild: + Added libkudzu to list of DEPEND that pull in libkudzu, and also adjusting + RDEPEND to be correct. + + 30 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> + -hwsetup-1.0-r2.ebuild, hwsetup-1.0-r3.ebuild: + Removing old version and marking stable. + + 22 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.0-r2.ebuild, + hwsetup-1.0-r3.ebuild: + Added ~sparc on request of gustavoz. + +*hwsetup-1.0-r3 (14 Jun 2005) + + 14 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> + +files/hwsetup-1.0-alsa.patch, +files/hwsetup-1.0-dyn_blacklist.patch, + +files/hwsetup-1.0-fastprobe.patch, files/hwsetup-1.0-gentoo.patch, + +hwsetup-1.0-r3.ebuild: + Added blacklist patch from Islam Amer <pharon@gmail.com> and closing bug + #90639. + + 12 May 2005; Chris Gianelloni <wolf31o2@gentoo.org> + -hwsetup-1.0-r1.ebuild, hwsetup-1.0-r2.ebuild: + Changing DEPEND to allow for either kudzu-knoppix or kudzu and cleaning up + older ebuild. + + 06 Apr 2005; Markus Rothe <corsair@gentoo.org> hwsetup-1.0-r2.ebuild: + Stable on ppc64 + + 17 Feb 2005; Markus Rothe <corsair@gentoo.org> hwsetup-1.0-r2.ebuild: + Added ~ppc64 to KEYWORDS + + 03 Feb 2005; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.0-r2.ebuild: + Patch is very trivial. Marked stable on x86, alpha, and amd64. + + 03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> + hwsetup-1.0-r1.ebuild, hwsetup-1.0-r2.ebuild: + Masked hwsetup-1.0-r2.ebuild stable for ppc + + 03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> + hwsetup-1.0-r1.ebuild: + Masked hwsetup-1.0-r1.ebuild stable for ppc + +*hwsetup-1.0-r2 (27 Jul 2004) + + 27 Jul 2004; Chris Gianelloni <wolf31o2@gentoo.org> + +files/hwsetup-1.0-gentoo.patch, +hwsetup-1.0-r2.ebuild: + Changed all calls to XFree86 to just X to make it X server agnostic. + + 23 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.0-r1.ebuild: + Added to ~ppc per dholm. + + 01 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.0.ebuild: + QA cleanup + + 30 May 2004; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.0-r1.ebuild: + QA cleanup and masking for ppc. + + 30 May 2004; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.0.ebuild: + QA cleanup and masking for ppc. + + 21 May 2004; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.0-r1.ebuild: + Stabilizing on x86. + +*hwsetup-1.0-r1 (14 May 2004) + + 14 May 2004; Chris Gianelloni <wolf31o2@gentoo.org> +hwsetup-1.0-r1.ebuild: + Revision bumped to include latest release. + + 14 May 2004; Chris Gianelloni <wolf31o2@gentoo.org> metadata.xml: + Changing maintainers to newly formed livecd herd. + + 12 Apr 2004; David Holm <dholm@gentoo.org> hwsetup-1.0.ebuild: + Added to ~ppc. + + 18 Jul 2003; Olivier Crete <tester@gentoo.org> hwsetup-1.0.ebuild: + Wont work with kudzu > 1.0 + +*hwsetup-1.0 (02 March 2003) + + 03 March 2003; <livewire@gentoo.org>: + + + Intial Import diff --git a/sys-apps/hwsetup/Manifest b/sys-apps/hwsetup/Manifest new file mode 100644 index 0000000..8207a41 --- /dev/null +++ b/sys-apps/hwsetup/Manifest @@ -0,0 +1,9 @@ +AUX hwsetup-1.2-dyn_blacklist.patch 1972 RMD160 d72fec23a306e71fbd9402b043bf2ac88413b353 SHA1 2ccdeb5f0f15c68821434a1e2b081dce229cdf70 SHA256 8fd9a2d691fd4b820ac12535c6fa5a1ba2ccbbc3e9025871ecd054bec454744b +AUX hwsetup-1.2-fastprobe.patch 2817 RMD160 5cadca96d654739d61db18287bf2a71f4d7a00ca SHA1 9d05f2542f4fc9b8ae4ace559bec8a9720ea77b5 SHA256 9a16e4ddaada2bc115a48a6d60b5cac72d49f33c7eecf245f6337df627a4a0d0 +AUX hwsetup-1.2-gentoo.patch 1430 RMD160 fae21df5ef10085fe6336c483b5b2c2145f1f787 SHA1 b17b2ae05a819c9be68145f8ba5054dddf276a6d SHA256 1d1b6b3199b4a395febe7a68fc85a59c090ab99918f6a5e02739210e7c182e83 +DIST hwsetup_1.2-3.tar.gz 10828 RMD160 d3ce42ac74e5b0ccb9ae73fc0092f172b83a653a SHA1 101b42ee5016e250d69dbbfec7cd65e9d499eacd SHA256 faf346f5f342c0ab26631e31440632f6009ff206feafd1667a488e2f0ba4bb37 +DIST hwsetup_1.2-7.tar.gz 10706 RMD160 7895b32c81254b2ca1575ab12dcc6fa39d011e17 SHA1 c91cb22c07755ecbfce8e9e6826e8e2580f103f8 SHA256 aa72b37ce306b5191cabd31eb5f19ab2a5e635697a263c6735d10c7bf99f9589 +EBUILD hwsetup-1.2-r1.ebuild 1709 RMD160 b9159a32a337f14bb0dd8302535315c39141b6bd SHA1 cf8518b7fb39fedbd258bbe51b6c96bb7abdfd25 SHA256 17ed18aeb7eb80e3fe653313b7b836f3c6babe9b5a3ead03102315cf37beda36 +EBUILD hwsetup-1.2.ebuild 1709 RMD160 45ec034ad8dda1ee17dbe4eca77a1c35a0f664bd SHA1 c8e20e55111d2a470a11637e562bfebf0615baf2 SHA256 c4b7f154cf0361bf34e5b2614a76e084031574abbf6b7e8dd43e072d90671954 +MISC ChangeLog 8645 RMD160 931cc933e4d80d6c47f7bcd12287d9148852740a SHA1 bd0d0d998907893ae06df4faa34bb4ccf9b63835 SHA256 2e048ff130e3350accd662f6e4bc830f841457a0630c072175793a9bf6e7447e +MISC metadata.xml 159 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 SHA1 1e72098aafb1fa729eba6fc8357c7e732eb79dee SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d diff --git a/sys-apps/hwsetup/files/hwsetup-1.2-dyn_blacklist.patch b/sys-apps/hwsetup/files/hwsetup-1.2-dyn_blacklist.patch new file mode 100644 index 0000000..7348993 --- /dev/null +++ b/sys-apps/hwsetup/files/hwsetup-1.2-dyn_blacklist.patch @@ -0,0 +1,62 @@ +diff -urN hwsetup-1.2.orig/hwsetup.c hwsetup-1.2/hwsetup.c +--- hwsetup-1.2.orig/hwsetup.c 2005-05-28 18:11:51.000000000 -0400 ++++ hwsetup-1.2/hwsetup.c 2005-11-17 14:08:03.000000000 -0500 +@@ -43,12 +43,39 @@ + /* 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", + /* 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 ("/etc/hotplug/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 */ +@@ -412,7 +438,7 @@ + pid_t mpid; + if((m==NULL)||(!strcmp("unknown",m))||(!strcmp("ignore",m))) return 0; + #ifdef BLACKLIST +- for(i=0;i<(sizeof(blacklist)/sizeof(char*));i++) ++ for(i=0;i < blacklistsize;i++) + { + if(!strcmp(blacklist[i],m)) + { +@@ -638,5 +664,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/hwsetup-1.2-fastprobe.patch b/sys-apps/hwsetup/files/hwsetup-1.2-fastprobe.patch new file mode 100644 index 0000000..0122a6a --- /dev/null +++ b/sys-apps/hwsetup/files/hwsetup-1.2-fastprobe.patch @@ -0,0 +1,75 @@ +diff -urN hwsetup-1.2.dyn_blacklist/hwsetup.c hwsetup-1.2/hwsetup.c +--- hwsetup-1.2.dyn_blacklist/hwsetup.c 2005-11-17 14:20:14.000000000 -0500 ++++ hwsetup-1.2/hwsetup.c 2005-11-17 14:24:54.000000000 -0500 +@@ -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/hwsetup-1.2-gentoo.patch b/sys-apps/hwsetup/files/hwsetup-1.2-gentoo.patch new file mode 100644 index 0000000..2cd8597 --- /dev/null +++ b/sys-apps/hwsetup/files/hwsetup-1.2-gentoo.patch @@ -0,0 +1,41 @@ +diff -urN hwsetup-1.2.orig/hwsetup.c hwsetup-1.2/hwsetup.c +--- hwsetup-1.2.orig/hwsetup.c 2005-12-06 08:42:39.000000000 -0500 ++++ hwsetup-1.2/hwsetup.c 2005-12-06 08:42:18.000000000 -0500 +@@ -23,14 +23,15 @@ + #endif + + #define VERSION "HWSETUP 1.2, an automatic hardware configuration tool\n" \ +- "(C) 2006 Klaus Knopper <knoppix@knopper.net>\n\n" ++ "(C) 2006 Klaus Knopper <knoppix@knopper.net>\n" \ ++ "Modified for Gentoo Linux\n\n" + + #define CARDSDB "/usr/share/hwdata/Cards" +-#define XPATH "/usr/X11R6/bin/" +-#define XMODPATH "/usr/X11R6/lib/modules/drivers/" ++#define XPATH "/usr/bin/" ++#define XMODPATH "/usr/lib/xorg/modules/drivers/" + + #define VERBOSE_PRINT 1 +-#define VERBOSE_PROMPT 2 ++#define VERBOSE_PROMPT 0 + + #define SKIP_AUDIO 1 + #define SKIP_SCSI 2 +@@ -255,7 +256,7 @@ + char xmodule[32]; + char fullpath[128]; + sscanf(&buffer[7],"%31s",xmodule); +- sprintf(fullpath,XMODPATH"%.31s_drv.o",xmodule); ++ sprintf(fullpath,XMODPATH"%.31s_drv.so",xmodule); + if(exists(fullpath)) + { + strncpy(xi.xmodule,xmodule,sizeof(xi.xmodule)); +@@ -517,7 +518,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/hwsetup-1.2-r1.ebuild b/sys-apps/hwsetup/hwsetup-1.2-r1.ebuild new file mode 100644 index 0000000..3133d41 --- /dev/null +++ b/sys-apps/hwsetup/hwsetup-1.2-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/hwsetup-1.2.ebuild,v 1.9 2008/04/03 00:27:01 wolf31o2 Exp $ + +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 ia64 -mips ppc ppc64 sparc x86" +IUSE="zlib" + +COMMON_DEPEND="zlib? ( sys-libs/zlib ) + sys-apps/pciutils" +DEPEND="${COMMON_DEPEND} + sys-libs/libkudzu" +RDEPEND="${COMMON_DEPEND} + sys-apps/hwdata-gentoo" + +src_unpack() { + unpack ${A} + epatch \ + "${FILESDIR}"/${P}-dyn_blacklist.patch \ + "${FILESDIR}"/${P}-fastprobe.patch \ + "${FILESDIR}"/${P}-gentoo.patch +} + +src_compile() { + append-ldflags -s + filter-ldflags -Wl,--as-needed --as-needed + if use zlib + then + append-ldflags -lz + elif built_with_use --missing false sys-apps/pciutils zlib + then + die "You need to build with USE=zlib to match sys-apps/pcituils" + fi + emake LDFLAGS="${LDFLAGS}" OPT="${CFLAGS}" CC="$(tc-getCC)" || die "emake failed" +} + +src_install() { + einstall DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man || die "Install failed" + keepdir /etc/sysconfig +} + +pkg_postinst() { + ewarn "This package is intended for usage 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/hwsetup-1.2.ebuild b/sys-apps/hwsetup/hwsetup-1.2.ebuild new file mode 100644 index 0000000..0903ed9 --- /dev/null +++ b/sys-apps/hwsetup/hwsetup-1.2.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/hwsetup-1.2.ebuild,v 1.9 2008/04/03 00:27:01 wolf31o2 Exp $ + +inherit eutils toolchain-funcs flag-o-matic + +MY_PV=${PV}-3 +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 ia64 -mips ppc ppc64 sparc x86" +IUSE="zlib" + +COMMON_DEPEND="zlib? ( sys-libs/zlib ) + sys-apps/pciutils" +DEPEND="${COMMON_DEPEND} + sys-libs/libkudzu" +RDEPEND="${COMMON_DEPEND} + sys-apps/hwdata-gentoo" + +src_unpack() { + unpack ${A} + epatch \ + "${FILESDIR}"/${P}-dyn_blacklist.patch \ + "${FILESDIR}"/${P}-fastprobe.patch \ + "${FILESDIR}"/${P}-gentoo.patch +} + +src_compile() { + append-ldflags -s + filter-ldflags -Wl,--as-needed --as-needed + if use zlib + then + append-ldflags -lz + elif built_with_use --missing false sys-apps/pciutils zlib + then + die "You need to build with USE=zlib to match sys-apps/pcituils" + fi + emake LDFLAGS="${LDFLAGS}" OPT="${CFLAGS}" CC="$(tc-getCC)" || die "emake failed" +} + +src_install() { + einstall DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man || die "Install failed" + keepdir /etc/sysconfig +} + +pkg_postinst() { + ewarn "This package is intended for usage 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 0000000..88653dd --- /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> |