Added hal-info.

diff --git a/lfs/hal-info b/lfs/hal-info
new file mode 100644 (file)
index 0000000..d685074
--- /dev/null
+++ b/lfs/hal-info
@@ -0,0 +1,81 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+PKG_NAME   = hal-info
+VER        = 20080508
+
+THISAPP    = $(PKG_NAME)-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+
+TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+install: $(TARGET)
+
+download : $(objects)
+
+$(objects) :
+       @$(LOAD)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : 
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+
+ifeq "$(STAGE)" "$(SNAME)"
+       cd $(DIR_APP) && \
+               ./configure --prefix=/usr \
+                       --sysconfdir=/etc \
+                       --libexecdir=/usr/lib/hal \
+                       --localstatedir=/var
+       cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+       cd $(DIR_APP) && make install
+endif
+
+ifeq "$(STAGE)" "installer"
+       cd $(DIR_APP) && $(U_TOOLS) \
+               ./configure --prefix=/usr \
+                       --host=$(UCLIBC_TARGET) \
+                       --sysconfdir=/etc \
+                       --libexecdir=/usr/lib/hal \
+                       --localstatedir=/var \
+                       --disable-policy-kit \
+                       --with-hwdata=/usr/share
+       cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+       cd $(DIR_APP) && make install DESTDIR=$(INSTALLER_DIR)
+endif
+
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index e38d542c535ba8aa6405972e4c4eba97e04a8c91..5ea3a78c05d4c5fd9e9b1aea0831eaf3c10728e4 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -264,6 +264,7 @@ ipfire_build() {
        ipfire_make smartmontools
        ipfire_make lm-sensors
        ipfire_make hal
+       ipfire_make hal-info
 
        ### Building some important tools
        #
@@ -444,6 +445,7 @@ installer_build() {
        ipfire_make dbus
        ipfire_make dbus-glib
        ipfire_make hal
+       ipfire_make hal-info
        ipfire_make python
        ipfire_make python-modules
        ipfire_make slang

diff --git a/src/rootfiles/core/hal-info b/src/rootfiles/core/hal-info
new file mode 100644 (file)
index 0000000..ab0c551
--- /dev/null
+++ b/src/rootfiles/core/hal-info
@@ -0,0 +1,44 @@
+usr/share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi
+usr/share/hal/fdi/information/10freedesktop/10-cd-dvd-burner.fdi
+usr/share/hal/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi
+usr/share/hal/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi
+usr/share/hal/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi
+usr/share/hal/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
+usr/share/hal/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
+usr/share/hal/fdi/information/10freedesktop/10-modem.fdi
+usr/share/hal/fdi/information/10freedesktop/10-recall-battery-dell.fdi
+usr/share/hal/fdi/information/10freedesktop/10-recall-battery-fujitsu.fdi
+usr/share/hal/fdi/information/10freedesktop/10-recall-battery-gateway.fdi
+usr/share/hal/fdi/information/10freedesktop/10-recall-battery-ibm.fdi
+usr/share/hal/fdi/information/10freedesktop/10-recall-battery-lenovo.fdi
+usr/share/hal/fdi/information/10freedesktop/10-recall-battery-toshiba.fdi
+usr/share/hal/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi
+usr/share/hal/fdi/information/10freedesktop/10-thinkpad-rfkill-switch-bluetooth.fdi
+usr/share/hal/fdi/information/10freedesktop/10-usb-card-readers.fdi
+usr/share/hal/fdi/information/10freedesktop/10-usb-music-players.fdi
+usr/share/hal/fdi/information/10freedesktop/10-usb-pda.fdi
+usr/share/hal/fdi/information/10freedesktop/10-usb-zip-drives.fdi
+usr/share/hal/fdi/information/10freedesktop/10-usbcsr-mice.fdi
+usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
+usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
+usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
+usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
+usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
+usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
+usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
+usr/share/hal/fdi/information/10freedesktop/30-keymap-acer.fdi
+usr/share/hal/fdi/information/10freedesktop/30-keymap-compaq.fdi
+usr/share/hal/fdi/information/10freedesktop/30-keymap-dell.fdi
+usr/share/hal/fdi/information/10freedesktop/30-keymap-hp.fdi
+usr/share/hal/fdi/information/10freedesktop/30-keymap-lenovo.fdi
+usr/share/hal/fdi/information/10freedesktop/30-keymap-misc.fdi
+usr/share/hal/fdi/information/10freedesktop/30-keymap-module-asus-laptop.fdi
+usr/share/hal/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
+usr/share/hal/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
+usr/share/hal/fdi/preprobe/10osvendor/10-ide-drives.fdi
+usr/share/hal/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi

diff --git a/src/rootfiles/installer/hal-info b/src/rootfiles/installer/hal-info
new file mode 100644 (file)
index 0000000..204c236
--- /dev/null
+++ b/src/rootfiles/installer/hal-info
@@ -0,0 +1,44 @@
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/10-cd-dvd-burner.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/10-dell-rfkill-switch-wwan.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/10-ipw-rfkill-switch.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/10-modem.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/10-recall-battery-dell.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/10-recall-battery-fujitsu.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/10-recall-battery-gateway.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/10-recall-battery-ibm.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/10-recall-battery-lenovo.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/10-recall-battery-toshiba.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/10-thinkpad-rfkill-switch-bluetooth.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/10-usb-card-readers.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/10-usb-music-players.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/10-usb-pda.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/10-usb-zip-drives.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/10-usbcsr-mice.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-samsung.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-sony.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/30-keymap-acer.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/30-keymap-compaq.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/30-keymap-dell.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/30-keymap-hp.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/30-keymap-lenovo.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/30-keymap-misc.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/30-keymap-module-asus-laptop.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/30-keymap-module-sony-laptop.fdi
+INSTALLER_DIR/usr/share/hal/fdi/information/10freedesktop/30-keymap-module-thinkpad-acpi.fdi
+INSTALLER_DIR/usr/share/hal/fdi/preprobe/10osvendor/10-ide-drives.fdi
+INSTALLER_DIR/usr/share/hal/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi