ppcrcd: add.pkgs fs.pkgs net.pkgs

sparky cvs at pld-linux.org
Sun Dec 11 15:15:54 CET 2005


Author: sparky
Date: Sun Dec 11 15:15:51 2005
New Revision: 6638

Modified:
   ppcrcd/add.pkgs
   ppcrcd/fs.pkgs
   ppcrcd/net.pkgs
Log:
- updated
- commented rpms which don't build
- reorganised so no --nodeps is required when installing


Modified: ppcrcd/add.pkgs
==============================================================================
--- ppcrcd/add.pkgs	(original)
+++ ppcrcd/add.pkgs	Sun Dec 11 15:15:51 2005
@@ -1,30 +1,52 @@
 
+I +=	bzip2-libs bzip2
+SPEC-bzip2-libs = bzip2.spec
+
+I +=	dlm
+
+I +=	libxml2
+BCOND-libxml2 = --without python
+# -python
+
+I +=	libgcc libstdc++
+GCCVER=4.1.0-0.20051206r108118.1
+# will not build it
+
 include fs.pkgs
+
+I +=	openssl openssl-tools openssl-tools-perl
+
+I +=	expat
+
+I +=	gpm-libs gpm
+SPEC-gpm-libs = gpm.spec
+S +=	gpm
+
+I +=	pcre pcregrep
+
+I +=	libjpeg
+
 include net.pkgs
 
 I +=	sysfsutils
 
 I +=	diffutils
 
-I +=	libstdc++ libgcc
-GCCVER=3.3.5-*
-# will not build it
-
 I +=	fix-info-dir
 
-I +=	man man-config
-
 I +=	groff
 BCOND-groff = --without xditview
 # -xditview
 
-I +=	less
-
-I +=	file libmagic
-BCOND-file = --without python
+I +=	libmagic file
+SPEC-libmagic = file.spec
+BCOND-libmagic = --without python
 # -python
 
-I +=	bzip2 bzip2-libs
+I +=	less
+
+I +=	man-config man
+SPEC-man-config = man.spec
 
 I +=	which
 
@@ -49,75 +71,68 @@
 BCOND-vim = --without static --without athena --without motif --without gtk --without gnome --without kde \
 		--without ispell
 # -static -athena -motif -gtk -gnome -kde +perl +python +ruby +tcl +bonobo -selinux -ispell -home_etc
+INSTOPTS-vim = --nodeps
 
-I +=	gpm gpm-libs
-S +=	gpm
-
-I +=	john
+#I +=	john
 # +mmx
 
 I +=	words
 
 I +=	joe
 
-I +=	pico
-SPEC-pico = pine.spec
-BCOND-pico = --without home_etc
+#I +=	pico
+#SPEC-pico = pine.spec
+#BCOND-pico = --without home_etc
 # -utf8 -home_etc
 
 I +=	mc
-REV-mv = AC-branch
-BCOND-mc = --with ext2undel
+BCOND-mc = --with ext2undel --without x
 # +ext2undel -perl_vfs +samba +x
 
-I +=	pldconf
+I +=	slang-libs slang
+SPEC-slang-libs = slang.spec
+BCOND-slang-libs = --without png
 
 I +=	dml
 
-I +=	slang
+I +=	pldconf
 
 I +=	ccrypt
 
-I +=	elfutils elfutils-libelf
-BCOND-elfutils = --without tests
+I +=	elfutils-libelf elfutils
+SPEC-elfutils-libelf = elfutils.spec
+BCOND-elfutils-libelf = --without tests
 # -tests
 
-I +=	rpm rpm-lib rpm-utils
-REV-rpm = AC-branch
-BCOND-rpm = --without doc --without python
-# +static -doc -python -selinux +distver
-
 I +=	beecrypt
 REV-beecrypt = AC-branch
-BCOND-beecrypt = --without python
+BCOND-beecrypt = --without python --without java
 # +javaglue -python
 
-I +=	lua40 lua40-libs
+I +=	rpm-lib rpm-base rpm rpm-utils
+SPEC-rpm-lib = rpm.spec
+REV-rpm-lib = AC-branch
+BCOND-rpm-lib = --without doc --without python --without apidocs
+# +static -doc -python -selinux +distver
 
 I +=	cpipe
 
 I +=	lsof
 
-I +=	dlm
-REV-dlm = auto-ac-dlm-0_0_0_20040625_1-1
-
 I +=	md5deep
 
 I +=	statserial
 
-I +=	pcre pcregrep
-
 I +=	bash-completion
 POST +=	compl_no_mount
 
 I +=	vlock
 
 I +=	lshw
+BCOND-lshw = --without gui
 
 I +=	time
 
-I +=	expat
-
 I +=	minicom
 
 ### ARCHIVING
@@ -139,21 +154,18 @@
 
 I +=	lha
 
-I +=	arj
+I +=	lzma
 
-I +=	libjpeg
+#I +=	arj
 
-I +=	libltdl
+#I +=	libltdl
 SPEC-libltdl = libtool.spec
 
-I +=	libxml2
-BCOND-libxml2 = --without python
-# -python
-
 I +=	syslog-ng
 
-I +=	poldek
-REV-poldek = AC-branch
+I +=	poldek-libs poldek
+SPEC-poldek-libs = poldek.spec
+REV-poldek-libs = AC-branch
 # +static -imode +curl
 
 ### SPECIAL ###
@@ -165,14 +177,10 @@
 	touch $@
 
 .libstdc++_rpm:
-	wget ftp://ftp.pld-linux.org/dists/ac/PLD/ppc/PLD/RPMS/libstdc++-$(GCCVER).ppc.rpm
-	RPM=`echo libstdc++-$(GCCVER).ppc.rpm`; mv $$RPM rpm/RPMS/; \
-		echo rpm/RPMS/$$RPM > $@
+	echo rpm/RPMS/libstdc++-$(GCCVER).ppc.rpm > $@
 
 .libgcc_rpm:
-	wget ftp://ftp.pld-linux.org/dists/ac/PLD/ppc/PLD/RPMS/libgcc-$(GCCVER).ppc.rpm
-	RPM=`echo libgcc-$(GCCVER).ppc.rpm`; mv $$RPM rpm/RPMS/; \
-		echo rpm/RPMS/$$RPM > $@
+	echo rpm/RPMS/libgcc-$(GCCVER).ppc.rpm > $@
 
 compl_no_mount:
 	$(SU) sed -e '/complet.*mount/s/^/#/' -i root.stripped/etc/bash_completion

Modified: ppcrcd/fs.pkgs
==============================================================================
--- ppcrcd/fs.pkgs	(original)
+++ ppcrcd/fs.pkgs	Sun Dec 11 15:15:51 2005
@@ -1,5 +1,6 @@
 
-I +=	dump rmt
+I +=	rmt dump
+SPEC-rmt = dump.spec
 
 I +=	pdisk
 
@@ -9,16 +10,16 @@
 BCOND-parted = --without nls
 # +static -nls -readline +uClibc
 
+I +=	gulm
+
 I +=	lvm2
 #REV-lvm2 = auto-ac-lvm2-2_00_33-1
 BCOND-lvm2 = --without initrd
 # -initrd -uClibc -clvmd -selinux
 
-I +=	ccs
-
 I +=	magma
 
-I +=	gulm
+I +=	ccs
 
 I +=	dmraid
 BCOND-dmraid = --without initrd
@@ -44,27 +45,27 @@
 
 I +=	reiserfsprogs
 
-I +=	reiser4progs
-
 I +=	libaal
 
+I +=	reiser4progs
+
 I +=	xfsprogs
 # +static
 
-I +=	xfsdump
-
 I +=	dmapi
 
+I +=	xfsdump
+
 I +=	jfsutils
 # -fsck
 
 I +=	ntfsprogs
-BCOND-ntfsprogs = --without gnome
+BCOND-ntfsprogs = --without gnome --without crypto --without fuse
 # -gnome
 
 I +=	dosfstools
 
-I +=	lufs kernel-fs-lufs
+#I +=	lufs kernel-fs-lufs
 BCOND-lufs = --without smp
 # -dist_kerel -kernel -smp -userspace +verbose
 .lufs_prep:	.lufs_pre .kerneleq
@@ -92,9 +93,10 @@
 I +=	cdrtools cdrtools-readcd cdrtools-utils cdrtools-mkisofs
 
 I +=	cdrdao
-# +gnome
+BCOND-cdrdao = --without mp3 --without ogg
+# +gnome -mp3 -ogg
 
-I +=	lame-libs
+#I +=	lame-libs
 SPEC-lame-libs = lame.spec
 BCOND-lame-libs = --without gtk
 # -gtk

Modified: ppcrcd/net.pkgs
==============================================================================
--- ppcrcd/net.pkgs	(original)
+++ ppcrcd/net.pkgs	Sun Dec 11 15:15:51 2005
@@ -1,31 +1,33 @@
 
 I +=	pcmcia-cs
 S +=	pcmcia
+BCOND-pcmcia-cs = --without x11
 
-I +=	shfs kernel-fs-shfs
-PREP-shfs = .kerneleq
-BCOND-shfs = --without smp
+I +=	kernel-fs-shfs shfs
+SPEC-kernel-fs-shfs = shfs.spec
+PREP-kernel-fs-shfs = .kerneleq
+BCOND-kernel-fs-shfs = --without smp
 # -dist_kernel -kernel -smp +verbose -userspace
 
 
-I +=	eagle-usb kernel-usb-eagle
+#I +=	eagle-usb kernel-usb-eagle
 # -dist_kernel -kernel -smp -userspace +verbose
 .eagle-usb_prep: .eagle-usb_pre .kerneleq
 	touch $@
 
 
-I +=	zaptel zaptel-utils zaptel-init kernel-zaptel
+#I +=	zaptel zaptel-utils zaptel-init kernel-zaptel
 # -dist_kernel -kernel -smp -userspace
-S +=	zaptel
+#S +=	zaptel
 .zaptel_prep:	.zaptel_pre .kerneleq
 	touch $@
 
-I +=	bcm4400 kernel-net-bcm4400
+#I +=	bcm4400 kernel-net-bcm4400
 # -dist_kernel -kernel -smp -userspace +verbose
 .bcm4400_prep:	.bcm4400_pre .kerneleq
 	touch $@
 
-I +=	kernel-net-acx100
+#I +=	kernel-net-acx100
 SPEC-kernel-net-acx100 = acx100.spec
 # -dist_kernel -smp
 .kernel-net-acx100_prep:	.kernel-net-acx100_pre .kerneleq
@@ -35,18 +37,22 @@
 # USES qt
 # -dist_kernel -kernel -smp -userspace +verbose
 
-I +=	speedtouch
+I +=	libpcap
 
+I +=	srp-libs
+SPEC-srp-libs = srp.spec
+
+I +=	linux-atm linux-atm-rc-scripts
+# -vbr
+S +=	atm
 
 I +=	ppp ppp-plugin-pppoatm
 # -pppoatm
 #.ppp_prep: .ppp_pre .pppneq
 #	touch $@
 
-I +=	libpcap
+I +=	speedtouch
 
-I +=	srp-libs
-SPEC-srp-libs = srp.spec
 
 I +=	ppp-plugin-ifcfg-password
 .ppp-plugin-ifcfg-password_prep:	.ppp-plugin-ifcfg-password_pre .pppeq
@@ -54,10 +60,6 @@
 
 I +=	rp-pppoe
 
-I +=	linux-atm linux-atm-rc-scripts
-# -vbr
-S +=	atm
-
 I +=	dhcpcd
 
 I +=	dhcp dhcp-relay dhcp-client
@@ -74,6 +76,9 @@
 
 I +=	cdpr
 
+I +=	libnet
+
+I +=	arping
 
 I +=	iputils iputils-ping iputils-arping
 BCOND-iputils = --without doc
@@ -81,20 +86,17 @@
 
 I +=	bind-libs bind-utils
 SPEC-bind-libs = bind.spec
+BCOND-bind-libs = --without ldap
 # -ssl -ipv6 -ldap
 
-I +=	arping
-
-I +=	libnet
-
 I +=	rsh rlogin rexec
 
+I +=	libedit
+
 I +=	openssh openssh-clients
 BCOND-openssh = --without gtk --without kerberos5
 # -chroot +gnome -gtk +ldap -libedit -kerberos5 -selinux +sshagentsh
 
-I +=	libedit
-
 I +=	ftp ftp-pftp
 
 I +=	lftp
@@ -106,10 +108,15 @@
 
 I +=	wget
 
-I +=	elinks
-BCOND-elinks = --without guile
-# +x +gnutls +js -256 -cgi -guile -idn -ipv6 -led -lua -openssl -perl
+I +=	libidn
+BCOND-libidn = --without python
+# +java -python
+
+I +=	js
 
+I +=	elinks
+BCOND-elinks = --without guile --without lua
+# +x +gnutls -256 -cgi -guile -idn -ipv6 -js -led -lua -openssl -perl
 
 I +=	traceroute-nanog
 
@@ -137,7 +144,8 @@
 I +=	rwho
 S +=	rwhod
 
-I +=	tcp_wrappers libwrap
+I +=	libwrap tcp_wrappers
+SPEC-libwrap = tcp_wrappers.spec
 
 I +=	redir
 
@@ -158,9 +166,6 @@
 
 I +=	idnkit
 
-I +=	libidn
-# +java
-
 I +=	irssi
 # -perl -ipv6 -ssl
 
@@ -174,14 +179,13 @@
 # +yesterday_snapshot -aspell -gadugadu -jabber -libgsm -python -sqlite -xosd
 
 I +=	iptables iptables-init
-REV-iptables = LINUX_2_6_11
 BCOND-iptables = --without doc
 # -doc -dist_kernel
 S +=	iptables ip6tables
 .iptables_prep: .iptables_pre .kerneleq
+	touch $@
 
 
-I +=	openssl openssl-tools openssl-tools-perl
 
 
 .ekg2_prep: .ekg2_pre
@@ -190,7 +194,7 @@
 	touch $@
 
 .pppeq:
-	@$(SU) rpm --erase ppp-plugin-devel
+	-$(SU) rpm --erase ppp-plugin-devel
 	$(SU) rpm -Uhv `cat .ppp-plugin-devel_rpm`
 	touch $@
 



More information about the pld-cvs-commit mailing list