From 03155408f1edbe10117bbcea911aab7f399f709e Mon Sep 17 00:00:00 2001 From: Joerg Seitter Date: Fri, 8 Jan 2010 16:55:37 +0100 Subject: registered alix2d13 in target.lst Signed-off-by: Joerg Seitter --- target/target.lst | 1 + 1 file changed, 1 insertion(+) diff --git a/target/target.lst b/target/target.lst index 2537feef7..c58a9da31 100644 --- a/target/target.lst +++ b/target/target.lst @@ -1,6 +1,7 @@ native ADK_LINUX_NATIVE alix1c ADK_LINUX_X86_ALIX1C alix2d ADK_LINUX_X86_ALIX2D +alix2d13 ADK_LINUX_X86_ALIX2D13 alix ADK_LINUX_X86_ALIX1C || ADK_LINUX_X86_ALIX2D wrap ADK_LINUX_X86_WRAP foxboard ADK_LINUX_CRIS_FOXBOARD -- cgit v1.2.3 From d23cb1592092f9ce4aa64149d1cb9560a08804ee Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 10 Jan 2010 10:02:44 +0100 Subject: add alix2d13 to x86 and alix group target symbols --- target/target.lst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/target.lst b/target/target.lst index c58a9da31..f78fff3da 100644 --- a/target/target.lst +++ b/target/target.lst @@ -2,7 +2,7 @@ native ADK_LINUX_NATIVE alix1c ADK_LINUX_X86_ALIX1C alix2d ADK_LINUX_X86_ALIX2D alix2d13 ADK_LINUX_X86_ALIX2D13 -alix ADK_LINUX_X86_ALIX1C || ADK_LINUX_X86_ALIX2D +alix ADK_LINUX_X86_ALIX1C || ADK_LINUX_X86_ALIX2D || ADK_LINUX_X86_ALIX2D13 wrap ADK_LINUX_X86_WRAP foxboard ADK_LINUX_CRIS_FOXBOARD lemote ADK_LINUX_MIPS64_LEMOTE @@ -28,5 +28,5 @@ rb411 ADK_LINUX_MIPS_RB411 rb433 ADK_LINUX_MIPS_RB433 rb532 ADK_LINUX_MIPS_RB532 routerboard ADK_LINUX_MIPS_RB411 || ADK_LINUX_MIPS_RB433 || ADK_LINUX_MIPS_RB532 -x86 ADK_LINUX_X86_QEMU || ADK_LINUX_X86_RESCUE || ADK_LINUX_X86_ALIX1C || ADK_LINUX_X86_ALIX2D || ADK_LINUX_X86_WRAP +x86 ADK_LINUX_X86_QEMU || ADK_LINUX_X86_RESCUE || ADK_LINUX_X86_ALIX1C || ADK_LINUX_X86_ALIX2D || ADK_LINUX_X86_WRAP || ADK_LINUX_X86_ALIX2D13 x86_64 ADK_LINUX_X86_64_QEMU || ADK_LINUX_X86_64_RESCUE || ADK_LINUX_X86_64_SHUTTLE -- cgit v1.2.3 From 17a32aded246373e8e1b1e98ebb1447466bbb61e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 10 Jan 2010 14:10:38 +0100 Subject: fix build dependencies --- package/libICE/Makefile | 2 +- package/libXrender/Makefile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/libICE/Makefile b/package/libICE/Makefile index d779ab1db..4f7e7e660 100644 --- a/package/libICE/Makefile +++ b/package/libICE/Makefile @@ -6,10 +6,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libICE PKG_VERSION:= 1.0.6 PKG_RELEASE:= 1 -PKG_BUILDDEP+= xtrans PKG_MD5SUM:= 4a8f09f15fc92196b91d61e2dc9afcea PKG_DESCR:= Inter-Client Exchange library PKG_SECTION:= x11 +PKG_BUILDDEP+= xtrans xproto PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk diff --git a/package/libXrender/Makefile b/package/libXrender/Makefile index c2badb0fd..145c36988 100644 --- a/package/libXrender/Makefile +++ b/package/libXrender/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 1791473c18a83a333a048b72d719fc55 PKG_DESCR:= X11 rendering library PKG_SECTION:= x11 +PKG_BUILDDEP+= renderproto PKG_SITES:= ${MASTER_SITE_XORG} ifeq ($(ADK_STATIC),y) -- cgit v1.2.3 From bfb1daa7d7fb497e9a5360c156e7f206236e8b76 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 10 Jan 2010 14:39:27 +0100 Subject: update to latest upstream, no xmlto needed. --- package/openswan/Makefile | 6 +- .../patches/patch-programs_Makefile_program | 102 --------------------- 2 files changed, 3 insertions(+), 105 deletions(-) delete mode 100644 package/openswan/patches/patch-programs_Makefile_program diff --git a/package/openswan/Makefile b/package/openswan/Makefile index 0fd7c6710..ef58ca96f 100644 --- a/package/openswan/Makefile +++ b/package/openswan/Makefile @@ -4,13 +4,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openswan -PKG_VERSION:= 2.6.22 +PKG_VERSION:= 2.6.24 PKG_RELEASE:= 1 -PKG_BUILDDEP+= gmp -PKG_MD5SUM:= 9a30009bade8a1b09fba27680c87cf72 +PKG_MD5SUM:= 1c76b6982c05392f7c360afb92699661 PKG_DESCR:= IPSec software PKG_SECTION:= net PKG_DEPENDS:= ip libgmp +PKG_BUILDDEP+= gmp PKG_URL:= http://www.openswan.org PKG_SITES:= http://www.openswan.org/download/ \ ftp://ftp.openswan.org/openswan/ diff --git a/package/openswan/patches/patch-programs_Makefile_program b/package/openswan/patches/patch-programs_Makefile_program deleted file mode 100644 index 154fd06c2..000000000 --- a/package/openswan/patches/patch-programs_Makefile_program +++ /dev/null @@ -1,102 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- openswan-2.6.22.orig/programs/Makefile.program 2009-06-23 04:53:08.000000000 +0200 -+++ openswan-2.6.22/programs/Makefile.program 2009-07-23 19:46:18.635264333 +0200 -@@ -49,9 +49,9 @@ CFLAGS+=-DFINALCONFFILE=\"${FINALCONFFIL - CFLAGS+=-DFINALVARDIR=\"${FINALVARDIR}\" - - # die if there are any warnings --ifndef WERROR --WERROR:= -Werror --endif -+#ifndef WERROR -+#WERROR:= -Werror -+#endif - - CFLAGS+= ${WERROR} - -@@ -104,67 +104,67 @@ endif - ifneq ($(NOINSTALL),true) - - doinstall:: $(PROGRAM) $(CONFFILES) $(EXTRA8MAN) $(EXTRA5MAN) $(EXTRA5PROC) $(LIBFILES) $(CONFDFILES) -- @mkdir -p $(PROGRAMDIR) $(MANDIR8) $(MANDIR5) $(LIBDIR) $(CONFDIR) $(CONFDDIR) $(CONFDDIR)/$(CONFDSUBDIR) $(EXAMPLECONFDIR) -+ mkdir -p $(PROGRAMDIR) $(MANDIR8) $(MANDIR5) $(LIBDIR) $(CONFDIR) $(CONFDDIR) $(CONFDDIR)/$(CONFDSUBDIR) $(EXAMPLECONFDIR) - @if [ -n "$(PROGRAM)" ]; then $(INSTALL) $(INSTBINFLAGS) $(PROGRAM) $(PROGRAMDIR); fi -- @$(foreach f, $(addsuffix .8, $(PROGRAM)), \ -+ $(foreach f, $(addsuffix .8, $(PROGRAM)), \ - g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \ - $(INSTALL) $(INSTMANFLAGS) $$g $(MANDIR8)/$(MANPROGPREFIX)$f || exit 1; \ - ) -- @$(foreach f, $(EXTRA8MAN), \ -+ $(foreach f, $(EXTRA8MAN), \ - g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \ - $(INSTALL) $(INSTMANFLAGS) $$g $(MANDIR8)/ipsec_$f || exit 1; \ - ) -- @$(foreach f, $(EXTRA5MAN), \ -+ $(foreach f, $(EXTRA5MAN), \ - g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \ - $(INSTALL) $(INSTMANFLAGS) $$g $(MANDIR5)/$f || exit 1 ;\ - ) -- @$(foreach f, $(EXTRA5PROC), \ -+ $(foreach f, $(EXTRA5PROC), \ - g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \ - $(INSTALL) $(INSTMANFLAGS) $$g $(MANDIR5)/ipsec_$f || exit 1 ;\ - ) -- @$(foreach f, $(LIBFILES), \ -+ $(foreach f, $(LIBFILES), \ - g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \ - $(INSTALL) $(INSTCONFFLAGS) $$g $(LIBDIR)/$f || exit 1 ;\ - ) -- @$(foreach f, $(CONFFILES), \ -+ $(foreach f, $(CONFFILES), \ - g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \ - if [ ! -f $(CONFDIR)/$f ]; then $(INSTALL) $(INSTCONFFLAGS) $$g $(CONFDIR)/$f || exit 1; fi;\ - $(INSTALL) $(INSTCONFFLAGS) $$g $(EXAMPLECONFDIR)/$f-sample || exit 1; \ - ) -- @$(foreach f, $(EXCONFFILES), \ -+ $(foreach f, $(EXCONFFILES), \ - g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \ - $(INSTALL) $(INSTCONFFLAGS) $$g $(EXAMPLECONFDIR)/$f-sample || exit 1; \ - ) -- @$(foreach f, $(CONFDFILES), \ -+ $(foreach f, $(CONFDFILES), \ - g=`if [ -r $f ]; then echo $f; else echo ${srcdir}/$f; fi`; \ - if [ ! -f $(CONFDDIR)/$(CONFDSUBDIR)/$f ]; then $(INSTALL) $(INSTCONFFLAGS) $$g $(CONFDDIR)/$(CONFDSUBDIR)/$f || exit 1; fi;\ - ) - - install_file_list:: -- @if [ -n "$(PROGRAM)" ]; then echo $(PROGRAMDIR)/$(PROGRAM); fi -- @$(foreach f, $(addsuffix .8, $(PROGRAM)), \ -+ if [ -n "$(PROGRAM)" ]; then echo $(PROGRAMDIR)/$(PROGRAM); fi -+ $(foreach f, $(addsuffix .8, $(PROGRAM)), \ - echo $(MANDIR8)/${MANPROGPREFIX}$f; \ - ) -- @$(foreach f, $(EXTRA8MAN), \ -+ $(foreach f, $(EXTRA8MAN), \ - echo $(MANDIR8)/ipsec_$f; \ - ) -- @$(foreach f, $(EXTRA5MAN), \ -+ $(foreach f, $(EXTRA5MAN), \ - echo $(MANDIR5)/$f;\ - ) -- @$(foreach f, $(EXTRA5PROC), \ -+ $(foreach f, $(EXTRA5PROC), \ - echo $(MANDIR5)/ipsec_$f; \ - ) -- @$(foreach f, $(LIBFILES), \ -+ $(foreach f, $(LIBFILES), \ - echo $(LIBDIR)/$f;\ - ) -- @$(foreach f, $(CONFFILES), \ -+ $(foreach f, $(CONFFILES), \ - echo $(CONFDIR)/$f;\ - echo $(EXAMPLECONFDIR)/$f-sample;\ - ) -- @$(foreach f, $(EXCONFFILES), \ -+ $(foreach f, $(EXCONFFILES), \ - echo $(EXAMPLECONFDIR)/$f-sample;\ - ) -- @$(foreach f, $(CONFDFILES), \ -+ $(foreach f, $(CONFDFILES), \ - echo $(CONFDDIR)/${CONFDSUBDIR}/$f;\ - ) - -- cgit v1.2.3