summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/gnutls/Makefile2
-rw-r--r--package/parted/patches/patch-lib_config_h_in14
-rw-r--r--package/parted/patches/patch-lib_stdio_in_h10
-rw-r--r--package/udev/Makefile2
-rw-r--r--package/urlgrabber/patches/patch-setup_py24
-rw-r--r--package/urlgrabber/patches/patch-setup_py.orig24
-rw-r--r--package/xorg-server/Makefile2
-rw-r--r--target/linux/config/Config.in.netdevice12
-rw-r--r--target/linux/config/Config.in.netfilter.core1
9 files changed, 86 insertions, 5 deletions
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index 4ad915ba3..2ebad3fa9 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -40,7 +40,7 @@ CONFIGURE_ARGS+= --enable-cryptodev
endif
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
-TARGET_LDFLAGS+= -pthread
+TARGET_LDFLAGS+= -pthread -L$(STAGING_DIR)/usr/lib64
CONFIGURE_ARGS+= --disable-rpath \
--without-libz-prefix \
--without-p11-kit \
diff --git a/package/parted/patches/patch-lib_config_h_in b/package/parted/patches/patch-lib_config_h_in
new file mode 100644
index 000000000..ba4569ea9
--- /dev/null
+++ b/package/parted/patches/patch-lib_config_h_in
@@ -0,0 +1,14 @@
+--- parted-3.0.orig/lib/config.h.in 2011-05-30 09:07:32.000000000 +0200
++++ parted-3.0/lib/config.h.in 2013-02-11 15:50:00.000000000 +0100
+@@ -1385,6 +1385,11 @@
+ # endif
+ #endif
+
++/* Enable large inode numbers on Mac OS X 10.5. */
++#ifndef _DARWIN_USE_64_BIT_INODE
++# define _DARWIN_USE_64_BIT_INODE 1
++#endif
++
+ /* Number of bits in a file offset, on hosts where this is settable. */
+ #undef _FILE_OFFSET_BITS
+
diff --git a/package/parted/patches/patch-lib_stdio_in_h b/package/parted/patches/patch-lib_stdio_in_h
new file mode 100644
index 000000000..1fe225d7b
--- /dev/null
+++ b/package/parted/patches/patch-lib_stdio_in_h
@@ -0,0 +1,10 @@
+--- parted-3.0.orig/lib/stdio.in.h 2011-05-30 09:07:16.000000000 +0200
++++ parted-3.0/lib/stdio.in.h 2013-02-11 15:51:17.000000000 +0100
+@@ -735,7 +735,6 @@ _GL_CXXALIASWARN (gets);
+ /* It is very rare that the developer ever has full control of stdin,
+ so any use of gets warrants an unconditional warning. Assume it is
+ always declared, since it is required by C89. */
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ #endif
+
+
diff --git a/package/udev/Makefile b/package/udev/Makefile
index 08310e268..b7e76d708 100644
--- a/package/udev/Makefile
+++ b/package/udev/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= e31c83159b017e8ab0fa2f4bca758a41
PKG_DESCR:= Dynamic device management subsystem
PKG_SECTION:= utils
-PKG_BUILDDEP:= usbutils glib
+PKG_BUILDDEP:= usbutils glib kmod
PKG_URL:= http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
PKG_SITES:= ${MASTER_SITE_KERNEL:=utils/kernel/hotplug/}
diff --git a/package/urlgrabber/patches/patch-setup_py b/package/urlgrabber/patches/patch-setup_py
new file mode 100644
index 000000000..f33080823
--- /dev/null
+++ b/package/urlgrabber/patches/patch-setup_py
@@ -0,0 +1,24 @@
+--- urlgrabber-3.9.1.orig/setup.py 2009-02-23 22:37:16.000000000 +0100
++++ urlgrabber-3.9.1/setup.py 2013-02-11 13:46:37.000000000 +0100
+@@ -1,16 +1,16 @@
+ # urlgrabber distutils setup
+ import re as _re
+-import urlgrabber as _urlgrabber
++#import urlgrabber as _urlgrabber
+
+ name = "urlgrabber"
+ description = "A high-level cross-protocol url-grabber"
+-long_description = _urlgrabber.__doc__
++long_description = "A high-level cross-protocol url-grabber"
+ license = "LGPL"
+-version = _urlgrabber.__version__
+-_authors = _re.split(r',\s+', _urlgrabber.__author__)
++version = "3.9.1"
++_authors = _re.split(r',\s+', 'Michael D. Stenner, Ryan Tomayko')
+ author = ', '.join([_re.sub(r'\s+<.*', r'', _) for _ in _authors])
+ author_email = ', '.join([_re.sub(r'(^.*<)|(>.*$)', r'', _) for _ in _authors])
+-url = _urlgrabber.__url__
++url = "http://linux.duke.edu/projects/urlgrabber/"
+
+ packages = ['urlgrabber']
+ package_dir = {'urlgrabber':'urlgrabber'}
diff --git a/package/urlgrabber/patches/patch-setup_py.orig b/package/urlgrabber/patches/patch-setup_py.orig
new file mode 100644
index 000000000..a3ce96dc4
--- /dev/null
+++ b/package/urlgrabber/patches/patch-setup_py.orig
@@ -0,0 +1,24 @@
+--- urlgrabber-3.9.1.orig/setup.py 2009-02-23 22:37:16.000000000 +0100
++++ urlgrabber-3.9.1/setup.py 2013-02-11 13:46:24.000000000 +0100
+@@ -1,16 +1,16 @@
+ # urlgrabber distutils setup
+ import re as _re
+-import urlgrabber as _urlgrabber
++#import urlgrabber as _urlgrabber
+
+ name = "urlgrabber"
+ description = "A high-level cross-protocol url-grabber"
+-long_description = _urlgrabber.__doc__
++long_description = "A high-level cross-protocol url-grabber"
+ license = "LGPL"
+-version = _urlgrabber.__version__
+-_authors = _re.split(r',\s+', _urlgrabber.__author__)
++version = 3.9.1
++_authors = _re.split(r',\s+', 'Michael D. Stenner, Ryan Tomayko')
+ author = ', '.join([_re.sub(r'\s+<.*', r'', _) for _ in _authors])
+ author_email = ', '.join([_re.sub(r'(^.*<)|(>.*$)', r'', _) for _ in _authors])
+-url = _urlgrabber.__url__
++url = "http://linux.duke.edu/projects/urlgrabber/"
+
+ packages = ['urlgrabber']
+ package_dir = {'urlgrabber':'urlgrabber'}
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index a4df670d3..5abcdd562 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:= x11/server
PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile
PKG_DEPENDS+= libfontenc xkeyboard-config xkbcomp libxau libxaw
PKG_DEPENDS+= libxmu libxpm libxrender libxt libxxf86dga libxext
-PKG_DEPENDS+= libxdmcp libxv libsm libice libx11 libxcb libgcc
+PKG_DEPENDS+= libxdmcp libxv libsm libice libx11 libxcb libgcc librt
PKG_BUILDDEP:= libX11 randrproto renderproto fixesproto damageproto
PKG_BUILDDEP+= scrnsaverproto resourceproto fontsproto videoproto
PKG_BUILDDEP+= compositeproto evieext libxkbfile libXfont pixman
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index 48788ca4f..8d4183f1f 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -158,13 +158,21 @@ config ADK_KERNEL_E1000
default y if ADK_TARGET_SYSTEM_VBOX_I686
default y if ADK_TARGET_SYSTEM_IBM_X40
default y if ADK_NATIVE_SYSTEM_IBM_X40
- default y if ADK_TARGET_SYSTEM_TAROX_PC
- default y if ADK_NATIVE_SYSTEM_TAROX_PC
default y if ADK_TARGET_SYSTEM_QEMU_I686
default y if ADK_TARGET_SYSTEM_QEMU_X86_64
default n
help
+config ADK_KERNEL_E1000E
+ boolean
+ select ADK_KERNEL_NETDEVICES
+ select ADK_KERNEL_NET_ETHERNET
+ select ADK_KERNEL_NETDEV_1000
+ default y if ADK_TARGET_SYSTEM_TAROX_PC
+ default y if ADK_NATIVE_SYSTEM_TAROX_PC
+ default n
+ help
+
config ADK_KERNEL_SKY2
boolean
select ADK_KERNEL_NETDEVICES
diff --git a/target/linux/config/Config.in.netfilter.core b/target/linux/config/Config.in.netfilter.core
index 21e4c0da6..eb522cb2a 100644
--- a/target/linux/config/Config.in.netfilter.core
+++ b/target/linux/config/Config.in.netfilter.core
@@ -17,6 +17,7 @@ config ADK_KPACKAGE_KMOD_NF_CONNTRACK
config ADK_KPACKAGE_KMOD_NETFILTER_XT_TARGET_CHECKSUM
tristate '"CHECKSUM" target support'
+ select ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
select ADK_KERNEL_NETFILTER_XTABLES
select ADK_KPACKAGE_KMOD_IP_NF_MANGLE
select ADK_KERNEL_NETFILTER_ADVANCED
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 05:19:11 +0000