webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

hwinfo in den Installer gebracht.

Browse Source 
(Erstmal nur in das Image...)


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@446 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-03-11 20:20:29 +00:00
parent 76ed51e8f6
commit c5568d645a
10 changed files with 64 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/packages-list.txt
View File

@@ -106,6 +106,7 @@
* httpd-2.2.2
* hwdata-0.191
* hwinfo-12.29
* hwinfo-ipfire
* iana-etc-2.10
* ibod
* iftop-0.17
@@ -188,7 +189,6 @@
* 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

14
lfs/dbus
View File

@@ -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"
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
cd $(DIR_APP) && make
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
endif
@rm -rf $(DIR_APP)

15
lfs/hal
View File

@@ -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"
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
cd $(DIR_APP) && make
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
install -v -m755 -d /var/run/hald
endif

6
lfs/hwinfo
View File

@@ -26,7 +26,7 @@
include Config
VER = 12.29
VER = ipfire
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"
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

2
lfs/kudzu
View File

@@ -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
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

17
lfs/libxml2
View File

@@ -32,9 +32,11 @@ THISAPP = libxml2-$(VER)
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
@@ -54,9 +56,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
dist:
@$(PAK)
###############################################################################
# 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)
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
endif
@rm -rf $(DIR_APP)
@$(POSTBUILD)

19
lfs/sysfsutils
View File

@@ -33,16 +33,10 @@ DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
ifeq "$(PASS)" "install"
ifeq "$(LFS_PASS)" "install"
TARGET = $(DIR_INFO)/$(THISAPP)-install
EXTRA_CONFIG = --prefix="" --disable-shared
EXTRA_MAKE =
EXTRA_INSTALL = DESTDIR=/install
else
TARGET = $(DIR_INFO)/$(THISAPP)
EXTRA_CONFIG = --prefix=""
EXTRA_MAKE =
EXTRA_INSTALL =
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"
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
mv -v /opt/$(MACHINE)-uClibc/usr/include/sysfs /opt/$(MACHINE)-uClibc/include
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)

13
lfs/zlib
View File

@@ -32,7 +32,11 @@ THISAPP = zlib-$(VER)
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
###############################################################################
@@ -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)
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
@@ -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
endif
@rm -rf $(DIR_APP)
@$(POSTBUILD)

9
make.sh
View File

@@ -410,7 +410,6 @@ buildipfire() {
ipfiremake isapnptools
# ipfiremake isdn4k-utils # What about mISDN???
ipfiremake hwdata
ipfiremake dbus
ipfiremake kudzu
ipfiremake logrotate
ipfiremake logwatch
@@ -442,6 +441,8 @@ buildipfire() {
ipfiremake Text-Tabs+Wrap
ipfiremake Locale-Country
ipfiremake XML-Parser
ipfiremake glib
ipfiremake dbus
ipfiremake hal
ipfiremake hwinfo
ipfiremake GeoIP
@@ -471,7 +472,6 @@ buildipfire() {
ipfiremake spandsp
ipfiremake lzo
ipfiremake openvpn
ipfiremake glib
ipfiremake pammysql
ipfiremake xinetd
ipfiremake ghostscript
@@ -561,7 +561,12 @@ buildinstaller() {
installmake sysfsutils
installmake util-linux
installmake pciutils
installmake zlib
installmake libxml2
installmake dbus
installmake hal
installmake hwdata
installmake hwinfo
installmake kudzu
installmake installer
installmake initrd

9
src/hwinfo/src/int10/i10_v86.c
View File

@@ -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 SET_LWECX_ZERO (prefix66 ^ prefix67 ? (CPU_REG(ecx) = 0) : (CPU_REG_LW(ecx) = 0))
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));
if (is_rep) LWECX = 0;
if (is_rep) SET_LWECX_ZERO;
CPU_REG_LW(eip)++;
break;
@@ -249,7 +250,7 @@ vm86_GP_fault(void)
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;
@@ -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));
if (is_rep) LWECX = 0;
if (is_rep) SET_LWECX_ZERO;
CPU_REG_LW(eip)++;
break;
@@ -278,7 +279,7 @@ vm86_GP_fault(void)
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;