# ChangeLog for sys-apps/hwsetup
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/ChangeLog,v 1.44 2006/08/26 05:30:06 mr_bones_ Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/ChangeLog,v 1.45 2007/01/05 19:44:46 wolf31o2 Exp $
+
+*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
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX hwsetup-1.1-dyn_blacklist.patch 1978 RMD160 523ca0c33b4877635a098ce0eb6139a3a3992007 SHA1 78b4028bc58feb35c5a8f63698be842607c5f3e3 SHA256 44f3ed169dfc4882d20ade009b747ce6bd04846b9b678979185e8d7c1ac07f6a
MD5 d374ea118a38b12a7372efa0eb41a3ad files/hwsetup-1.1-dyn_blacklist.patch 1978
RMD160 523ca0c33b4877635a098ce0eb6139a3a3992007 files/hwsetup-1.1-dyn_blacklist.patch 1978
MD5 ad0bc16bdb6e632f71a2768e270c9372 files/hwsetup-1.1-gentoo.patch 4249
RMD160 d2579ab52220879030408bfbbd8bf304c5650cdd files/hwsetup-1.1-gentoo.patch 4249
SHA256 3e5531d98e293c8c2c0d0107f6bfdcd9fe8f503da83882b2ec8defe2d93ec4cd files/hwsetup-1.1-gentoo.patch 4249
+AUX hwsetup-1.2-dyn_blacklist.patch 1972 RMD160 d72fec23a306e71fbd9402b043bf2ac88413b353 SHA1 2ccdeb5f0f15c68821434a1e2b081dce229cdf70 SHA256 8fd9a2d691fd4b820ac12535c6fa5a1ba2ccbbc3e9025871ecd054bec454744b
+MD5 5921b87f60624d577b64bbf50f0115e3 files/hwsetup-1.2-dyn_blacklist.patch 1972
+RMD160 d72fec23a306e71fbd9402b043bf2ac88413b353 files/hwsetup-1.2-dyn_blacklist.patch 1972
+SHA256 8fd9a2d691fd4b820ac12535c6fa5a1ba2ccbbc3e9025871ecd054bec454744b files/hwsetup-1.2-dyn_blacklist.patch 1972
+AUX hwsetup-1.2-fastprobe.patch 2817 RMD160 5cadca96d654739d61db18287bf2a71f4d7a00ca SHA1 9d05f2542f4fc9b8ae4ace559bec8a9720ea77b5 SHA256 9a16e4ddaada2bc115a48a6d60b5cac72d49f33c7eecf245f6337df627a4a0d0
+MD5 950af08828a3f0d8111a7ddca628a7b8 files/hwsetup-1.2-fastprobe.patch 2817
+RMD160 5cadca96d654739d61db18287bf2a71f4d7a00ca files/hwsetup-1.2-fastprobe.patch 2817
+SHA256 9a16e4ddaada2bc115a48a6d60b5cac72d49f33c7eecf245f6337df627a4a0d0 files/hwsetup-1.2-fastprobe.patch 2817
+AUX hwsetup-1.2-gentoo.patch 1430 RMD160 fae21df5ef10085fe6336c483b5b2c2145f1f787 SHA1 b17b2ae05a819c9be68145f8ba5054dddf276a6d SHA256 1d1b6b3199b4a395febe7a68fc85a59c090ab99918f6a5e02739210e7c182e83
+MD5 6086609ba91c117fd71bd208548f966a files/hwsetup-1.2-gentoo.patch 1430
+RMD160 fae21df5ef10085fe6336c483b5b2c2145f1f787 files/hwsetup-1.2-gentoo.patch 1430
+SHA256 1d1b6b3199b4a395febe7a68fc85a59c090ab99918f6a5e02739210e7c182e83 files/hwsetup-1.2-gentoo.patch 1430
DIST hwsetup_1.1-1.tar.gz 9062 RMD160 e0728e9d79b83e815586c6af8e70baae0ac913c4 SHA1 b784b2ac947e2c98321875c83cb23fb2e3e8b342 SHA256 86fa767b6ceb74ce71fc6895e9db43445058025e4c0d6834a2c60159e3ea1199
-EBUILD hwsetup-1.1.ebuild 1296 RMD160 9e6d42574c0e5efa5c0167f42df1b298f1ed7038 SHA1 a1742f07561a43216734493719e907178285570d SHA256 65b37f6ddfdadd7d3af29a4a379b5c7dd2e1b7f44ce2bbb8b6c7b41bc78d0246
-MD5 69c8389dfb983a9f94f2bcf569b41116 hwsetup-1.1.ebuild 1296
-RMD160 9e6d42574c0e5efa5c0167f42df1b298f1ed7038 hwsetup-1.1.ebuild 1296
-SHA256 65b37f6ddfdadd7d3af29a4a379b5c7dd2e1b7f44ce2bbb8b6c7b41bc78d0246 hwsetup-1.1.ebuild 1296
-MISC ChangeLog 6652 RMD160 79f5a1c4c63d66fd184c15047dfb77e05681cc8b SHA1 7278914e3f950ff87799066b9b31dc7a7ae2fc7b SHA256 1d9afbe149337ead58ad2bdfa5e3a72afc5c91565aa42553997ebbd4561d3418
-MD5 1b9c8a41153f3b51747559e4717f0756 ChangeLog 6652
-RMD160 79f5a1c4c63d66fd184c15047dfb77e05681cc8b ChangeLog 6652
-SHA256 1d9afbe149337ead58ad2bdfa5e3a72afc5c91565aa42553997ebbd4561d3418 ChangeLog 6652
+DIST hwsetup_1.2-3.tar.gz 10828 RMD160 d3ce42ac74e5b0ccb9ae73fc0092f172b83a653a SHA1 101b42ee5016e250d69dbbfec7cd65e9d499eacd SHA256 faf346f5f342c0ab26631e31440632f6009ff206feafd1667a488e2f0ba4bb37
+EBUILD hwsetup-1.1.ebuild 1367 RMD160 5231250e5a76b10ddd6fc78a210d51566c9d15c6 SHA1 af43fc33583e71b435aa996f7091e6acab2ecce3 SHA256 d077ee8a442a4bea7d6803636736f6ca99f8075c5b0c844f76c75e723b577b16
+MD5 64bede0a046727779d907915051de906 hwsetup-1.1.ebuild 1367
+RMD160 5231250e5a76b10ddd6fc78a210d51566c9d15c6 hwsetup-1.1.ebuild 1367
+SHA256 d077ee8a442a4bea7d6803636736f6ca99f8075c5b0c844f76c75e723b577b16 hwsetup-1.1.ebuild 1367
+EBUILD hwsetup-1.2.ebuild 1373 RMD160 4da17163285dacb877ec66a3455b071e22ea4ff3 SHA1 adbbc34e0bdba53d9c2773fda1a0caf8c6726fa6 SHA256 735f9d026e55953222a658785c1e39610ffddd47a76ae9943c0c044a30e466f0
+MD5 83194d0611cbd0e41379e0743c9068e8 hwsetup-1.2.ebuild 1373
+RMD160 4da17163285dacb877ec66a3455b071e22ea4ff3 hwsetup-1.2.ebuild 1373
+SHA256 735f9d026e55953222a658785c1e39610ffddd47a76ae9943c0c044a30e466f0 hwsetup-1.2.ebuild 1373
+MISC ChangeLog 7001 RMD160 abcc380d256d6f2081b3b4e740fde5a1dee8c14b SHA1 fa3ad2b7e84a6fb37346e247fd71070b53d1e313 SHA256 83784d1f17403065eb70f09fcfb886c325d6c107e3abd7a71ee793074533b008
+MD5 b9bddde668b3ea4735f69da148b708f9 ChangeLog 7001
+RMD160 abcc380d256d6f2081b3b4e740fde5a1dee8c14b ChangeLog 7001
+SHA256 83784d1f17403065eb70f09fcfb886c325d6c107e3abd7a71ee793074533b008 ChangeLog 7001
MISC metadata.xml 159 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 SHA1 1e72098aafb1fa729eba6fc8357c7e732eb79dee SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d
MD5 d86e5b5e47260e5a965eae2afe6d6d40 metadata.xml 159
RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 metadata.xml 159
MD5 dc992bac6f5f8dfb9dbb29a6543d072f files/digest-hwsetup-1.1 235
RMD160 2a96256e2cb11c05b062b141c94ecbb07f56772a files/digest-hwsetup-1.1 235
SHA256 95efc35c3ca6de4f79085ffa3e41c0bd9bc5498d2ebbdbe92423da33c56b06cf files/digest-hwsetup-1.1 235
+MD5 32fe03d6753fd120a255bc34406df63d files/digest-hwsetup-1.2 238
+RMD160 eb4d62c171333cbd026cd5a639092a72a16d86f2 files/digest-hwsetup-1.2 238
+SHA256 aed4897e28932ad6a8981b961ea8490a2a068dec41d0e659f275204a0b5da30c files/digest-hwsetup-1.2 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFnqq6kT4lNIS36YERApviAJ4qKU2UdKT6LDSLzhmAxqNf5yHFeQCdFht/
+Zr+FQvJDyPk3M3ba1p32AlM=
+=gzsb
+-----END PGP SIGNATURE-----
--- /dev/null
+MD5 78485cc6011e8079d794a7ef9e2145e1 hwsetup_1.2-3.tar.gz 10828
+RMD160 d3ce42ac74e5b0ccb9ae73fc0092f172b83a653a hwsetup_1.2-3.tar.gz 10828
+SHA256 faf346f5f342c0ab26631e31440632f6009ff206feafd1667a488e2f0ba4bb37 hwsetup_1.2-3.tar.gz 10828
--- /dev/null
+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);
+ }
--- /dev/null
+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);
+ }
--- /dev/null
+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)
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/hwsetup-1.1.ebuild,v 1.15 2006/08/26 05:30:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/hwsetup-1.1.ebuild,v 1.16 2007/01/05 19:44:46 wolf31o2 Exp $
-inherit eutils
+inherit eutils toolchain-funcs
MY_PV=${PV}-1
DESCRIPTION="Hardware setup program from Knoppix - used only on LiveCD"
}
src_compile() {
- emake || die "emake failed"
+ emake LDFLAGS="-s ${LDFLAGS}" OPT="${CFLAGS}" CC="$(tc-getCC)" || die "emake failed"
}
src_install() {
--- /dev/null
+# Copyright 1999-2007 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.1 2007/01/05 19:44:46 wolf31o2 Exp $
+
+inherit eutils toolchain-funcs
+
+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=""
+
+DEPEND="sys-libs/libkudzu
+ sys-apps/pciutils"
+RDEPEND="${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() {
+ emake LDFLAGS="-s ${LDFLAGS}" OPT="${CFLAGS}" CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+ einstall DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man || die "Install failed"
+}
+
+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."
+}
projects / gentoo.git / commitdiff