Converted some more scripts to new LFS format.

diff --git a/lfs/adjust-toolchain b/lfs/adjust-toolchain
index 36005a199119d718406ce45e2f265016668c314c..61865cb9cd215d5d89155945c6c280fd65e31efc 100644 (file)
--- a/lfs/adjust-toolchain
+++ b/lfs/adjust-toolchain
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007, 2008, 2009 Michael Tremer & Christian Schmidt           #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -25,30 +25,53 @@
 include Config
 
 PKG_NAME   = adjust-toolchain
-VER        = LFS
+VER        =
+PKG_VER    = -1
 
-THISAPP    = $(PKG_NAME)-$(VER)
+THISAPP    = $(PKG_NAME)
 
 OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
+MAINTAINER =
+GROUP      =
+EXTRA      = no
+DEBUG      = no
+DEPS       =
+
+URL        =
+LICENSE    =
+SHORT_DESC = This script does some tweaks on the build system.
+
+define LONG_DESC
+       This script does some tweaks on the build system.
+endef
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
 objects = 
 
-install : $(OBJECT)
+download: $(objects)
 
-download : 
+info:
+       $(DO_PKG_INFO)
 
+install: $(OBJECT)
+
+package:
+       @$(DO_PACKAGE)
+
+$(objects):
+       @$(LOAD)
 
 ###############################################################################
 # Installation Details
 ###############################################################################
 
-$(OBJECT) : 
+$(OBJECT): $(objects)
        @$(PREBUILD)
-       
+
 ifeq "$(STAGE)" "toolchain"
        $(IFS_TARGET)-gcc -dumpspecs | sed \
                -e 's@$(LINKER)@$(TOOLS_DIR)&@g' \

diff --git a/lfs/grub b/lfs/grub
index 0c3e4aba935770aa102e7b43d524391bdfb9f21a..3ed7987759303a8300819ddda0f657a4957e6ead 100644 (file)
--- a/lfs/grub
+++ b/lfs/grub
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007, 2008, 2009 Michael Tremer & Christian Schmidt           #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -26,6 +26,7 @@ include Config
 
 PKG_NAME   = grub
 VER        = 0.97
+PKG_VER    = 0
 
 THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -33,6 +34,23 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
+MAINTAINER =
+GROUP      = System/Boot
+EXTRA      = no
+DEBUG      = no
+DEPS       =
+
+URL        = http://www.gnu.org/software/grub/
+LICENSE    = GPLv2+
+SHORT_DESC = Grand Unified Boot Loader.
+
+define LONG_DESC
+       GRUB (Grand Unified Boot Loader) is an experimental boot loader
+       capable of booting into most free operating systems - Linux, FreeBSD,
+       NetBSD, GNU Mach, and others as well as most commercial operating
+       systems.
+endef
+
 CFLAGS     =
 CXXFLAGS   =
 
@@ -40,28 +58,41 @@ CXXFLAGS   =
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) grub-0.94-i2o.patch grub-0.95-moreraid.patch \
-       grub-0.93-special-device-names.patch grub-0.95-splash-error-term.patch \
-       grub-0.95-xpmjunk.patch grub-0.93-graphics-bootterm.patch \
-       grub-0.91-splashimagehelp.patch grub-0.95-graphics.patch \
-       $(THISAPP)-disk_geometry-1.patch grub-0.93-configfile.patch \
-       $(THISAPP)-256byte_inode-1.patch grub-0.94-installcopyonly.patch \
+objects = $(DL_FILE) \
+       grub-0.94-i2o.patch \
+       grub-0.95-moreraid.patch \
+       grub-0.93-special-device-names.patch \
+       grub-0.95-splash-error-term.patch \
+       grub-0.95-xpmjunk.patch \
+       grub-0.93-graphics-bootterm.patch \
+       grub-0.91-splashimagehelp.patch \
+       grub-0.95-graphics.patch \
+       $(THISAPP)-disk_geometry-1.patch \
+       grub-0.93-configfile.patch \
+       $(THISAPP)-256byte_inode-1.patch \
+       grub-0.94-installcopyonly.patch \
        $(THISAPP)-install.in.patch
 
-install : $(OBJECT)
+download: $(objects)
+
+info:
+       $(DO_PKG_INFO)
+
+install: $(OBJECT)
 
-download : $(objects)
+package:
+       @$(DO_PACKAGE)
 
-$(objects) :
+$(objects):
        @$(LOAD)
 
 ###############################################################################
 # Installation Details
 ###############################################################################
 
-$(OBJECT) : 
+$(OBJECT): $(objects)
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-disk_geometry-1.patch
        cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/grub-0.95-graphics.patch
        cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/grub-0.91-splashimagehelp.patch

diff --git a/lfs/gzip b/lfs/gzip
index 60691567a935aaf6021f55106e114ac14434826a..6cb041bd4496feaa38090417003529c5d0d62ca0 100644 (file)
--- a/lfs/gzip
+++ b/lfs/gzip
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007, 2008, 2009 Michael Tremer & Christian Schmidt           #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -26,6 +26,7 @@ include Config
 
 PKG_NAME   = gzip
 VER        = 1.3.12
+PKG_VER    = 0
 
 THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -33,6 +34,21 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
+MAINTAINER =
+GROUP      = Networking/Tools
+EXTRA      = no
+DEBUG      = no
+DEPS       =
+
+URL        = http://www.gzip.org/
+LICENSE    = GPLv2
+SHORT_DESC = The GNU data compression program.
+
+define LONG_DESC
+       The gzip package contains the popular GNU gzip data compression
+       program. Gzipped files have a .gz extension.
+endef
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -42,20 +58,26 @@ objects = $(DL_FILE) \
        $(THISAPP)-cve-2006-4337_len.patch \
        $(THISAPP)-cve-2006-4338.patch
 
-install : $(OBJECT)
+download: $(objects)
+
+info:
+       $(DO_PKG_INFO)
+
+install: $(OBJECT)
 
-download : $(objects)
+package:
+       @$(DO_PACKAGE)
 
-$(objects) :
+$(objects):
        @$(LOAD)
 
 ###############################################################################
 # Installation Details
 ###############################################################################
 
-$(OBJECT) : 
+$(OBJECT): $(objects)
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
 
 ifeq "$(STAGE)" "toolchain"    
        cd $(DIR_APP) && \

diff --git a/lfs/hal b/lfs/hal
index 2bc34aa5bbe6febb467d8c0500a6e0da0700970b..a577a31cda9d1649d0732d5e179f21fbc840b804 100644 (file)
--- a/lfs/hal
+++ b/lfs/hal
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007, 2008, 2009 Michael Tremer & Christian Schmidt           #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -26,14 +26,28 @@ include Config
 
 PKG_NAME   = hal
 VER        = 0.5.12rc1
+PKG_VER    = 0
 
 THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
+OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+
+MAINTAINER =
+GROUP      = System/Libraries
+EXTRA      = no
+DEBUG      = no
 DEPS       = dbus-glib parted pciutils perl-xml-parser python usbutils
 
-OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+URL        = http://www.freedesktop.org/Software/hal
+LICENSE    = AFL or GPLv2
+SHORT_DESC = Hardware Abstraction Layer.
+
+define LONG_DESC
+       HAL is daemon for collection and maintaining information from several \
+       sources about the hardware on the system.
+endef
 
 ###############################################################################
 # Top-level Rules
@@ -41,23 +55,26 @@ OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
 objects = $(DL_FILE)
 
+download: $(objects)
+
 info:
        $(DO_PKG_INFO)
 
 install: $(OBJECT)
 
-download : $(objects)
+package:
+       @$(DO_PACKAGE)
 
-$(objects) :
+$(objects):
        @$(LOAD)
 
 ###############################################################################
 # Installation Details
 ###############################################################################
 
-$(OBJECT) : 
+$(OBJECT): $(objects)
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && \
                ./configure \
                        $(CONFIGURE_ARCH) \

diff --git a/lfs/hal-info b/lfs/hal-info
index cdc59928abea7e8ffdac68aa40c3a1f604a44703..7e2afd7e550814775821ae2b36f683f9911a5065 100644 (file)
--- a/lfs/hal-info
+++ b/lfs/hal-info
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007, 2008, 2009 Michael Tremer & Christian Schmidt           #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -26,6 +26,7 @@ include Config
 
 PKG_NAME   = hal-info
 VER        = 20081219
+PKG_VER    = 0
 
 THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -33,29 +34,46 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
+MAINTAINER =
+GROUP      = System/Libraries
+EXTRA      = no
+DEBUG      = no
+DEPS       = hal
+
+URL        = http://www.freedesktop.org/Software/hal/
+LICENSE    = AFL or GPLv2
+SHORT_DESC = Device information files for HAL.
+
+define LONG_DESC
+       The hal-info package contains various device information files (also \
+       known as .fdi files) for the hal package.
+endef
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
 objects = $(DL_FILE)
 
+download: $(objects)
+
 info:
        $(DO_PKG_INFO)
 
 install: $(OBJECT)
 
-download : $(objects)
+package:
+       @$(DO_PACKAGE)
 
-$(objects) :
+$(objects):
        @$(LOAD)
 
 ###############################################################################
 # Installation Details
 ###############################################################################
 
-$(OBJECT) : 
+$(OBJECT): $(objects)
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && \
                ./configure \
                        $(CONFIGURE_ARCH) \

diff --git a/lfs/hdparm b/lfs/hdparm
index c40863c703ddfaba62b3e9e899a52b6b68349441..bf8f29f57b6a84fa8e4c201f6842f22d65ea69fc 100644 (file)
--- a/lfs/hdparm
+++ b/lfs/hdparm
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007, 2008, 2009 Michael Tremer & Christian Schmidt           #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -26,6 +26,7 @@ include Config
 
 PKG_NAME   = hdparm
 VER        = 9.6
+PKG_VER    = 0
 
 THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -33,29 +34,49 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
+MAINTAINER =
+GROUP      = Applications/Hardware
+EXTRA      = no
+DEBUG      = no
+DEPS       =
+
+URL        = http://sourceforge.net/projects/hdparm/
+LICENSE    = BSD
+SHORT_DESC = A utility for displaying and/or setting hard disk parameters.
+
+define LONG_DESC
+       Hdparm is a useful system utility for setting (E)IDE hard drive \
+       parameters. For example, hdparm can be used to tweak hard drive \
+       performance and to spin down hard drives for power conservation.
+endef
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
 objects = $(DL_FILE)
 
+download: $(objects)
+
 info:
        $(DO_PKG_INFO)
 
 install: $(OBJECT)
 
-download : $(objects)
+package:
+       @$(DO_PACKAGE)
 
-$(objects) :
+$(objects):
        @$(LOAD)
 
 ###############################################################################
 # Installation Details
 ###############################################################################
 
-$(OBJECT) : 
+$(OBJECT): $(objects)
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && sed -i -e "s/-O2/$(CFLAGS)/g" Makefile
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
        cd $(DIR_APP) && make binprefix=/usr/ install
        @rm -rf $(DIR_APP)

diff --git a/lfs/test-toolchain b/lfs/test-toolchain
index 2489254558f13bc96bcf03eb685900f1dff8ab07..6c0287d839993476570a76854968174ea5222416 100644 (file)
--- a/lfs/test-toolchain
+++ b/lfs/test-toolchain
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007, 2008, 2009 Michael Tremer & Christian Schmidt           #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -25,9 +25,10 @@
 include Config
 
 PKG_NAME   = test-toolchain
-VER        = LFS
+VER        =
+PKG_VER    = -1
 
-THISAPP    = $(PKG_NAME)-$(VER)
+THISAPP    = $(PKG_NAME)
 
 ifeq "$(STAGE)" "toolchain"
        OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)-pass$(PASS)
@@ -35,22 +36,44 @@ else
        OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 endif
 
+MAINTAINER =
+GROUP      =
+EXTRA      = no
+DEBUG      = no
+DEPS       =
+
+URL        =
+LICENSE    =
+SHORT_DESC = This script does some sanity checks on the toolchain.
+
+define LONG_DESC
+       This script does some sanity checks on the toolchain.
+endef
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
 objects = 
 
-install : $(OBJECT)
+download: $(objects)
+
+info:
+       $(DO_PKG_INFO)
+
+install: $(OBJECT)
 
-download : 
+package:
+       @$(DO_PACKAGE)
 
+$(objects):
+       @$(LOAD)
 
 ###############################################################################
 # Installation Details
 ###############################################################################
 
-$(OBJECT) : 
+$(OBJECT): $(objects)
        @$(PREBUILD)
 
 ifeq "$(STAGE)" "toolchain"

diff --git a/lfs/zlib b/lfs/zlib
index 6f8b6363ab3b62e564764f6c682c3a8005a27ac8..a1c50e937cc937f924e111656b14b903f479228d 100644 (file)
--- a/lfs/zlib
+++ b/lfs/zlib
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007, 2008, 2009 Michael Tremer & Christian Schmidt           #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -26,6 +26,7 @@ include Config
 
 PKG_NAME   = zlib
 VER        = 1.2.3
+PKG_VER    = 0
 
 THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP)-autotools-1.tar.gz
@@ -33,6 +34,21 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
+MAINTAINER =
+GROUP      = System/Libraries
+EXTRA      = no
+DEBUG      = no
+DEPS       =
+
+URL        = http://www.gzip.org/zlib/
+LICENSE    = zlib
+SHORT_DESC = The zlib compression and decompression library.
+
+define LONG_DESC
+       Zlib is a general-purpose, patent-free, lossless data compression \
+       library which is used by many different programs.
+endef
+
 CFLAGS    += -fPIC -DPIC
 
 ###############################################################################
@@ -42,20 +58,26 @@ CFLAGS    += -fPIC -DPIC
 objects = $(DL_FILE) \
        $(THISAPP)-autotools.patch
 
-install : $(OBJECT)
+download: $(objects)
+
+info:
+       $(DO_PKG_INFO)
+
+install: $(OBJECT)
 
-download : $(objects)
+package:
+       @$(DO_PACKAGE)
 
-$(objects) :
+$(objects):
        @$(LOAD)
 
 ###############################################################################
 # Installation Details
 ###############################################################################
 
-$(OBJECT) : 
+$(OBJECT): $(objects)
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
        #cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-autotools.patch
        #cd $(DIR_APP) && autoreconf --install