From 17487f44fde286abe3d29256441f4a5c9c764cdc Mon Sep 17 00:00:00 2001 From: ms Date: Thu, 9 Aug 2007 13:14:55 +0000 Subject: [PATCH] Einige Root-Files noch erweitert/gekuerzt. Abhaengigkeiten hinzugefuegt. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@750 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- .../common/{capi-4k-utils => capi4k-utils} | 0 config/rootfiles/common/fuse | 4 --- config/rootfiles/common/mkinitcpio | 34 +------------------ config/rootfiles/common/pam_mysql | 2 -- config/rootfiles/packages/libvorbis | 6 ++-- lfs/amavisd | 6 +++- lfs/mailx | 8 +++-- lfs/sox | 2 +- 8 files changed, 15 insertions(+), 47 deletions(-) rename config/rootfiles/common/{capi-4k-utils => capi4k-utils} (100%) delete mode 100644 config/rootfiles/common/pam_mysql diff --git a/config/rootfiles/common/capi-4k-utils b/config/rootfiles/common/capi4k-utils similarity index 100% rename from config/rootfiles/common/capi-4k-utils rename to config/rootfiles/common/capi4k-utils diff --git a/config/rootfiles/common/fuse b/config/rootfiles/common/fuse index acd2ffcc14..dc90692a72 100644 --- a/config/rootfiles/common/fuse +++ b/config/rootfiles/common/fuse @@ -1,9 +1,5 @@ #etc/rc.d/init.d/fuse etc/udev/rules.d/99-fuse.rules -#lib/modules/2.6.16/kernel/fs/fuse -#lib/modules/2.6.16/kernel/fs/fuse/fuse.ko -#lib/modules/2.6.16-smp/kernel/fs/fuse -#lib/modules/2.6.16-smp/kernel/fs/fuse/fuse.ko sbin/mount.fuse usr/bin/fusermount usr/bin/ulockmgr_server diff --git a/config/rootfiles/common/mkinitcpio b/config/rootfiles/common/mkinitcpio index 718ea06472..6db7667b11 100644 --- a/config/rootfiles/common/mkinitcpio +++ b/config/rootfiles/common/mkinitcpio @@ -1,37 +1,5 @@ etc/mkinitcpio.conf -etc/mkinitcpio.d -#etc/mkinitcpio.d/example.preset -lib/initcpio -#lib/initcpio/functions -#lib/initcpio/hooks -#lib/initcpio/hooks/filesystems -#lib/initcpio/hooks/fw -#lib/initcpio/hooks/modload -#lib/initcpio/hooks/raid -#lib/initcpio/hooks/resume -#lib/initcpio/hooks/usb -#lib/initcpio/init -#lib/initcpio/install -#lib/initcpio/install/autodetect -#lib/initcpio/install/base -#lib/initcpio/install/dsdt -#lib/initcpio/install/filesystems -#lib/initcpio/install/firmware -#lib/initcpio/install/fw -#lib/initcpio/install/ide -#lib/initcpio/install/modload -#lib/initcpio/install/net -#lib/initcpio/install/pata -#lib/initcpio/install/pcmcia -#lib/initcpio/install/raid -#lib/initcpio/install/resume -#lib/initcpio/install/sata -#lib/initcpio/install/scsi -#lib/initcpio/install/usb -#lib/initcpio/install/usbinput -sbin/mkinitcpio -etc/mkinitcpio.conf -etc/mkinitcpio.d +#etc/mkinitcpio.d #etc/mkinitcpio.d/example.preset lib/initcpio #lib/initcpio/functions diff --git a/config/rootfiles/common/pam_mysql b/config/rootfiles/common/pam_mysql deleted file mode 100644 index fbdfadd3a6..0000000000 --- a/config/rootfiles/common/pam_mysql +++ /dev/null @@ -1,2 +0,0 @@ -#lib/security/pam_mysql.la -lib/security/pam_mysql.so diff --git a/config/rootfiles/packages/libvorbis b/config/rootfiles/packages/libvorbis index da953c2d92..5f69cdb6d9 100644 --- a/config/rootfiles/packages/libvorbis +++ b/config/rootfiles/packages/libvorbis @@ -9,9 +9,9 @@ usr/lib/libvorbis.so.0 usr/lib/libvorbis.so.0.3.1 #usr/lib/libvorbisenc.a #usr/lib/libvorbisenc.la -#usr/lib/libvorbisenc.so -#usr/lib/libvorbisenc.so.2 -#usr/lib/libvorbisenc.so.2.0.2 +usr/lib/libvorbisenc.so +usr/lib/libvorbisenc.so.2 +usr/lib/libvorbisenc.so.2.0.2 #usr/lib/libvorbisfile.a #usr/lib/libvorbisfile.la usr/lib/libvorbisfile.so diff --git a/lfs/amavisd b/lfs/amavisd index 97e73dea52..0990784794 100644 --- a/lfs/amavisd +++ b/lfs/amavisd @@ -36,6 +36,10 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = amavisd PAK_VER = 1 +DESCDE = "Ein Daemon zum scannen von Emails." +DESCEN = "A daemon for scanning emails." +DEPS = "clamav spamassassin" + ############################################################################### # Top-level Rules ############################################################################### @@ -90,4 +94,4 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && chown amavis.amavis /var/amavis cd $(DIR_APP) && chmod 750 /var/amavis @rm -rf $(DIR_APP) - @$(POSTBUILD) \ No newline at end of file + @$(POSTBUILD) diff --git a/lfs/mailx b/lfs/mailx index ebc3565f81..0aff588f23 100644 --- a/lfs/mailx +++ b/lfs/mailx @@ -36,6 +36,10 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = mailx PAK_VER = 1 +DESCDE = "Tools zum Versenden von Mails." +DESCEN = "Tools for sending mails from console." +DEPS = "" + ############################################################################### # Top-level Rules ############################################################################### @@ -55,7 +59,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) dist: - @$(PAKS) + $(PAKS) ############################################################################### # Downloading, checking, md5sum @@ -81,7 +85,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make PREFIX=/usr UCBINSTALL=/usr/bin/install install cd $(DIR_APP) && ln -v -sf mailx /usr/bin/mail cd $(DIR_APP) && ln -v -sf mailx /usr/bin/nail - # cd $(DIR_APP) && install -v -m755 -d /usr/share/doc/mailx-12.0 - # cd $(DIR_APP) && install -v -m644 README mailx.1.html /usr/share/doc/mailx-12.0 @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/sox b/lfs/sox index 243c55c005..08a6de912c 100644 --- a/lfs/sox +++ b/lfs/sox @@ -38,7 +38,7 @@ PAK_VER = 1 DESCDE = "Sox spielt gsm-Dateien ab." DESCEN = "Sox is a player for gsm-files." -DEPS = "" +DEPS = "libvorbis" ############################################################################### # Top-level Rules -- 2.39.2