diff options
58 files changed, 166413 insertions, 70 deletions
diff --git a/mk/build.mk b/mk/build.mk index eaf547c0b..156555af3 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -131,7 +131,7 @@ endif ${STAGING_TARGET_DIR} ${STAGING_TARGET_DIR}/etc ${STAGING_HOST_DIR}: mkdir -p ${STAGING_TARGET_DIR}/{bin,etc,lib,usr/include,usr/lib} \ - ${STAGING_HOST_DIR}/{bin,lib} + ${STAGING_HOST_DIR}/{bin,lib,usr/bin,usr/lib} ${STAGING_TARGET_DIR}/etc/ipkg.conf: ${STAGING_TARGET_DIR}/etc ifeq ($(ADK_TARGET_PACKAGE_IPKG),y) diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index 50b8c4056..1741c62d0 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -1,3 +1,3 @@ -KERNEL_VERSION:= 2.6.36 +KERNEL_VERSION:= 2.6.37 KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 61f3739a73afb6914cb007f37fb09b62 +KERNEL_MD5SUM:= c8ee37b4fdccdb651e0603d35350b434 diff --git a/mk/package.mk b/mk/package.mk index e42ced661..cab7b6947 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -75,9 +75,12 @@ MAKE_ENV+= PATH='${TARGET_PATH}' \ ${HOST_CONFIGURE_OPTS} \ CC='${TARGET_CC}' \ CXX='${TARGET_CXX}' \ + LD='${TARGET_LD}' \ AR='${TARGET_CROSS}ar' \ RANLIB='${TARGET_CROSS}ranlib' \ NM='${TARGET_CROSS}nm' \ + OBJCOPY='${TARGET_CROSS}objcopy' \ + RANLIB='${TARGET_CROSS}ranlib' \ STRIP='${TARGET_CROSS}strip' \ CROSS="$(TARGET_CROSS)" endif diff --git a/mk/python.mk b/mk/python.mk index e0fce5f0e..5767b12f7 100644 --- a/mk/python.mk +++ b/mk/python.mk @@ -1,3 +1,3 @@ PYTHON_VERSION=2.7 -PYTHON_LIBDIR:=$(STAGING_HOST_DIR)/lib -PYTHON:=${STAGING_HOST_DIR}/bin/hostpython +PYTHON_LIBDIR:=$(STAGING_HOST_DIR)/usr/lib +PYTHON:=${STAGING_HOST_DIR}/usr/bin/hostpython diff --git a/mk/vars.mk b/mk/vars.mk index 6a0f50a2f..8bbb7765b 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -51,7 +51,7 @@ BIN_DIR_PFX:= $(BASE_DIR)/bin PACKAGE_DIR:= $(BIN_DIR)/packages TARGET_DIR:= $(BASE_DIR)/root_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC} TARGET_DIR_PFX:= $(BASE_DIR)/root_* -TARGET_PATH= ${SCRIPT_DIR}:${TOOLS_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_TARGET_DIR}/scripts:${_PATH} +TARGET_PATH= ${SCRIPT_DIR}:${TOOLS_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${STAGING_TARGET_DIR}/scripts:${_PATH} REAL_GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX) GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux ifeq ($(ADK_NATIVE),y) diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile index 7a289205e..e75ae7f9f 100644 --- a/package/gnutls/Makefile +++ b/package/gnutls/Makefile @@ -33,6 +33,7 @@ $(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${ CONFIGURE_ARGS+= --without-libopencdk-prefix \ --disable-camellia \ --with-libgcrypt-prefix=${STAGING_TARGET_DIR}/usr \ + --disable-rpath \ --without-libz-prefix post-install: diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile index 4d2a13eb6..4d7ecafa5 100644 --- a/package/heimdal/Makefile +++ b/package/heimdal/Makefile @@ -79,23 +79,21 @@ ifeq ($(ADK_HOST_CYGWIN),y) EXEEXT:= .exe endif -pre-configure: +post-extract: (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ - env CFLAGS="-static" LDFLAGS="-static" \ ./configure --prefix=$(STAGING_HOST_DIR) \ --disable-pk-init \ --without-openldap \ --disable-sqlite-cache \ --disable-otp \ - --enable-static \ - --disable-shared \ ); ${MAKE} -C ${WRKBUILD}/include ${MAKE} -C ${WRKBUILD}/lib/roken ${MAKE} -C ${WRKBUILD}/lib/vers ${MAKE} -C ${WRKBUILD}/lib/editline - ${MAKE} -C ${WRKBUILD}/lib/asn1 asn1_compile$(EXEEXT) - ${MAKE} -C ${WRKBUILD}/lib/sl slc$(EXEEXT) + env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/lib/com_err compile_et$(EXEEXT) + env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/lib/asn1 asn1_compile$(EXEEXT) + env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/lib/sl slc$(EXEEXT) ${MAKE} -C ${WRKBUILD}/lib/roken install ${MAKE} -C ${WRKBUILD}/lib/asn1 install ${MAKE} -C ${WRKBUILD}/lib/sl install diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index 90b27a057..f0c815e59 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -41,18 +41,21 @@ $(eval $(call PKG_template,SS,ss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_SS},${PK TCFLAGS+= -D_GNU_SOURCE XAKE_FLAGS+= CCOPTS="${TCFLAGS}" MFLAGS="CC=${TARGET_CC}" \ HOSTCFLAGS="-I${LINUX_HEADER_DIR}/include" - CONFIGURE_FLAGS+= KERNEL_INCLUDE="${LINUX_DIR}/include" +post-configure: + $(CP) ./files/Config $(WRKBUILD)/ + ip-install: ${INSTALL_DIR} ${IDIR_IP}/{etc/iproute2,usr/sbin} ${INSTALL_DATA} ${WRKINST}/etc/iproute2/* ${IDIR_IP}/etc/iproute2/ ${INSTALL_BIN} ${WRKINST}/sbin/ip ${IDIR_IP}/usr/sbin/ip tc-install: - ${INSTALL_DIR} ${IDIR_TC}/{lib/tc,usr/sbin} + ${INSTALL_DIR} ${IDIR_TC}/{lib/tc,usr/sbin,usr/lib/tc} # use ${CP} here, since m_ipt.so is a symlink to m_xt.so - ${CP} ${WRKINST}/lib/tc/{m_*.so,*.dist} ${IDIR_TC}/lib/tc/ + ${CP} ${WRKINST}/lib/tc/m_*.so ${IDIR_TC}/lib/tc/ + ${CP} ${WRKINST}/usr/lib/tc/*.dist ${IDIR_TC}/usr/lib/tc/ ${INSTALL_BIN} ${WRKINST}/sbin/tc ${IDIR_TC}/usr/sbin/ tc-atm-install: diff --git a/package/iproute2/files/Config b/package/iproute2/files/Config new file mode 100644 index 000000000..0ba7d387d --- /dev/null +++ b/package/iproute2/files/Config @@ -0,0 +1,2 @@ +TC_CONFIG_ATM:=y +TC_CONFIG_XT:=y diff --git a/package/iproute2/patches/patch-tc_Makefile b/package/iproute2/patches/patch-tc_Makefile deleted file mode 100644 index 29a11b40b..000000000 --- a/package/iproute2/patches/patch-tc_Makefile +++ /dev/null @@ -1,18 +0,0 @@ - yeah, right. Disabling everything with echo-statements is really useful. ---- iproute2-2.6.34.orig/tc/Makefile 2010-05-19 17:32:43.000000000 +0200 -+++ iproute2-2.6.34/tc/Makefile 2011-01-03 18:28:02.980563959 +0100 -@@ -99,10 +99,11 @@ libtc.a: $(TCLIB) - $(AR) rcs $@ $(TCLIB) - - install: all -- echo mkdir -p $(MODDESTDIR) -- echo install -m 0755 tc $(DESTDIR)$(SBINDIR) -+ mkdir -p $(MODDESTDIR) -+ mkdir -p $(DESTDIR)$(SBINDIR) -+ install -m 0755 tc $(DESTDIR)$(SBINDIR) - for i in $(TCSO); \ -- do echo install -m 755 $$i $(MODDESTDIR); \ -+ do install -m 755 $$i $(MODDESTDIR); \ - done - if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \ - if [ -f $(MODDESTDIR)/m_xt.so ]; \ diff --git a/package/iptables-snmp/patches/patch-Makefile_in b/package/iptables-snmp/patches/patch-Makefile_in new file mode 100644 index 000000000..164003986 --- /dev/null +++ b/package/iptables-snmp/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- iptables-snmp-0.1.orig/Makefile.in 2005-11-02 13:00:10.000000000 +0100 ++++ iptables-snmp-0.1/Makefile.in 2011-01-12 15:44:48.000000000 +0100 +@@ -67,7 +67,7 @@ OTHER = -Iinclude -DIPTABLES_VERSION=$( + + all: iptables-snmp.so + +-iptables-snmp.so: $(OBJS) libiptc.a Makefile ++iptables-snmp.so: $(OBJS) Makefile + $(CC) $(CFLAGS) $(OTHER) $(DFLAGS) -shared -o $@ $(OBJS) $(LDFLAGS) + + libiptc.a: $(LIBIPTC_OBJS) Makefile diff --git a/package/iptables-snmp/patches/patch-iptables-snmp_c b/package/iptables-snmp/patches/patch-iptables-snmp_c new file mode 100644 index 000000000..c129ff0e9 --- /dev/null +++ b/package/iptables-snmp/patches/patch-iptables-snmp_c @@ -0,0 +1,12 @@ +--- iptables-snmp-0.1.orig/iptables-snmp.c 2005-11-02 12:10:54.000000000 +0100 ++++ iptables-snmp-0.1/iptables-snmp.c 2011-01-12 15:46:19.000000000 +0100 +@@ -37,6 +37,9 @@ + + #include "libiptc/libiptc.h" + ++/* For backward compatibility */ ++//typedef struct iptc_handle *iptc_handle_t; ++ + static oid agent_version_oid[] = { + BASE_OID, 1, 0, AGENT_VERSION_INDEX + }; diff --git a/package/iptables/Makefile b/package/iptables/Makefile index d9229dc50..e20e117c5 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= iptables -PKG_VERSION:= 1.4.8 +PKG_VERSION:= 1.4.10 PKG_RELEASE:= 1 -PKG_MD5SUM:= 697ed89f37af4473a5f6349ba2700f2d +PKG_MD5SUM:= f382fe693f0b59d87bd47bea65eca198 PKG_DESCR:= The netfilter firewalling software PKG_SECTION:= firewall PKG_DEPENDS:= kmod-ip-nf-iptables kmod-nf-conntrack @@ -17,10 +17,7 @@ PKG_DEPENDS+= kmod-netfilter-xt-target-tcpmss PKG_DEPENDS6:= kmod-ip6-nf-iptables kmod-nf-conntrack-ipv6 PKG_DEPENDS6+= kmod-ip6-nf-filter kmod-ip6-nf-target-reject PKG_URL:= http://www.netfilter.org -PKG_SITES:= http://www.netfilter.org/projects/iptables/files/ \ - ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \ - ftp://ftp.de.netfilter.org/pub/netfilter/iptables/ \ - ftp://ftp.no.netfilter.org/pub/netfilter/iptables/ +PKG_SITES:= http://www.netfilter.org/projects/iptables/files/ PKG_SUBPKGS:= IPTABLES IP6TABLES diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile index eb935fbb8..470cc57a7 100644 --- a/package/libstdcxx/Makefile +++ b/package/libstdcxx/Makefile @@ -27,11 +27,11 @@ BUILD_STYLE:= manual INSTALL_STYLE:= manual do-install: - ${INSTALL_DIR} ${IDIR_LIBSTDCXX}/lib + ${INSTALL_DIR} ${IDIR_LIBSTDCXX}/usr/lib ifeq ($(ADK_NATIVE),y) - $(CP) /usr/lib/libstdc++.so.* ${IDIR_LIBSTDCXX}/lib + $(CP) /usr/lib/libstdc++.so.* ${IDIR_LIBSTDCXX}/usr/lib else - $(CP) ${STAGING_TARGET_DIR}/lib/libstdc++.so.* ${IDIR_LIBSTDCXX}/lib + $(CP) ${STAGING_TARGET_DIR}/usr/lib/libstdc++.so* ${IDIR_LIBSTDCXX}/usr/lib endif include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libvirt/patches/patch-configure b/package/libvirt/patches/patch-configure new file mode 100644 index 000000000..87eb324fc --- /dev/null +++ b/package/libvirt/patches/patch-configure @@ -0,0 +1,38 @@ +--- libvirt-0.8.7.orig/configure 2011-01-04 03:22:44.000000000 +0100 ++++ libvirt-0.8.7/configure 2011-01-12 18:43:03.000000000 +0100 +@@ -36745,7 +36745,7 @@ $as_echo "$as_me: Found python in enviro + + # Find any Python interpreter. + if test -z "$PYTHON"; then +- for ac_prog in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 ++ for ac_prog in python python2 python3 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +@@ -36920,25 +36920,7 @@ $as_echo "$am_cv_python_pyexecdir" >&6; + if test -x "$PYTHON_CONFIG" + then + PYTHON_INCLUDES=`$PYTHON_CONFIG --includes` +- else +- if test -r $PYTHON_EXEC_PREFIX/include/python$PYTHON_VERSION/Python.h +- then +- PYTHON_INCLUDES=-I$PYTHON_EXEC_PREFIX/include/python$PYTHON_VERSION +- else +- if test -r $prefix/include/python$PYTHON_VERSION/Python.h +- then +- PYTHON_INCLUDES=-I$prefix/include/python$PYTHON_VERSION +- else +- if test -r /usr/include/python$PYTHON_VERSION/Python.h +- then +- PYTHON_INCLUDES=-I/usr/include/python$PYTHON_VERSION +- else +- { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find python$PYTHON_VERSION/Python.h, disabling bindings" >&5 +-$as_echo "$as_me: Could not find python$PYTHON_VERSION/Python.h, disabling bindings" >&6;} +- with_python=no +- fi +- fi +- fi ++ echo "DEBUG: $PYTHON_CONFIG" + fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find python interpreter, disabling bindings" >&5 diff --git a/package/libvirt/patches/patch-libvirt_pc b/package/libvirt/patches/patch-libvirt_pc new file mode 100644 index 000000000..a46fcce14 --- /dev/null +++ b/package/libvirt/patches/patch-libvirt_pc @@ -0,0 +1,9 @@ +--- libvirt-0.8.7.orig/libvirt.pc 2011-01-04 03:23:23.000000000 +0100 ++++ libvirt-0.8.7/libvirt.pc 2011-01-12 18:31:53.000000000 +0100 +@@ -7,5 +7,5 @@ Name: libvirt + Version: 0.8.7 + Description: libvirt library + Requires: +-Libs: -L${libdir} -lvirt -ldl ++Libs: -L${libdir} -lvirt -lintl + Cflags: -I${includedir} diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile index 38e7941c0..859e8a658 100644 --- a/package/net-snmp/Makefile +++ b/package/net-snmp/Makefile @@ -4,13 +4,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= net-snmp -PKG_VERSION:= 5.5 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 5b2551e7bd024fbbee84dca22a5f13a1 +PKG_VERSION:= 5.6.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= b4e30ead5783b0bb1d280172c6095ea4 PKG_DESCR:= SNMP Agent PKG_SECTION:= net/misc -PKG_DEPENDS:= libnetsnmp libelf -PKG_BUILDDEP:= libelf +PKG_DEPENDS:= libnetsnmp libelf libnl +PKG_BUILDDEP:= libelf libnl PKG_URL:= http://www.net-snmp.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=net-snmp/} PKG_NOPARALLEL:= 1 diff --git a/package/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable_c b/package/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable_c new file mode 100644 index 000000000..f0be57e78 --- /dev/null +++ b/package/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable_c @@ -0,0 +1,48 @@ +--- net-snmp-5.6.1.orig/agent/mibgroup/mibII/tcpTable.c 2010-10-20 15:12:08.000000000 +0200 ++++ net-snmp-5.6.1/agent/mibgroup/mibII/tcpTable.c 2011-01-12 14:48:14.000000000 +0100 +@@ -33,6 +33,12 @@ + #include <netlink/netlink.h> + #include <netlink/msg.h> + #include <linux/inet_diag.h> ++ ++/* libnl 2.0 compatibility code */ ++#define nl_handle nl_sock ++#define nl_handle_alloc nl_socket_alloc ++#define nl_handle_alloc_cb nl_socket_alloc_cb ++#define nl_handle_destroy nl_socket_free + #endif + + #include <net-snmp/net-snmp-includes.h> +@@ -565,8 +571,8 @@ tcpTable_load_netlink(void) + } + + if (nl_connect(nl, NETLINK_INET_DIAG) < 0) { +- DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror())); +- snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror()); ++ DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror(1))); ++ snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror(1)); + nl_handle_destroy(nl); + return -1; + } +@@ -580,8 +586,8 @@ tcpTable_load_netlink(void) + nlmsg_append(nm, &req, sizeof(struct inet_diag_req), 0); + + if (nl_send_auto_complete(nl, nm) < 0) { +- DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror())); +- snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror()); ++ DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror(1))); ++ snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror(1)); + nl_handle_destroy(nl); + return -1; + } +@@ -593,8 +599,8 @@ tcpTable_load_netlink(void) + + while (running) { + if ((len = nl_recv(nl, &peer, &buf, NULL)) <= 0) { +- DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror())); +- snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror()); ++ DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror(1))); ++ snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror(1)); + nl_handle_destroy(nl); + return -1; + } diff --git a/package/pciutils/Makefile b/package/pciutils/Makefile index 2e21cd918..e1176564d 100644 --- a/package/pciutils/Makefile +++ b/package/pciutils/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= pciutils PKG_VERSION:= 3.1.7 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= f3e349d22a3714b4272b171649ad5235 PKG_DESCR:= PCI Utilities PKG_SECTION:= utils @@ -14,8 +14,6 @@ PKG_BUILDDEP:= zlib PKG_URL:= http://www.kernel.org/pub/software/utils/pciutils/ PKG_SITES:= http://www.kernel.org/pub/software/utils/pciutils/ -PKG_HOST_DEPENDS:= !darwin - include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,PCIUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -24,7 +22,8 @@ CONFIG_STYLE:= manual INSTALL_STYLE:= manual MAKE_FLAGS+= CC="${TARGET_CC}" \ - CFLAGS="${TCFLAGS}" \ + CFLAGS="${TARGET_CFLAGS}" \ + CROSS_COMPILE="${TARGET_CROSS}" \ IDSDIR="/usr/share" \ HOST=${GNU_TARGET_NAME} ALL_TARGET:= diff --git a/package/ppp/Makefile b/package/ppp/Makefile index ec0e5782e..55038a276 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -61,7 +61,7 @@ ifeq (${ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS},y) ${IDIR_PPP}/etc/network/if-pre-up.d/05-ppp endif -mod-radius-install: +ppp-mod-radius-install: ${INSTALL_DIR} ${IDIR_PPP_MOD_RADIUS}/etc/radiusclient ${CP} ${WRKBUILD}/pppd/plugins/radius/etc/* \ ${IDIR_PPP_MOD_RADIUS}/etc/radiusclient @@ -70,7 +70,7 @@ mod-radius-install: ${INSTALL_BIN} $(WRKINST)/usr/lib/pppd/$(PKG_VERSION)/radius.so \ ${IDIR_PPP_MOD_RADIUS}/usr/lib/pppd/$(PKG_VERSION) -mod-pppoe-install: +ppp-mod-pppoe-install: ${INSTALL_DIR} ${IDIR_PPP_MOD_PPPOE}/usr/lib/pppd/$(PKG_VERSION) ${INSTALL_BIN} $(WRKINST)/usr/lib/pppd/$(PKG_VERSION)/rp-pppoe.so \ ${IDIR_PPP_MOD_PPPOE}/usr/lib/pppd/$(PKG_VERSION) @@ -78,7 +78,7 @@ mod-pppoe-install: ${INSTALL_DATA} ./files/etc/ppp/templates/pppoe \ ${IDIR_PPP_MOD_PPPOE}/etc/ppp/templates/ -mod-pppoa-install: +ppp-mod-pppoa-install: ${INSTALL_DIR} ${IDIR_PPP_MOD_PPPOA}/usr/lib/pppd/$(PKG_VERSION) ${INSTALL_BIN} $(WRKINST)/usr/lib/pppd/$(PKG_VERSION)/pppoatm.so \ ${IDIR_PPP_MOD_PPPOA}/usr/lib/pppd/$(PKG_VERSION) @@ -86,19 +86,19 @@ mod-pppoa-install: ${INSTALL_DATA} ./files/etc/ppp/templates/pppoa \ ${IDIR_PPP_MOD_PPPOA}/etc/ppp/templates/ -mod-chat-install: +ppp-mod-chat-install: ${INSTALL_DIR} ${IDIR_PPP_MOD_CHAT}/usr/sbin ${CP} ${WRKINST}/usr/sbin/chat ${IDIR_PPP_MOD_CHAT}/usr/sbin/ -mod-pppdump-install: +ppp-mod-pppdump-install: ${INSTALL_DIR} ${IDIR_PPP_MOD_PPPDUMP}/usr/sbin ${CP} ${WRKINST}/usr/sbin/pppdump ${IDIR_PPP_MOD_PPPDUMP}/usr/sbin/ -mod-pppstats-install: +ppp-mod-pppstats-install: ${INSTALL_DIR} ${IDIR_PPP_MOD_PPPSTATS}/usr/sbin ${CP} ${WRKINST}/usr/sbin/pppstats ${IDIR_PPP_MOD_PPPSTATS}/usr/sbin/ -mod-pppumts-install: +ppp-mod-pppumts-install: ${INSTALL_DIR} ${IDIR_PPP_MOD_PPPUMTS}/etc/ppp/templates ${INSTALL_DATA} ./files/etc/ppp/templates/umts \ ${IDIR_PPP_MOD_PPPUMTS}/etc/ppp/templates/ diff --git a/package/qemu/Makefile b/package/qemu/Makefile index 1bafddc94..864010281 100644 --- a/package/qemu/Makefile +++ b/package/qemu/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= qemu PKG_VERSION:= 0.13.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 397a0d665da8ba9d3b9583629f3d6421 PKG_DESCR:= cpu and system emulator PKG_SECTION:= misc @@ -24,6 +24,7 @@ CONFIGURE_ARGS+= --host-cc=$(HOSTCC) \ --prefix=/usr \ --sysconfdir=/etc \ --bindir=/usr/bin +TLDFLAGS+= -pthread -lrt post-install: $(INSTALL_DIR) $(IDIR_QEMU)/usr/bin diff --git a/package/qemu/patches/patch-configure b/package/qemu/patches/patch-configure new file mode 100644 index 000000000..963c407fe --- /dev/null +++ b/package/qemu/patches/patch-configure @@ -0,0 +1,11 @@ +--- qemu-0.13.0.orig/configure 2010-10-15 22:56:09.000000000 +0200 ++++ qemu-0.13.0/configure 2011-01-12 22:34:59.000000000 +0100 +@@ -136,7 +136,7 @@ QEMU_CFLAGS="-D_FORTIFY_SOURCE=2 $QEMU_C + QEMU_CFLAGS="-I. -I\$(SRC_PATH) $QEMU_CFLAGS" + LDFLAGS="-g $LDFLAGS" + +-gcc_flags="-Wold-style-declaration -Wold-style-definition -fstack-protector-all" ++gcc_flags="-Wold-style-declaration -Wold-style-definition" + cat > $TMPC << EOF + int main(void) { return 0; } + EOF diff --git a/package/qemu/patches/patch-hw_vhost_c b/package/qemu/patches/patch-hw_vhost_c new file mode 100644 index 000000000..71eccb83f --- /dev/null +++ b/package/qemu/patches/patch-hw_vhost_c @@ -0,0 +1,10 @@ +--- qemu-0.13.0.orig/hw/vhost.c 2010-10-15 22:56:09.000000000 +0200 ++++ qemu-0.13.0/hw/vhost.c 2011-01-12 21:27:10.000000000 +0100 +@@ -11,7 +11,6 @@ + */ + + #include <sys/ioctl.h> +-#include <sys/eventfd.h> + #include "vhost.h" + #include "hw/hw.h" + /* For range_get_last */ diff --git a/package/qemu/patches/patch-hw_vhost_net_c b/package/qemu/patches/patch-hw_vhost_net_c new file mode 100644 index 000000000..325d5a940 --- /dev/null +++ b/package/qemu/patches/patch-hw_vhost_net_c @@ -0,0 +1,10 @@ +--- qemu-0.13.0.orig/hw/vhost_net.c 2010-10-15 22:56:09.000000000 +0200 ++++ qemu-0.13.0/hw/vhost_net.c 2011-01-12 21:27:20.000000000 +0100 +@@ -20,7 +20,6 @@ + + #ifdef CONFIG_VHOST_NET + #include <linux/vhost.h> +-#include <sys/eventfd.h> + #include <sys/socket.h> + #include <linux/kvm.h> + #include <fcntl.h> diff --git a/package/sdl/patches/patch |