From 68bb17312be33ae09255737dde26a93663cfc2ba Mon Sep 17 00:00:00 2001 From: waldemar brodkorb Date: Wed, 20 Jan 2010 21:31:08 +0100 Subject: fix allmodconfig for foxboard --- package/cryptsetup/Makefile | 2 ++ package/nss/Makefile | 2 ++ package/openswan/patches/patch-lib_libopenswan_alg_info_c | 6 +++--- package/openswan/patches/patch-programs_eroute_eroute_c | 11 +++++++++++ package/quagga/Makefile | 1 + package/rpm/Makefile | 4 +++- package/sdl-image/Makefile | 4 ++-- package/util-linux-ng/Makefile | 3 ++- 8 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 package/openswan/patches/patch-programs_eroute_eroute_c (limited to 'package') diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile index 3a51fdf54..7e41abe3b 100644 --- a/package/cryptsetup/Makefile +++ b/package/cryptsetup/Makefile @@ -14,6 +14,8 @@ PKG_BUILDDEP+= libgcrypt popt e2fsprogs lvm PKG_URL:= http://cryptsetup.googlecode.com PKG_SITES:= http://cryptsetup.googlecode.com/files/ +PKG_TARGET_DEPENDS:= !foxboard + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk diff --git a/package/nss/Makefile b/package/nss/Makefile index 19f53ea3a..f84afc8ab 100644 --- a/package/nss/Makefile +++ b/package/nss/Makefile @@ -14,6 +14,8 @@ PKG_NOPARALLEL:= 1 PKG_URL:= http://www.mozilla.org/projects/security/pki/nss/ PKG_SITES:= https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_4_RTM/src/ +PKG_TARGET_DEPENDS:= !foxboard + WRKSRC= ${WRKDIST}/mozilla/security/nss include $(TOPDIR)/mk/package.mk diff --git a/package/openswan/patches/patch-lib_libopenswan_alg_info_c b/package/openswan/patches/patch-lib_libopenswan_alg_info_c index 0c616e07c..0da5f9ad1 100644 --- a/package/openswan/patches/patch-lib_libopenswan_alg_info_c +++ b/package/openswan/patches/patch-lib_libopenswan_alg_info_c @@ -1,7 +1,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- openswan-2.6.18.orig/lib/libopenswan/alg_info.c 2008-10-06 18:52:49.000000000 +0200 -+++ openswan-2.6.18/lib/libopenswan/alg_info.c 2008-10-14 13:08:49.000000000 +0200 -@@ -749,7 +749,7 @@ alg_info_discover_pfsgroup_hack(struct a +--- openswan-2.6.24.orig/lib/libopenswan/alg_info.c 2010-01-10 02:34:38.000000000 +0100 ++++ openswan-2.6.24/lib/libopenswan/alg_info.c 2010-01-19 23:28:18.000000000 +0100 +@@ -765,7 +765,7 @@ alg_info_discover_pfsgroup_hack(struct a static char err_buf[256]; int ret; diff --git a/package/openswan/patches/patch-programs_eroute_eroute_c b/package/openswan/patches/patch-programs_eroute_eroute_c new file mode 100644 index 000000000..f2d2c52b2 --- /dev/null +++ b/package/openswan/patches/patch-programs_eroute_eroute_c @@ -0,0 +1,11 @@ +--- openswan-2.6.24.orig/programs/eroute/eroute.c 2010-01-10 02:34:38.000000000 +0100 ++++ openswan-2.6.24/programs/eroute/eroute.c 2010-01-20 08:43:00.000000000 +0100 +@@ -268,7 +268,7 @@ main(int argc, char **argv) + exit (1); + } + if(ntohl(said.spi) < 0x100) { +- fprintf(stderr, "%s: Illegal reserved spi: %s => 0x%x Must be larger than 0x100.\n", ++ fprintf(stderr, "%s: Illegal reserved spi: %s => 0x%lx Must be larger than 0x100.\n", + progname, optarg, ntohl(said.spi)); + exit(1); + } diff --git a/package/quagga/Makefile b/package/quagga/Makefile index b5985255d..0f57fb919 100644 --- a/package/quagga/Makefile +++ b/package/quagga/Makefile @@ -41,6 +41,7 @@ CONFIGURE_ARGS+= --localstatedir=/var/run/quagga \ --enable-vtysh \ --enable-user=quagga \ --enable-group=quagga \ + --disable-pie \ --enable-multipath=8 BUILD_STYLE:= auto INSTALL_STYLE:= auto diff --git a/package/rpm/Makefile b/package/rpm/Makefile index 89b50a647..49c7f8339 100644 --- a/package/rpm/Makefile +++ b/package/rpm/Makefile @@ -6,13 +6,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:= rpm PKG_VERSION:= 4.7.2 PKG_RELEASE:= 1 -PKG_BUILDDEP+= nss libdb PKG_MD5SUM:= 224715646325df4cd3904e3ac9e16186 PKG_DESCR:= Package Manager PKG_SECTION:= base +PKG_BUILDDEP+= nss libdb PKG_URL:= http://www.rpm.org PKG_SITES:= http://rpm.org/releases/rpm-4.7.x/ +PKG_TARGET_DEPENDS:= !foxboard + DISTFILES:= ${PKG_NAME}-$(PKG_VERSION).tar.bz2 include $(TOPDIR)/mk/package.mk diff --git a/package/sdl-image/Makefile b/package/sdl-image/Makefile index da8872763..1840817c6 100644 --- a/package/sdl-image/Makefile +++ b/package/sdl-image/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 6c06584b31559e2b59f2b982d0d1f628 PKG_DESCR:= Simple DirectMedia Layer PKG_SECTION:= libs -PKG_DEPENDS:= libpng libtiff libjpeg -PKG_BUILDDEP:= libpng libtiff jpeg +PKG_DEPENDS:= libpng libtiff libjpeg libsdl +PKG_BUILDDEP:= libpng libtiff jpeg sdl PKG_URL:= http://www.libsdl.org PKG_SITES:= http://www.libsdl.org/projects/SDL_image/release/ diff --git a/package/util-linux-ng/Makefile b/package/util-linux-ng/Makefile index 4de64d7b0..b73689687 100644 --- a/package/util-linux-ng/Makefile +++ b/package/util-linux-ng/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= util-linux-ng PKG_VERSION:= 2.16.1 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= fc57e5fd5be9e569b026b5077fafe84f PKG_DESCR:= Linux utilities PKG_SECTION:= admin @@ -29,6 +29,7 @@ $(eval $(call PKG_template,LOSETUP,losetup,${PKG_VERSION}-${PKG_RELEASE},${PKG_D CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-use-tty-group \ + --disable-schedutils \ --disable-cramfs \ --disable-libblkid \ --disable-libuuid -- cgit v1.2.3