diff options
29 files changed, 166 insertions, 90 deletions
diff --git a/mk/build.mk b/mk/build.mk index cc6c447ff..f6f764c87 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -13,9 +13,11 @@ CONFIG = config DEFCONFIG= ADK_DEVELSYSTEM=n \ ADK_DEBUG=n \ ADK_STATIC=n \ - ADK_MAKE_PARALLEL=n \ + ADK_MAKE_PARALLEL=y \ + ADK_MAKE_JOBS=4 \ ADK_FORCE_PARALLEL=n \ ADK_PACKAGE_GRUB=n \ + ADK_PACKAGE_XORG_SERVER_WITH_DRI=n \ ADK_PACKAGE_AUFS2_UTIL=n \ ADK_PACKAGE_BASE_FILES=y \ ADK_PACKAGE_GCC=n \ diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index 41506092d..9d673613f 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -9,14 +9,15 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 62e8e47cbd63741b4bbe634dcdc8a56a PKG_DESCR:= MESA library PKG_SECTION:= libs -PKG_DEPENDS:= libxdamage libxfixes -PKG_BUILDDEP+= libXdamage libXfixes libXxf86vm -PKG_URL:= add project url +PKG_DEPENDS:= libxdamage libxfixes libdrm +PKG_BUILDDEP+= libXdamage libXfixes libXxf86vm libdrm +PKG_BUILDDEP+= dri2proto glproto +PKG_URL:= http://www.mesa3d.org/ PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/7.8.1/ WRKDIST= ${WRKDIR}/Mesa-${PKG_VERSION} -PKG_TARGET_DEPENDS:= x86 x86_64 +PKG_TARGET_DEPENDS:= ibmx40 include $(TOPDIR)/mk/package.mk diff --git a/package/davfs2/Config.in.kernel b/package/davfs2/Config.in.kernel index 3ef8e77d7..70e3c3ea4 100644 --- a/package/davfs2/Config.in.kernel +++ b/package/davfs2/Config.in.kernel @@ -4,13 +4,9 @@ depends on ADK_PACKAGE_DAVFS2 config ADK_PACKAGE_DAVFS2_FUSE bool "use the FUSE filesystem interface" - select ADK_PACKAGE_FUSE_UTILS config ADK_PACKAGE_DAVFS2_CODA bool "use the CODA filesystem interface" - select ADK_KPACKAGE_KMOD_CODA_FS config ADK_PACKAGE_DAVFS2_BOTH bool "use both filesystem interfaces" - select ADK_PACKAGE_FUSE_UTILS - select ADK_KPACKAGE_KMOD_CODA_FS endchoice diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile index b3e63f2c9..b6c026739 100644 --- a/package/davfs2/Makefile +++ b/package/davfs2/Makefile @@ -16,8 +16,6 @@ endif PKG_URL:= http://savannah.nongnu.org/projects/davfs2 PKG_SITES= ${MASTER_SITE_SOURCEFORGE:=dav/} -include ${TOPDIR}/mk/package.mk - ifeq (${ADK_PACKAGE_DAVFS2_FUSE},y) PKG_DEPENDS:= fuse-utils kmod-fuse-fs libiconv neon else ifeq (${ADK_PACKAGE_DAVFS2_CODA},y) @@ -26,6 +24,8 @@ else PKG_DEPENDS:= kmod-coda-fs fuse-utils kmod-fuse-fs libiconv neon endif +include ${TOPDIR}/mk/package.mk + $(eval $(call PKG_template,DAVFS2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ARGS+= --with-neon diff --git a/package/firefox/Makefile b/package/firefox/Makefile index 8c6db24be..b8d667241 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -19,7 +19,7 @@ PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2 WRKDIST= ${WRKDIR}/mozilla-1.9.2 -PKG_TARGET_DEPENDS:= alix1c x86_qemu x86_64_qemu shuttle +PKG_TARGET_DEPENDS:= alix1c x86_qemu x86_64_qemu shuttle ibmx40 include $(TOPDIR)/mk/package.mk diff --git a/package/firefox/patches/patch-gfx_qcms_iccread_c b/package/firefox/patches/patch-gfx_qcms_iccread_c new file mode 100644 index 000000000..ea9ab6234 --- /dev/null +++ b/package/firefox/patches/patch-gfx_qcms_iccread_c @@ -0,0 +1,18 @@ +--- mozilla-1.9.2.orig/gfx/qcms/iccread.c 2010-04-02 18:02:27.000000000 +0200 ++++ mozilla-1.9.2/gfx/qcms/iccread.c 2010-04-30 14:00:52.430967966 +0200 +@@ -23,6 +23,7 @@ + #include <math.h> + #include <assert.h> + #include <stdlib.h> ++#include <stdio.h> + #include "qcmsint.h" + + //XXX: use a better typename +@@ -771,7 +772,6 @@ void qcms_profile_release(qcms_profile * + qcms_profile_fini(profile); + } + +-#include <stdio.h> + qcms_profile* qcms_profile_from_file(FILE *file) + { + uint32_t length, remaining_length; diff --git a/package/firefox/patches/patch-gfx_qcms_qcmstypes_h b/package/firefox/patches/patch-gfx_qcms_qcmstypes_h index 436b1a452..80f68661a 100644 --- a/package/firefox/patches/patch-gfx_qcms_qcmstypes_h +++ b/package/firefox/patches/patch-gfx_qcms_qcmstypes_h @@ -1,6 +1,6 @@ --- mozilla-1.9.2.orig/gfx/qcms/qcmstypes.h 2010-04-02 18:02:27.000000000 +0200 -+++ mozilla-1.9.2/gfx/qcms/qcmstypes.h 2010-04-11 14:57:54.000000000 +0200 -@@ -11,22 +11,11 @@ ++++ mozilla-1.9.2/gfx/qcms/qcmstypes.h 2010-04-30 17:58:33.490975825 +0200 +@@ -11,22 +11,12 @@ /* int_types.h gets included somehow, so avoid redefining the types differently */ #include <sys/int_types.h> #else @@ -13,6 +13,7 @@ -typedef PRInt64 int64_t; -typedef PRUint64 uint64_t; - ++#include <stdint.h> #ifdef __OS2__ /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */ #include <stdlib.h> diff --git a/package/gdb/Makefile b/package/gdb/Makefile index e01721222..1438ac0b7 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -6,10 +6,12 @@ include ${TOPDIR}/toolchain/gdb/Makefile.inc PKG_DESCR:= GNU debugger PKG_SECTION:= comp -PKG_DEPENDS:= libthread-db libncurses libiconv -PKG_BUILDDEP+= ncurses readline libiconv +PKG_DEPENDS:= libthread-db libncurses libiconv libexpat +PKG_BUILDDEP+= ncurses readline libiconv expat PKG_TARGET_DEPENDS:= !foxboard !ag241 +PKG_NOPARALLEL:= 1 + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -19,7 +21,7 @@ CONFIGURE_ARGS+= --without-uiout --enable-gdbmi \ --disable-tui --disable-gdbtk --without-x \ --without-included-gettext --disable-sim \ --enable-threads --with-curses --disable-werror \ - --enable-static + --enable-static --without-python XAKE_FLAGS+= LDFLAGS='${TLDFLAGS}' post-install: diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile index cfbed5260..32ce9fd59 100644 --- a/package/gdbserver/Makefile +++ b/package/gdbserver/Makefile @@ -8,6 +8,8 @@ PKG_DESCR:= GNU debugger (small server) PKG_SECTION:= comp PKG_DEPENDS:= libthread-db +PKG_TARGET_DEPENDS:= !foxboard + include ${TOPDIR}/mk/package.mk WRKSRC= ${WRKDIST}/gdb/gdbserver diff --git a/package/krb5/Makefile b/package/krb5/Makefile index 6b553f35f..b9efa2b2c 100644 --- a/package/krb5/Makefile +++ b/package/krb5/Makefile @@ -14,6 +14,8 @@ PKG_BUILDDEP+= ncurses e2fsprogs PKG_URL:= http://web.mit.edu/kerberos PKG_SITES:= http://web.mit.edu/kerberos/dist/krb5/1.7/ +PKG_NOPARALLEL:= 1 + PKG_DESCR_LIB:= MIT kerberos libraries PKG_SECTION_LIB:= libs diff --git a/package/nspr/Makefile b/package/nspr/Makefile index 9072977a1..9383c8c5f 100644 --- a/package/nspr/Makefile +++ b/package/nspr/Makefile @@ -20,7 +20,12 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,NSPR,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_ENV+= OS_TARGET="Linux" HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}" +CONFIGURE_ENV+= OS_TARGET="Linux" HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}" \ + cross_compiling=yes + +ifeq (${ADK_LINUX_64},y) +CONFIGURE_ARGS+= --enable-64bit +endif post-install: $(INSTALL_DIR) $(IDIR_NSPR)/usr/lib diff --git a/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in b/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in index 40d15376f..f667eeb61 100644 --- a/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in +++ b/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in @@ -1,11 +1,11 @@ --- nspr-4.8.2.orig/mozilla/nsprpub/config/Makefile.in 2009-03-03 23:04:23.000000000 +0100 -+++ nspr-4.8.2/mozilla/nsprpub/config/Makefile.in 2010-02-06 02:01:27.321836181 +0100 ++++ nspr-4.8.2/mozilla/nsprpub/config/Makefile.in 2010-05-02 12:25:27.673464050 +0200 @@ -145,7 +145,7 @@ endif $(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX) @$(MAKE_OBJDIR) - $(CC) $(XCFLAGS) $< $(LDFLAGS) $(XLDOPTS) $(OUTOPTION)$@ -+ $(CC_FOR_BUILD) $(XCFLAGS) $< $(LDFLAGS) $(XLDOPTS) $(OUTOPTION)$@ ++ $(CC_FOR_BUILD) $(HOSTCFLAGS) $< $(HOSTLDFLAGS) $(XLDOPTS) $(OUTOPTION)$@ install:: nspr.m4 $(NSINSTALL) -D $(DESTDIR)$(datadir)/aclocal diff --git a/package/nspr/patches/patch-mozilla_nsprpub_configure b/package/nspr/patches/patch-mozilla_nsprpub_configure new file mode 100644 index 000000000..3d048970b --- /dev/null +++ b/package/nspr/patches/patch-mozilla_nsprpub_configure @@ -0,0 +1,21 @@ +--- nspr-4.8.2.orig/mozilla/nsprpub/configure 2009-10-04 02:57:00.000000000 +0200 ++++ nspr-4.8.2/mozilla/nsprpub/configure 2010-05-02 12:55:21.842224375 +0200 +@@ -1129,8 +1129,8 @@ EOF + fi + + if test -z "$SKIP_COMPILER_CHECKS"; then +-if test "$target" != "$host"; then +- echo "cross compiling from $host to $target" ++if test "$target" != "$build"; then ++ echo "cross compiling from $build to $target" + cross_compiling=yes + + _SAVE_CC="$CC" +@@ -2593,6 +2593,7 @@ case "$build:$target" in + ;; + esac + ++cross_compiling=yes + if test "$cross_compiling" = "yes"; then + CROSS_COMPILE=1 + else diff --git a/package/nss/Makefile b/package/nss/Makefile index 28e4da1f8..7acbacbe4 100644 --- a/package/nss/Makefile +++ b/package/nss/Makefile @@ -26,7 +26,7 @@ CONFIG_STYLE:= manual ifeq ($(ADK_LINUX_64),y) TCFLAGS+= -DUSE_64 -MAKE_FLAGS+= USE_64=1 +XAKE_FLAGS+= USE_64=1 endif MAKE_FLAGS+= NATIVE_CC="${HOSTCC}" NATIVE_FLAGS="${HOSTCFLAGS}" @@ -34,10 +34,10 @@ TCPPFLAGS+= -I${STAGING_DIR}/usr/include/nspr TCFLAGS+= -I${STAGING_DIR}/usr/include/nspr TLDFLAGS:= '' -MAKE_FLAGS+= SOURCE_MD_DIR=${WRKDIST}/dist DIST=${WRKDIST}/dist \ +XAKE_FLAGS+= SOURCE_MD_DIR=${WRKDIST}/dist DIST=${WRKDIST}/dist \ ARCHFLAG="${TCFLAGS} ${TCPPFLAGS} -ldl" ALL_TARGET:= build_coreconf all -XAKE_FLAGS+= OS_TEST=${ARCH} NSS_DISABLE_DBM=1 OS_TARGET=Linux OS_RELEASE=2.6 +XAKE_FLAGS+= OS_TEST=${CPU_ARCH} NSS_DISABLE_DBM=1 OS_TARGET=Linux OS_RELEASE=2.6 post-install: $(INSTALL_DIR) $(IDIR_NSS)/usr/lib diff --git a/package/openswan/Makefile b/package/openswan/Makefile index c5588f549..6c0adce62 100644 --- a/package/openswan/Makefile +++ b/package/openswan/Makefile @@ -15,6 +15,8 @@ PKG_URL:= http://www.openswan.org PKG_SITES:= http://www.openswan.org/download/ \ ftp://ftp.openswan.org/openswan/ +PKG_NOPARALLEL:= 1 + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,OPENSWAN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index e8af513fe..330b25124 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= openvpn -PKG_VERSION:= 2.1.0 +PKG_VERSION:= 2.1.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 452a83326ae198cf961e9ae02539c8fb +PKG_MD5SUM:= b273ed2b5ec8616fb9834cde8634bce7 PKG_DESCR:= Open Source VPN solution using SSL PKG_SECTION:= net PKG_DEPENDS:= kmod-tun diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index e81d4b271..16cbe0359 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xorg-server -PKG_VERSION:= 1.7.5 +PKG_VERSION:= 1.7.6 PKG_RELEASE:= 1 -PKG_MD5SUM:= 866917789c71e7616a016ad256fe9b8f +PKG_MD5SUM:= ba0360b4ec1f6e541b264e45906bf5f2 PKG_DESCR:= Xorg server PKG_SECTION:= x11 PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile \ @@ -42,6 +42,7 @@ CONFIGURE_ARGS+= \ --enable-xorg \ --enable-xv \ --enable-xaa \ + --enable-vgahw \ --disable-aiglx \ --disable-config-hal \ --disable-dpms \ diff --git a/package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_c b/package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_c deleted file mode 100644 index 411d7b2e2..000000000 --- a/package/xorg-server/patches/patch-hw_xfree86_common_xf86VGAarbiter_c +++ /dev/null @@ -1,17 +0,0 @@ ---- xorg-server-1.7.1.orig/hw/xfree86/common/xf86VGAarbiter.c 2009-10-09 06:08:28.000000000 +0200 -+++ xorg-server-1.7.1/hw/xfree86/common/xf86VGAarbiter.c 2009-12-10 17:14:01.000000000 +0100 -@@ -38,14 +38,8 @@ - #include "xf86Priv.h" - #include "pciaccess.h" - --#ifdef DEBUG --#error "no, really, you dont want to do this" --#define DPRINT_S(x,y) ErrorF(x ": %i\n",y); --#define DPRINT(x) ErrorF(x "\n"); --#else - #define DPRINT_S(x,y) - #define DPRINT(x) --#endif - - static GCFuncs VGAarbiterGCFuncs = { - VGAarbiterValidateGC, VGAarbiterChangeGC, VGAarbiterCopyGC, diff --git a/package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c b/package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c index 8ee439b75..771d3a1e6 100644 --- a/package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c +++ b/package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c @@ -1,15 +1,6 @@ ---- xorg-server-1.7.5.orig/hw/xfree86/loader/sdksyms.c 2010-02-16 02:42:49.000000000 +0100 -+++ xorg-server-1.7.5/hw/xfree86/loader/sdksyms.c 2010-04-21 19:50:58.000000000 +0200 -@@ -429,8 +429,6 @@ _X_HIDDEN void *xorg_symbols[] = { - (void *) &AbortDDX, - (void *) &ddxGiveUp, - (void *) &TimeSinceLastInputEvent, -- (void *) &strlcpy, -- (void *) &strlcat, - (void *) &LogInit, - (void *) &LogClose, - (void *) &LogSetParameter, -@@ -634,7 +632,6 @@ _X_HIDDEN void *xorg_symbols[] = { +--- xorg-server-1.7.6.orig/hw/xfree86/loader/sdksyms.c 2010-03-17 01:56:04.000000000 +0100 ++++ xorg-server-1.7.6/hw/xfree86/loader/sdksyms.c 2010-05-14 15:54:56.232212764 +0200 +@@ -634,7 +634,6 @@ _X_HIDDEN void *xorg_symbols[] = { (void *) &NewCurrentScreen, (void *) &PointerConfinedToScreen, (void *) &GetSpritePosition, @@ -17,7 +8,7 @@ (void *) &GEExtensions, (void *) &GERegisterExtension, (void *) &GEInitEvent, -@@ -724,7 +721,6 @@ _X_HIDDEN void *xorg_symbols[] = { +@@ -724,7 +723,6 @@ _X_HIDDEN void *xorg_symbols[] = { (void *) &PickPointer, (void *) &PickKeyboard, (void *) &IsInterferingGrab, @@ -25,7 +16,7 @@ (void *) &ScreenRestructured, (void *) &ffs, (void *) &AddCallback, -@@ -874,8 +870,6 @@ _X_HIDDEN void *xorg_symbols[] = { +@@ -874,8 +872,6 @@ _X_HIDDEN void *xorg_symbols[] = { (void *) &CreateLinearGradientPicture, (void *) &CreateRadialGradientPicture, (void *) &CreateConicalGradientPicture, @@ -34,7 +25,7 @@ (void *) &PictTransform_from_xRenderTransform, (void *) &xRenderTransform_from_PictTransform, (void *) &PictureTransformPoint, -@@ -977,25 +971,6 @@ _X_HIDDEN void *xorg_symbols[] = { +@@ -977,25 +973,6 @@ _X_HIDDEN void *xorg_symbols[] = { (void *) &ShmSegType, (void *) &ShmCompletionCode, (void *) &BadShmSegCode, @@ -60,7 +51,7 @@ (void *) &xf86CreateI2CBusRec, (void *) &xf86DestroyI2CBusRec, (void *) &xf86I2CBusInit, -@@ -1034,19 +1009,9 @@ _X_HIDDEN void *xorg_symbols[] = { +@@ -1034,31 +1011,17 @@ _X_HIDDEN void *xorg_symbols[] = { (void *) &noTestExtensions, (void *) &dixScreenOrigins, (void *) &ConnectionInfo, @@ -80,16 +71,18 @@ (void *) &noScreenSaverExtension, (void *) &noMITShmExtension, (void *) &noRRExtension, -@@ -1054,9 +1019,7 @@ _X_HIDDEN void *xorg_symbols[] = { + (void *) &noRenderExtension, (void *) &noResExtension, (void *) &noXFree86DGAExtension, - (void *) &noXFree86DRIExtension, +- (void *) &noXFree86DRIExtension, - (void *) &noXFree86VidModeExtension, (void *) &noXFixesExtension, - (void *) &noPanoramiXExtension, (void *) &noXvExtension, - (void *) &noDRI2Extension, +- (void *) &noDRI2Extension, (void *) &defaultTextFont, + (void *) &defaultCursorFont, + (void *) &MaxClients, @@ -1193,7 +1156,6 @@ _X_HIDDEN void *xorg_symbols[] = { (void *) &ProcRRQueryOutputProperty, (void *) &ProcRRConfigureOutputProperty, @@ -116,7 +109,7 @@ (void *) &xf86fpFlag, (void *) &xf86sFlag, (void *) &xf86bsEnableFlag, -@@ -1935,7 +1893,6 @@ _X_HIDDEN void *xorg_symbols[] = { +@@ -1937,7 +1895,6 @@ _X_HIDDEN void *xorg_symbols[] = { (void *) &ProcGrabButton, (void *) &ProcUngrabButton, (void *) &ProcRecolorCursor, @@ -124,7 +117,7 @@ (void *) &SetDefaultFont, (void *) &QueueFontWakeup, (void *) &RemoveFontWakeup, -@@ -2185,15 +2142,6 @@ _X_HIDDEN void *xorg_symbols[] = { +@@ -2187,15 +2144,6 @@ _X_HIDDEN void *xorg_symbols[] = { (void *) &SProcUngrabButton, (void *) &SProcUngrabKey, (void *) &SProcWarpPointer, diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c index 8c93131b1..d0c187169 100644 --- a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c +++ b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c @@ -1,6 +1,15 @@ ---- xorg-server-1.7.5.orig/hw/xfree86/os-support/linux/lnx_video.c 2010-02-16 01:24:23.000000000 +0100 -+++ xorg-server-1.7.5/hw/xfree86/os-support/linux/lnx_video.c 2010-03-08 21:31:20.000000000 +0100 -@@ -497,7 +497,7 @@ volatile unsigned char *ioBase = NULL; +--- xorg-server-1.7.6.orig/hw/xfree86/os-support/linux/lnx_video.c 2010-03-12 05:38:22.000000000 +0100 ++++ xorg-server-1.7.6/hw/xfree86/os-support/linux/lnx_video.c 2010-05-14 19:06:06.873473002 +0200 +@@ -64,6 +64,8 @@ static Bool ExtendedEnabled = FALSE; + !defined(__mips__) && \ + !defined(__arm__) + ++#include "compiler.h" ++ + /* + * Due to conflicts with "compiler.h", don't rely on <sys/io.h> to declare + * these. +@@ -497,7 +499,7 @@ volatile unsigned char *ioBase = NULL; Bool xf86EnableIO(void) { @@ -9,7 +18,7 @@ int fd; unsigned int ioBase_phys; #endif -@@ -524,6 +524,20 @@ xf86EnableIO(void) +@@ -524,6 +526,20 @@ xf86EnableIO(void) #endif } close(fd); diff --git a/target/Config.in b/target/Config.in index db3e47f51..1e4836592 100644 --- a/target/Config.in +++ b/target/Config.in @@ -234,6 +234,7 @@ config ADK_LINUX_ARM_FOXG20 select ADK_EABI select ADK_KERNEL_NLS select ADK_KERNEL_EXT2_FS + select ADK_KERNEL_USB select ADK_KPACKAGE_KMOD_VFAT_FS select ADK_PACKAGE_KMOD_USB_CONTROLLER select ADK_KERNEL_NETDEVICES @@ -250,6 +251,7 @@ config ADK_LINUX_CRIS_FOXBOARD bool "Foxboard (ETRAX LX100)" select ADK_foxboard select ADK_PACKAGE_KMOD_USB_CONTROLLER + select ADK_KERNEL_USB select ADK_KERNEL_NLS select ADK_TARGET_WITH_USB help @@ -585,6 +587,7 @@ config ADK_LINUX_X86_QEMU config ADK_LINUX_X86_64_QEMU bool "x86_64" select ADK_x86_64_qemu + select ADK_LINUX_64 select ADK_KERNEL_NETDEV_1000 select ADK_KPACKAGE_KMOD_E1000 select ADK_KERNEL_INPUT_KEYBOARD diff --git a/target/foxg20/uclibc.config b/target/foxg20/uclibc.config index 69ecdf827..ed774f20f 100644 --- a/target/foxg20/uclibc.config +++ b/target/foxg20/uclibc.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Version: 0.9.31 -# Sun Apr 4 10:16:38 2010 +# Version: 0.9.30.3 +# Sat May 1 19:16:40 2010 # # TARGET_alpha is not set TARGET_arm=y @@ -69,7 +69,6 @@ UCLIBC_HAS_FLOATS=y # UCLIBC_HAS_FPU is not set UCLIBC_HAS_SOFT_FLOAT=y DO_C99_MATH=y -# DO_XSI_MATH is not set UCLIBC_HAS_FENV=y KERNEL_HEADERS="" HAVE_DOT_CONFIG=y @@ -89,14 +88,12 @@ LDSO_CACHE_SUPPORT=y LDSO_BASE_FILENAME="ld.so" # UCLIBC_STATIC_LDCONFIG is not set # LDSO_RUNPATH is not set -LDSO_SEARCH_INTERP_PATH=y UCLIBC_CTOR_DTOR=y # LDSO_GNU_HASH_SUPPORT is not set # HAS_NO_THREADS is not set -LINUXTHREADS_OLD=y -# LINUXTHREADS_NEW is not set UCLIBC_HAS_THREADS=y PTHREADS_DEBUG_SUPPORT=y +LINUXTHREADS_OLD=y UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y # MALLOC is not set @@ -107,7 +104,6 @@ UCLIBC_DYNAMIC_ATEXIT=y COMPAT_ATEXIT=y # UCLIBC_SUSV3_LEGACY is not set # UCLIBC_SUSV3_LEGACY_MACROS is not set -# UCLIBC_SUSV4_LEGACY is not set # UCLIBC_HAS_STUBS is not set UCLIBC_HAS_SHADOW=y UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y @@ -116,7 +112,6 @@ UCLIBC_HAS_PTY=y ASSUME_DEVPTS=y UNIX98PTY_ONLY=y # UCLIBC_HAS_GETPT is not set -# UCLIBC_HAS_LIBUTIL is not set UCLIBC_HAS_TM_EXTENSIONS=y UCLIBC_HAS_TZ_CACHING=y UCLIBC_HAS_TZ_FILE=y @@ -158,10 +153,6 @@ UCLIBC_HAS_REENTRANT_RPC=y UCLIBC_USE_NETLINK=y UCLIBC_SUPPORT_AI_ADDRCONFIG=y UCLIBC_HAS_BSD_RES_CLOSE=y -UCLIBC_HAS_COMPAT_RES_STATE=y -# UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set -# UCLIBC_HAS_LIBRESOLV_STUB is not set -# UCLIBC_HAS_LIBNSL_STUB is not set # # String and Stdio Support @@ -212,17 +203,16 @@ UCLIBC_HAS_REGEX_OLD=y UCLIBC_HAS_FNMATCH=y UCLIBC_HAS_FNMATCH_OLD=y UCLIBC_HAS_WORDEXP=y -# UCLIBC_HAS_NFTW is not set +UCLIBC_HAS_FTW=y UCLIBC_HAS_GLOB=y UCLIBC_HAS_GNU_GLOB=y # # Library Installation Options # +SHARED_LIB_LOADER_PREFIX="$(RUNTIME_PREFIX)lib" RUNTIME_PREFIX="/" DEVEL_PREFIX="/usr/" -MULTILIB_DIR="lib" -HARDWIRED_ABSPATH=y # # Security options diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc index 4e2406e85..eb2737eed 100644 --- a/target/linux/config/Config.in.misc +++ b/target/linux/config/Config.in.misc @@ -79,6 +79,7 @@ config ADK_KPACKAGE_KMOD_EEPROM_93CX6 prompt "kmod-eeprom-93cx6................. 93cx6 eeprom support" tristate depends on ADK_KPACKAGE_KMOD_MAC80211 + depends on !ADK_LINUX_CRIS_FOXBOARD default n help diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia index f224dc31b..ef10e4832 100644 --- a/target/linux/config/Config.in.multimedia +++ b/target/linux/config/Config.in.multimedia @@ -1,5 +1,9 @@ menu "Multimedia devices support" -depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB && !ADK_LINUX_CRIS_FOXBOARD +depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB + +config ADK_KERNEL_SND_AC97_CODEC + boolean + default n config ADK_KERNEL_SND_TIMER boolean @@ -56,6 +60,8 @@ config ADK_KPACKAGE_KMOD_SND_OSSEMUL config ADK_KPACKAGE_KMOD_SND_AC97_CODEC prompt "kmod-sound-alsa-ac97-codec..... ALSA AC97 codec" depends on ADK_KPACKAGE_KMOD_SND + depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20 ) + select ADK_KERNEL_SND_AC97_CODEC tristate default n help @@ -64,6 +70,7 @@ config ADK_KPACKAGE_KMOD_SND_AC97_CODEC config ADK_KPACKAGE_KMOD_SND_VIA82XX prompt "kmod-sound-alsa-via82xx........ ALSA VIA82XX driver" depends on ADK_KPACKAGE_KMOD_SND + depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20 ) select ADK_KPACKAGE_KMOD_SND_AC97_CODEC tristate default n @@ -73,6 +80,7 @@ config ADK_KPACKAGE_KMOD_SND_VIA82XX config ADK_KPACKAGE_KMOD_SND_ENS1370 prompt "kmod-sound-alsa-ens1370........ ALSA Ensoniq 1370 driver" depends on ADK_KPACKAGE_KMOD_SND + depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20 ) tristate default n help diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index 62bafd99b..b3c48c9ea 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -101,7 +101,7 @@ config ADK_KPACKAGE_KMOD_USB_ISP116X_HCD prompt "kmod-usb-isp116x................ ISP116X HCD support" tristate default n - depends on !ADK_LINUX_CRIS_FOXBOARD + depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20) depends on ADK_KPACKAGE_KMOD_USB select ADK_PACKAGE_KMOD_USB_CONTROLLER help @@ -114,7 +114,7 @@ config ADK_KPACKAGE_KMOD_USB_SL811_HCD prompt "kmod-usb-sl811.................. SL811HS HCD support" tristate default n - depends on !ADK_LINUX_CRIS_FOXBOARD + depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20) depends on ADK_KPACKAGE_KMOD_USB select ADK_PACKAGE_KMOD_USB_CONTROLLER help @@ -154,7 +154,7 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD config ADK_PACKAGE_KMOD_USB_CONTROLLER tristate - depends on ADK_KPACKAGE_KMOD_USB_UHCI_HCD || ADK_KPACKAGE_KMOD_USB_OHCI_HCD || ADK_KPACKAGE_KMOD_EHCI_HCD || ADK_LINUX_CRIS_FOXBOARD + depends on ADK_KPACKAGE_KMOD_USB_UHCI_HCD || ADK_KPACKAGE_KMOD_USB_OHCI_HCD || ADK_KPACKAGE_KMOD_EHCI_HCD || ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20 default n config ADK_KPACKAGE_KMOD_USB_ACM diff --git a/target/linux/patches/2.6.33.1/cris-sound.patch b/target/linux/patches/2.6.33.1/cris-sound.patch new file mode 100644 index 000000000..259b3ee60 --- /dev/null +++ b/target/linux/patches/2.6.33.1/cris-sound.patch @@ -0,0 +1,12 @@ +diff -Nur linux-2.6.33.orig/arch/cris/Kconfig linux-2.6.33/arch/cris/Kconfig +--- linux-2.6.33.orig/arch/cris/Kconfig 2010-02-24 19:52:17.000000000 +0100 ++++ linux-2.6.33/arch/cris/Kconfig 2010-04-28 21:41:58.831386913 +0200 +@@ -677,6 +688,8 @@ + + source "fs/Kconfig" + ++source "sound/Kconfig" ++ + source "drivers/usb/Kconfig" + + source "drivers/uwb/Kconfig" diff --git a/target/linux/patches/2.6.33.2/cris-sound.patch b/target/linux/patches/2.6.33.2/cris-sound.patch new file mode 100644 index 000000000..259b3ee60 --- /dev/null +++ b/target/linux/patches/2.6.33.2/cris-sound.patch @@ -0,0 +1,12 @@ +diff -Nur linux-2.6.33.orig/arch/cris/Kconfig linux-2.6.33/arch/cris/Kconfig +--- linux-2.6.33.orig/arch/cris/Kconfig 2010-02-24 19:52:17.000000000 +0100 ++++ linux-2.6.33/arch/cris/Kconfig 2010-04-28 21:41:58.831386913 +0200 +@@ -677,6 +688,8 @@ + + source "fs/Kconfig" + ++source "sound/Kconfig" ++ + source "drivers/usb/Kconfig" + + source "drivers/uwb/Kconfig" diff --git a/target/linux/patches/2.6.33/cris-sound.patch b/target/linux/patches/2.6.33/cris-sound.patch new file mode 100644 index 000000000..259b3ee60 --- /dev/null +++ b/target/linux/patches/2.6.33/cris-sound.patch @@ -0,0 +1,12 @@ +diff -Nur linux-2.6.33.orig/arch/cris/Kconfig linux-2.6.33/arch/cris/Kconfig +--- linux-2.6.33.orig/arch/cris/Kconfig 2010-02-24 19:52:17.000000000 +0100 ++++ linux-2.6.33/arch/cris/Kconfig 2010-04-28 21:41:58.831386913 +0200 +@@ -677,6 +688,8 @@ + + source "fs/Kconfig" + ++source "sound/Kconfig" ++ + source "drivers/usb/Kconfig" + + source "drivers/uwb/Kconfig" diff --git a/toolchain/gcc/Makefile.inc b/toolchain/gcc/Makefile.inc index e40fc2dec..c2fdb4bc8 100644 --- a/toolchain/gcc/Makefile.inc +++ b/toolchain/gcc/Makefile.inc @@ -2,8 +2,8 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= gcc -PKG_VERSION:= 4.4.3 +PKG_VERSION:= 4.4.4 PKG_RELEASE:= 1 -PKG_MD5SUM:= fe1ca818fc6d2caeffc9051fe67ff103 +PKG_MD5SUM:= 7ff5ce9e5f0b088ab48720bbd7203530 PKG_SITES:= ${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/} DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 |