(Erstmal nur in das Image...)
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@446
ea5c0bd1-69bd-2848-81d8-
4f18e57aeed8
* httpd-2.2.2
* hwdata-0.191
* hwinfo-12.29
* httpd-2.2.2
* hwdata-0.191
* hwinfo-12.29
* iana-etc-2.10
* ibod
* iftop-0.17
* iana-etc-2.10
* ibod
* iftop-0.17
* openssh-4.3p2
* openssl-0.9.8d
* openswan-2.4.7
* openssh-4.3p2
* openssl-0.9.8d
* openswan-2.4.7
* openvpn-2.0.9
* pam_mysql-0.7RC1
* patch-2.5.4
* openvpn-2.0.9
* pam_mysql-0.7RC1
* patch-2.5.4
@$(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 $(MAKETUNING)
cd $(DIR_APP) && make install
endif
@rm -rf $(DIR_APP)
cd $(DIR_APP) && make install
endif
@rm -rf $(DIR_APP)
@$(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 $(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
THISAPP = hwinfo-$(VER)
DIR_APP = $(DIR_SRC)/hwinfo
THISAPP = hwinfo-$(VER)
DIR_APP = $(DIR_SRC)/hwinfo
@$(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
@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
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
md5 : $(subst %,%_MD5,$(objects))
md5 : $(subst %,%_MD5,$(objects))
###############################################################################
# Downloading, checking, md5sum
###############################################################################
###############################################################################
# Downloading, checking, md5sum
###############################################################################
$(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
@rm -rf $(DIR_APP)
@$(POSTBUILD)
@rm -rf $(DIR_APP)
@$(POSTBUILD)
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
###############################################################################
@$(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
- 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)
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
###############################################################################
$(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
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
@rm -rf $(DIR_APP)
@$(POSTBUILD)
@rm -rf $(DIR_APP)
@$(POSTBUILD)
ipfiremake isapnptools
# ipfiremake isdn4k-utils # What about mISDN???
ipfiremake hwdata
ipfiremake isapnptools
# ipfiremake isdn4k-utils # What about mISDN???
ipfiremake hwdata
ipfiremake kudzu
ipfiremake logrotate
ipfiremake logwatch
ipfiremake kudzu
ipfiremake logrotate
ipfiremake logwatch
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
ipfiremake spandsp
ipfiremake lzo
ipfiremake openvpn
ipfiremake spandsp
ipfiremake lzo
ipfiremake openvpn
ipfiremake pammysql
ipfiremake xinetd
ipfiremake ghostscript
ipfiremake pammysql
ipfiremake xinetd
ipfiremake ghostscript
installmake sysfsutils
installmake util-linux
installmake pciutils
installmake sysfsutils
installmake util-linux
installmake pciutils
+ installmake zlib
+ installmake libxml2
+ installmake dbus
+ installmake hal
installmake kudzu
installmake installer
installmake initrd
installmake kudzu
installmake installer
installmake initrd
#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)
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) SET_LWECX_ZERO;
CPU_REG_LW(eip)++;
break;
CPU_REG_LW(eip)++;
break;
CPU_REG_LW(eflags)&DF,
(is_rep? LWECX:1));
}
CPU_REG_LW(eflags)&DF,
(is_rep? LWECX:1));
}
+ if (is_rep) SET_LWECX_ZERO;
CPU_REG_LW(eip)++;
break;
CPU_REG_LW(eip)++;
break;
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) SET_LWECX_ZERO;
CPU_REG_LW(eip)++;
break;
CPU_REG_LW(eip)++;
break;
CPU_REG_LW(eflags)&DF,
(is_rep? LWECX:1));
}
CPU_REG_LW(eflags)&DF,
(is_rep? LWECX:1));
}
+ if (is_rep) SET_LWECX_ZERO;
CPU_REG_LW(eip)++;
break;
CPU_REG_LW(eip)++;
break;