hwinfo in den Installer gebracht.

(Erstmal nur in das Image...)

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@446 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index faf089dfba703383d3aff3ea91e363cc0aed405f..7e855dfb6370811a7ee20f9e625bbc9cfa384f8b 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -106,6 +106,7 @@
 * httpd-2.2.2
 * hwdata-0.191
 * hwinfo-12.29
 * httpd-2.2.2
 * hwdata-0.191
 * hwinfo-12.29

+* hwinfo-ipfire

 * iana-etc-2.10
 * ibod
 * iftop-0.17
 * iana-etc-2.10
 * ibod
 * iftop-0.17


@@ -188,7 +189,6 @@
 * openssh-4.3p2
 * openssl-0.9.8d
 * openswan-2.4.7
 * openssh-4.3p2
 * openssl-0.9.8d
 * openswan-2.4.7

-* openswan-2.4.8rc1

 * openvpn-2.0.9
 * pam_mysql-0.7RC1
 * patch-2.5.4
 * openvpn-2.0.9
 * pam_mysql-0.7RC1
 * patch-2.5.4

diff --git a/lfs/dbus b/lfs/dbus
index 781febc08014f78e871e24488b1e811d1166b87b..57a0880618bb8aa2ef772bdfc14e4600c5354567 100644 (file)
--- a/lfs/dbus
+++ b/lfs/dbus
@@ -77,16 +77,16 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 ifeq "$(LFS_PASS)" "install"
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 ifeq "$(LFS_PASS)" "install"

-       cd $(DIR_APP) && patch -N < $(DIR_SRC)/src/patches/kudzu-link-lintl.diff
-       cd $(DIR_APP) && make RPM_OPT_FLAGS="$CFLAGS -I/opt/$(MACHINE)-uClibc/include" \
-               ARCH=$(MACHINE)
-       cd $(DIR_APP) && install -m 0755 kudzu /install/initrd/bin/kudzu
-       cd $(DIR_APP) && install -m 0644 libkudzu.a /install/initrd/lib
-       cd $(DIR_APP) && install -m 0644 libkudzu_loader.a /install/initrd/lib
+       cd $(DIR_APP) && CPPFLAGS="-I/opt/$(MACHINE)-uClibc/include" \
+                          ./configure --prefix=/opt/$(MACHINE)-uClibc --sysconfdir=/etc \
+                          --localstatedir=/var --disable-python \
+                          --disable-glib --disable-shared
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install

 else
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
             --localstatedir=/var --disable-python
 else
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
             --localstatedir=/var --disable-python

-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING)

        cd $(DIR_APP) && make install
 endif
        @rm -rf $(DIR_APP)
        cd $(DIR_APP) && make install
 endif
        @rm -rf $(DIR_APP)

diff --git a/lfs/hal b/lfs/hal
index 2b4aef5d649a2779515ec2cb020899dc4a811812..46a1f6e6a898703a6591efa027d02fdb61eba6f6 100644 (file)
--- a/lfs/hal
+++ b/lfs/hal
@@ -77,16 +77,17 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 ifeq "$(LFS_PASS)" "install"
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 ifeq "$(LFS_PASS)" "install"

-       cd $(DIR_APP) && patch -N < $(DIR_SRC)/src/patches/kudzu-link-lintl.diff
-       cd $(DIR_APP) && make RPM_OPT_FLAGS="$CFLAGS -I/opt/$(MACHINE)-uClibc/include" \
-               ARCH=$(MACHINE)
-       cd $(DIR_APP) && install -m 0755 kudzu /install/initrd/bin/kudzu
-       cd $(DIR_APP) && install -m 0644 libkudzu.a /install/initrd/lib
-       cd $(DIR_APP) && install -m 0644 libkudzu_loader.a /install/initrd/lib
+       cd $(DIR_APP) && CPPFLAGS="-I/opt/$(MACHINE)-uClibc/include" \
+                          ./configure --prefix=/opt/$(MACHINE)-uClibc \
+                          --disable-shared --disable-glib --disable-policy-kit \
+                          --disable-acpi-proc --disable-acpi-acpid
+       cd $(DIR_APP)/libhal && make $(MAKETUNING)
+       cd $(DIR_APP)/libhal && make install
+       install -v -m755 -d /opt/$(MACHINE)-uClibc/var/run/hald

 else
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
                                --libexecdir=/usr/lib/hal --localstatedir=/var
 else
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
                                --libexecdir=/usr/lib/hal --localstatedir=/var

-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make $(MAKETUNING)

        cd $(DIR_APP) && make install
        install -v -m755 -d /var/run/hald
 endif
        cd $(DIR_APP) && make install
        install -v -m755 -d /var/run/hald
 endif

diff --git a/lfs/hwinfo b/lfs/hwinfo
index 4f0f40f4b31b7d811c5e2d764e1cac3771d07654..51c330764a58323a3b0a46297cd809e38cf3cc35 100644 (file)
--- a/lfs/hwinfo
+++ b/lfs/hwinfo
@@ -26,7 +26,7 @@
 
 include Config
 
 
 include Config
 

-VER        = 12.29
+VER        = ipfire

 
 THISAPP    = hwinfo-$(VER)
 DIR_APP    = $(DIR_SRC)/hwinfo
 
 THISAPP    = hwinfo-$(VER)
 DIR_APP    = $(DIR_SRC)/hwinfo


@@ -56,6 +56,10 @@ $(TARGET) :
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cp -av $(DIR_SRC)/src/hwinfo $(DIR_SRC)
 ifeq "$(LFS_PASS)" "install"
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cp -av $(DIR_SRC)/src/hwinfo $(DIR_SRC)
 ifeq "$(LFS_PASS)" "install"

+       cd $(DIR_APP) && make CC="/opt/$(MACHINE)-uClibc/bin/$(MACHINE)-linux-gcc -I/opt/$(MACHINE)-uClibc/include" \
+               EXTRA_FLAGS="-fno-pic -DUCLIBC" \
+               SHARED_FLAGS= LIBS="-lhd -lsysfs"
+       install -m 755 hwinfo /install/initrd/sbin

 else
        cd $(DIR_APP) && make tinystatic
        cd $(DIR_APP) && make tinystaticinstall
 else
        cd $(DIR_APP) && make tinystatic
        cd $(DIR_APP) && make tinystaticinstall

diff --git a/lfs/kudzu b/lfs/kudzu
index c57bac8d343ac9a58cd70c28dcb3597eb0edd212..d8d64c16c1f20aac3a5ee10755438748e95c19ab 100644 (file)
--- a/lfs/kudzu
+++ b/lfs/kudzu
@@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 ifeq "$(LFS_PASS)" "install"
        cd $(DIR_APP) && patch -N < $(DIR_SRC)/src/patches/kudzu-link-lintl.diff
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 ifeq "$(LFS_PASS)" "install"
        cd $(DIR_APP) && patch -N < $(DIR_SRC)/src/patches/kudzu-link-lintl.diff

-       cd $(DIR_APP) && make RPM_OPT_FLAGS="$CFLAGS -I/opt/$(MACHINE)-uClibc/include" \
+       cd $(DIR_APP) && make RPM_OPT_FLAGS="$(CFLAGS) -I/opt/$(MACHINE)-uClibc/include" \

                ARCH=$(MACHINE)
        cd $(DIR_APP) && install -m 0755 kudzu /install/initrd/bin/kudzu
        cd $(DIR_APP) && install -m 0644 libkudzu.a /install/initrd/lib
                ARCH=$(MACHINE)
        cd $(DIR_APP) && install -m 0755 kudzu /install/initrd/bin/kudzu
        cd $(DIR_APP) && install -m 0644 libkudzu.a /install/initrd/lib

diff --git a/lfs/libxml2 b/lfs/libxml2
index e70afe1dcab6c85c5285fdcbd2c9b12ce4e98320..be15f8307e136b6db8818e9bb1d03719f7ad5025 100644 (file)
--- a/lfs/libxml2
+++ b/lfs/libxml2
@@ -32,9 +32,11 @@ THISAPP    = libxml2-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)

-TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = libxml2
-PAK_VER    = ipfire-beta1
+ifeq "$(LFS_PASS)" "install"
+  TARGET     = $(DIR_INFO)/$(THISAPP)-install
+else
+  TARGET     = $(DIR_INFO)/$(THISAPP)
+endif

 
 ###############################################################################
 # Top-level Rules
 
 ###############################################################################
 # Top-level Rules


@@ -54,9 +56,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
 
 md5 : $(subst %,%_MD5,$(objects))
 

-dist: 
-       @$(PAK)
-

 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################


@@ -77,8 +76,14 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)

+ifeq "$(LFS_PASS)" "install"
+       cd $(DIR_APP) && ./configure --prefix=/ --disable-shared
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install DESTDIR=/opt/$(MACHINE)-uClibc
+else

        cd $(DIR_APP) && ./configure --prefix=/usr
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        cd $(DIR_APP) && ./configure --prefix=/usr
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install

+endif

        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/sysfsutils b/lfs/sysfsutils
index a8d418da7e20048691862c06886c37f9cfd3b23e..4deb03fcd68c52211a435d3dff0af948aa29a795 100644 (file)
--- a/lfs/sysfsutils
+++ b/lfs/sysfsutils
@@ -33,16 +33,10 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 

-ifeq "$(PASS)" "install"
+ifeq "$(LFS_PASS)" "install"

        TARGET = $(DIR_INFO)/$(THISAPP)-install
        TARGET = $(DIR_INFO)/$(THISAPP)-install

-       EXTRA_CONFIG = --prefix="" --disable-shared
-       EXTRA_MAKE =
-       EXTRA_INSTALL = DESTDIR=/install

 else
        TARGET = $(DIR_INFO)/$(THISAPP)
 else
        TARGET = $(DIR_INFO)/$(THISAPP)

-       EXTRA_CONFIG = --prefix=""
-       EXTRA_MAKE =
-       EXTRA_INSTALL =

 endif
 
 ###############################################################################
 endif
 
 ###############################################################################


@@ -84,13 +78,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 ifeq "$(LFS_PASS)" "install"
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 ifeq "$(LFS_PASS)" "install"

-       cd $(DIR_APP) && ./configure --disable-shared --prefix="" $(EXTRA_CONFIG)
-       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_APP) && ./configure --prefix="" --disable-shared
+       cd $(DIR_APP) && make $(MAKETUNING)

        cd $(DIR_APP) && make DESTDIR=/opt/$(MACHINE)-uClibc install
        cd $(DIR_APP) && make DESTDIR=/opt/$(MACHINE)-uClibc install

+       mv -v /opt/$(MACHINE)-uClibc/usr/include/sysfs /opt/$(MACHINE)-uClibc/include

 else
 else

-       cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
-       cd $(DIR_APP) && make $(EXTRA_MAKE)
-       cd $(DIR_APP) && make $(EXTRA_INSTALL) install
+       cd $(DIR_APP) && ./configure --prefix=""
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install

 endif
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
 endif
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/zlib b/lfs/zlib
index 9a72a410a19d19e853d760ba98c84195706d5e01..6f8b00bc0570883cd3086e7220708c4f65cd8cd8 100644 (file)
--- a/lfs/zlib
+++ b/lfs/zlib
@@ -32,7 +32,11 @@ THISAPP    = zlib-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)

-TARGET     = $(DIR_INFO)/$(THISAPP)
+ifeq "$(LFS_PASS)" "install"
+  TARGET     = $(DIR_INFO)/$(THISAPP)-install
+else
+  TARGET     = $(DIR_INFO)/$(THISAPP)
+endif

 CFLAGS    += -fPIC
 
 ###############################################################################
 CFLAGS    += -fPIC
 
 ###############################################################################


@@ -72,6 +76,12 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)

+ifeq "$(LFS_PASS)" "install"
+       cd $(DIR_APP) && ./configure --prefix=/opt/$(MACHINE)-uClibc    
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+       chmod -v 644 /opt/$(MACHINE)-uClibc/lib/libz.a
+else

        cd $(DIR_APP) && ./configure --prefix=/usr --shared --libdir=/lib
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        cd $(DIR_APP) && ./configure --prefix=/usr --shared --libdir=/lib
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install


@@ -82,5 +92,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        chmod -v 644 /usr/lib/libz.a
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        chmod -v 644 /usr/lib/libz.a

+endif

        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index a899f1a9d973fd60e559181ace1bca0bc719adcc..e40b02a10e264fa3945f8a3731b4414c06163afe 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -410,7 +410,6 @@ buildipfire() {
   ipfiremake isapnptools
 #  ipfiremake isdn4k-utils # What about mISDN???
   ipfiremake hwdata
   ipfiremake isapnptools
 #  ipfiremake isdn4k-utils # What about mISDN???
   ipfiremake hwdata

-  ipfiremake dbus

   ipfiremake kudzu
   ipfiremake logrotate
   ipfiremake logwatch
   ipfiremake kudzu
   ipfiremake logrotate
   ipfiremake logwatch


@@ -442,6 +441,8 @@ buildipfire() {
   ipfiremake Text-Tabs+Wrap
   ipfiremake Locale-Country
   ipfiremake XML-Parser
   ipfiremake Text-Tabs+Wrap
   ipfiremake Locale-Country
   ipfiremake XML-Parser

+  ipfiremake glib
+  ipfiremake dbus

   ipfiremake hal
   ipfiremake hwinfo
   ipfiremake GeoIP
   ipfiremake hal
   ipfiremake hwinfo
   ipfiremake GeoIP


@@ -471,7 +472,6 @@ buildipfire() {
   ipfiremake spandsp
   ipfiremake lzo
   ipfiremake openvpn
   ipfiremake spandsp
   ipfiremake lzo
   ipfiremake openvpn

-  ipfiremake glib

   ipfiremake pammysql
   ipfiremake xinetd
   ipfiremake ghostscript
   ipfiremake pammysql
   ipfiremake xinetd
   ipfiremake ghostscript


@@ -561,7 +561,12 @@ buildinstaller() {
   installmake sysfsutils
   installmake util-linux
   installmake pciutils
   installmake sysfsutils
   installmake util-linux
   installmake pciutils

+  installmake zlib
+  installmake libxml2
+  installmake dbus
+  installmake hal

   installmake hwdata
   installmake hwdata

+  installmake hwinfo

   installmake kudzu
   installmake installer
   installmake initrd
   installmake kudzu
   installmake installer
   installmake initrd

diff --git a/src/hwinfo/src/int10/i10_v86.c b/src/hwinfo/src/int10/i10_v86.c
index 8fcdef160cacff676246ea60ba4c4681b7c98256..13fe52d8f502f1cf91c24768be6eaa9b34e81b08 100644 (file)
--- a/src/hwinfo/src/int10/i10_v86.c
+++ b/src/hwinfo/src/int10/i10_v86.c
@@ -179,6 +179,7 @@ do_x86(unsigned long bios_start, i86biosRegsPtr regs, int cpuemu)
 #define LIN_PREF_SI  ((pref_seg << 4) + CPU_REG_LW(esi))
 
 #define LWECX       (prefix66 ^ prefix67 ? CPU_REG(ecx) : CPU_REG_LW(ecx))
 #define LIN_PREF_SI  ((pref_seg << 4) + CPU_REG_LW(esi))
 
 #define LWECX       (prefix66 ^ prefix67 ? CPU_REG(ecx) : CPU_REG_LW(ecx))

+#define SET_LWECX_ZERO (prefix66 ^ prefix67 ? (CPU_REG(ecx) = 0) : (CPU_REG_LW(ecx) = 0))

 
 static int
 vm86_GP_fault(void)
 
 static int
 vm86_GP_fault(void)


@@ -230,7 +231,7 @@ vm86_GP_fault(void)
                                                                                SEG_ADR((CARD8 *),es,di),
                                                                                CPU_REG_LW(eflags)&DF,
                                                                                (is_rep? LWECX:1));
                                                                                SEG_ADR((CARD8 *),es,di),
                                                                                CPU_REG_LW(eflags)&DF,
                                                                                (is_rep? LWECX:1));

-               if (is_rep) LWECX = 0;
+               if (is_rep) SET_LWECX_ZERO;

                CPU_REG_LW(eip)++;
                break;
 
                CPU_REG_LW(eip)++;
                break;
 


@@ -249,7 +250,7 @@ vm86_GP_fault(void)
                                                                                        CPU_REG_LW(eflags)&DF,
                                                                                        (is_rep? LWECX:1));
                }
                                                                                        CPU_REG_LW(eflags)&DF,
                                                                                        (is_rep? LWECX:1));
                }

-               if (is_rep) LWECX = 0;
+               if (is_rep) SET_LWECX_ZERO;

                CPU_REG_LW(eip)++;
                break;
 
                CPU_REG_LW(eip)++;
                break;
 


@@ -259,7 +260,7 @@ vm86_GP_fault(void)
                CPU_REG_LW(esi) += port_rep_outb(CPU_REG_LW(edx),(CARD8*)INT2PTR(LIN_PREF_SI),
                                                                                 CPU_REG_LW(eflags)&DF,
                                                                                 (is_rep? LWECX:1));
                CPU_REG_LW(esi) += port_rep_outb(CPU_REG_LW(edx),(CARD8*)INT2PTR(LIN_PREF_SI),
                                                                                 CPU_REG_LW(eflags)&DF,
                                                                                 (is_rep? LWECX:1));

-               if (is_rep) LWECX = 0;
+               if (is_rep) SET_LWECX_ZERO;

                CPU_REG_LW(eip)++;
                break;
 
                CPU_REG_LW(eip)++;
                break;
 


@@ -278,7 +279,7 @@ vm86_GP_fault(void)
                                                                                         CPU_REG_LW(eflags)&DF,
                                                                                         (is_rep? LWECX:1));
                } 
                                                                                         CPU_REG_LW(eflags)&DF,
                                                                                         (is_rep? LWECX:1));
                } 

-               if (is_rep) LWECX = 0;
+               if (is_rep) SET_LWECX_ZERO;

                CPU_REG_LW(eip)++;
                break;
 
                CPU_REG_LW(eip)++;
                break;