diff options
39 files changed, 6867 insertions, 325 deletions
diff --git a/mk/image.mk b/mk/image.mk index c6f5ce266..a2a6bb176 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -71,9 +71,6 @@ ${BIN_DIR}/${ROOTFSSQUASHFS}: ${TARGET_DIR} cat ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel \ ${BUILD_DIR}/root.squashfs > \ ${BUILD_DIR}/${ROOTFSSQUASHFS} - # padding of images is required, foxboard only? - #dd if=${BUILD_DIR}/${ROOTFSSQUASHFS} of=${BIN_DIR}/${ROOTFSSQUASHFS} \ - bs=4063232 conv=sync $(MAKE_TRACE) imageclean: rm -f $(BIN_DIR)/$(ADK_TARGET)-* ${BUILD_DIR}/$(ADK_TARGET)-* diff --git a/mk/modules.mk b/mk/modules.mk index 948a68364..734fd4435 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -568,6 +568,7 @@ $(eval $(call KMOD_template,BLK_DEV_NBD,blk-dev-nbd,\ $(eval $(call KMOD_template,SCSI,scsi,\ $(MODULES_DIR)/kernel/drivers/scsi/scsi_wait_scan \ + $(MODULES_DIR)/kernel/drivers/scsi/scsi_mod \ ,20)) $(eval $(call KMOD_template,BLK_DEV_SD,blk-dev-sd,\ @@ -979,6 +980,10 @@ $(eval $(call KMOD_template,INPUT_MOUSEDEV,input-mousedev,\ $(MODULES_DIR)/kernel/drivers/input/mousedev \ ,45)) +$(eval $(call KMOD_template,INPUT_EVDEV,input-evdev,\ + $(MODULES_DIR)/kernel/drivers/input/evdev \ +,45)) + # # USB # diff --git a/package/Config.in b/package/Config.in index 832ab8893..63ae10491 100644 --- a/package/Config.in +++ b/package/Config.in @@ -544,6 +544,7 @@ source "package/xf86-video-cirrus/Config.in" source "package/xf86-video-geode/Config.in" source "package/xf86-input-mouse/Config.in" source "package/xf86-input-keyboard/Config.in" +source "package/xf86-input-evtouch/Config.in" menu "X Libraries" source "package/libICE/Config.in" diff --git a/package/base-files/extra/sbin/update b/package/base-files/extra/sbin/update index 0cd4ee713..c51962f5b 100755 --- a/package/base-files/extra/sbin/update +++ b/package/base-files/extra/sbin/update @@ -6,6 +6,11 @@ if [ $who -ne 0 ]; then exit 1 fi +if [ -x /sbin/mtd ];then + updatecmd="mtd -r write - linux" +else + updatecmd="gunzip -c | tar -xf -" +fi check_exit() { if [ $? -ne 0 ];then @@ -22,19 +27,19 @@ prepare() { extract_from_file() { prepare - cat $1 | gunzip -c | tar -xf - + cat $1 | $updatecmd check_exit } extract_from_ssh() { prepare - ssh $1 "cat $2" | gunzip -c | tar -xf - + ssh $1 "cat $2" | $updatecmd check_exit } extract_from_http() { prepare - wget -O - $1 | gunzip -c | tar -xf - + wget -O - $1 | $updatecmd check_exit } diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index e99c7e244..dd5784512 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.0.6 PKG_RELEASE:= 5 PKG_DESCR:= compressed config filesystem PKG_SECTION:= base -PKG_TARGET_DEPENDS:= alix1c alix2d wrap foxboard ag241 rb532 +PKG_TARGET_DEPENDS:= alix1c alix2d alix2d13 wrap foxboard ag241 rb532 WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 diff --git a/package/dialog/Makefile b/package/dialog/Makefile index 74178cd2b..2763a0946 100644 --- a/package/dialog/Makefile +++ b/package/dialog/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= dialog PKG_VERSION:= 1.1-20080819 PKG_RELEASE:= 1 -PKG_MD5SUM:= 3caebd641a9f337b980becb4444336c5 +PKG_MD5SUM:= 3caebd641a9f337b980becb4444336c5 PKG_DESCR:= A text gui interface PKG_SECTION:= misc PKG_DEPENDS:= libncurses diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 96ec1ce99..436bd3a13 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -5,10 +5,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= e2fsprogs PKG_VERSION:= 1.41.9 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 52f60a9e19a02f142f5546f1b5681927 PKG_DESCR:= Ext2/3/4 filesystem utilities PKG_SECTION:= admin +PKG_DEPENDS:= libcom-err libuuid libblkid libpthread PKG_URL:= http://e2fsprogs.sourceforge.net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/} @@ -24,10 +25,10 @@ PKG_SECTION_SS:= libs include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,E2FSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_UUID},${PKG_SECTION_UUID})) -$(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_COM_ERR},${PKG_SECTION_COM_ERR})) -$(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_SS},${PKG_SECTION_SS})) -$(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_BLKID},${PKG_SECTION_BLKID})) +$(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_UUID},${PKG_SECTION_UUID})) +$(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_COM_ERR},${PKG_SECTION_COM_ERR})) +$(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_SS},${PKG_SECTION_SS})) +$(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_BLKID},${PKG_SECTION_BLKID})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --enable-elf-shlibs \ 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/libXfont/Makefile b/package/libXfont/Makefile index 3724575b5..e40b02d39 100644 --- a/package/libXfont/Makefile +++ b/package/libXfont/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= bf134b9f79a7fc6507577bf5b6d4f412 PKG_DESCR:= X font Library PKG_SECTION:= x11 PKG_DEPENDS:= libfreetype -PKG_BUILDDEP+= freetype fontcacheproto fontsproto libfontenc +PKG_BUILDDEP+= freetype fontcacheproto fontsproto libfontenc xtrans 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) diff --git a/package/libxkbfile/Makefile b/package/libxkbfile/Makefile index 00f85b570..d6da115a4 100644 --- a/package/libxkbfile/Makefile +++ b/package/libxkbfile/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= a1384a9a48430397aff236f97e26ed05 PKG_DESCR:= X11 keyboard configuration extension library PKG_SECTION:= x11 +PKG_BUILDDEP+= kbproto libX11 PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk diff --git a/package/mtd/Makefile b/package/mtd/Makefile index a04bd4693..92acee50f 100644 --- a/package/mtd/Makefile +++ b/package/mtd/Makefile @@ -18,6 +18,8 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MTD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +PKGDFLT_MTD= y + BUILD_STYLE:= manual INSTALL_STYLE:= manual 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;\ - ) - diff --git a/package/xf86-input-evtouch/Makefile b/package/xf86-input-evtouch/Makefile new file mode 100644 index 000000000..4f7506523 --- /dev/null +++ b/package/xf86-input-evtouch/Makefile @@ -0,0 +1,33 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= xf86-input-evtouch +PKG_VERSION:= 0.8.8 +PKG_RELEASE:= 1 +PKG_BUILDDEP+= xorg-server +PKG_MD5SUM:= 4d8e092356d8353002f60a4907046c13 +PKG_DESCR:= X11 driver for touchscreen +PKG_SECTION:= x11 +PKG_DEPENDS:= xorg-server kmod-input-evdev +PKG_SITES:= http://www.conan.de/touchscreen/ + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 + +PKG_TARGET_DEPENDS:= alix1c + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,XF86_INPUT_EVTOUCH,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +BUILD_STYLE:= auto +INSTALL_STYLE:= auto + +post-install: + ${INSTALL_DIR} ${IDIR_XF86_INPUT_EVTOUCH}/usr/lib/xorg/modules/input + ${CP} ${WRKINST}/usr/lib/xorg/modules/input/evtouch_drv.so \ + ${IDIR_XF86_INPUT_EVTOUCH}/usr/lib/xorg/modules/input/ + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xf86-input-evtouch/patches/patch-ev_calibrate_c b/package/xf86-input-evtouch/patches/patch-ev_calibrate_c new file mode 100644 index 000000000..103500ea5 --- /dev/null +++ b/package/xf86-input-evtouch/patches/patch-ev_calibrate_c @@ -0,0 +1,11 @@ +--- xf86-input-evtouch-0.8.8.orig/ev_calibrate.c 2008-11-10 12:25:32.000000000 +0100 ++++ xf86-input-evtouch-0.8.8/ev_calibrate.c 2010-01-08 17:13:52.000000000 +0100 +@@ -218,7 +218,7 @@ int main (void) + int cap_style = CapButt; /* style of the line's edje and */ + int join_style = JoinBevel; /* joined lines. */ + +- int event_mask = ExposureMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask; ++ int event_mask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask; + + int depth; + int screen_num; diff --git a/package/xf86-input-evtouch/patches/patch-evtouch_c b/package/xf86-input-evtouch/patches/patch-evtouch_c new file mode 100644 index 000000000..a0fe4919e --- /dev/null +++ b/package/xf86-input-evtouch/patches/patch-evtouch_c @@ -0,0 +1,125 @@ +--- xf86-input-evtouch-0.8.8.orig/evtouch.c 2008-11-11 09:47:55.000000000 +0100 ++++ xf86-input-evtouch-0.8.8/evtouch.c 2010-01-08 17:14:02.000000000 +0100 +@@ -30,8 +30,8 @@ + + #define _evdev_touch_C_ + +-#include <xf86Version.h> +-#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0) ++#include <xorgVersion.h> ++#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(3,9,0,0,0) + #define XFREE86_V4 + #endif + +@@ -74,7 +74,6 @@ + #include "xf86_OSproc.h" + #include "xf86Xinput.h" + #include "exevents.h" +-#include "xf86OSmouse.h" + #include "randrstr.h" + + #ifndef NEED_XF86_TYPES +@@ -139,7 +138,7 @@ static XF86ModuleVersionInfo VersionRec + "Kenan Esau", + MODINFOSTRING1, + MODINFOSTRING2, +- XF86_VERSION_CURRENT, ++ XORG_VERSION_CURRENT, + 0, 8, 8, + ABI_CLASS_XINPUT, + ABI_XINPUT_VERSION, +@@ -167,7 +166,7 @@ Unplug(pointer p) + } + + +-XF86ModuleData evtouchModuleData = {&VersionRec, Plug, Unplug }; ++_X_EXPORT XF86ModuleData evtouchModuleData = {&VersionRec, Plug, Unplug }; + + #endif /* XFree86LOADER */ + +@@ -306,7 +305,7 @@ void EVTouchProcessAbs(EVTouchPrivatePtr + } + + if (pos_changed == 1) { +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2 + ConvertProc(priv->local, 0, 2, + priv->raw_x, priv->raw_y, + 0, 0, 0, 0, +@@ -370,7 +369,7 @@ void EVTouchProcessRel(EVTouchPrivatePtr + priv->raw_y = priv->min_y; + } + +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2 + ConvertProc(priv->local, 0, 2, + priv->raw_x, priv->raw_y, + 0, 0, 0, 0, +@@ -591,6 +590,10 @@ DeviceInit (DeviceIntPtr dev) + EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private); + unsigned char map[EV_MAX_BUTTONS]; + int i; ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ Atom btn_label; ++ Atom axis_labels[2] = { 0, 0 }; ++#endif + + for (i = 0; i < EV_MAX_BUTTONS; i++) + map[i] = i; +@@ -629,7 +632,11 @@ DeviceInit (DeviceIntPtr dev) + /* + * Device reports button press for 5 buttons. + */ +- if (InitButtonClassDeviceStruct (dev, EV_MAX_BUTTONS, map) == FALSE) ++ if (InitButtonClassDeviceStruct (dev, EV_MAX_BUTTONS, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ &btn_label, ++#endif ++ map) == FALSE) + { + ErrorF("Unable to allocate EVTouch touchscreen ButtonClassDeviceStruct\n"); + return BadAlloc; +@@ -653,28 +660,34 @@ DeviceInit (DeviceIntPtr dev) + * Device reports motions on 2 axes in absolute coordinates. + * Axes min and max values are reported in raw coordinates. + */ +- if (InitValuatorClassDeviceStruct(dev, 2, xf86GetMotionEvents, +- local->history_size, Absolute) == FALSE) ++ if (InitValuatorClassDeviceStruct(dev, 2, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ axis_labels, ++#endif ++ local->history_size, Absolute) == FALSE) + { + ErrorF ("Unable to allocate EVTouch touchscreen ValuatorClassDeviceStruct\n"); + return !Success; + } + +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2 +- xf86InitValuatorAxisStruct(dev, 0, 0, priv->screen_width, ++ xf86InitValuatorAxisStruct(dev, 0, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ axis_labels[0], ++#endif ++ 0, priv->screen_width, + 1024, + EV_AXIS_MIN_RES /* min_res */ , + EV_AXIS_MAX_RES /* max_res */ ); + xf86InitValuatorDefaults(dev, 0); +- xf86InitValuatorAxisStruct(dev, 1, 0, priv->screen_height, ++ xf86InitValuatorAxisStruct(dev, 1, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ axis_labels[1], ++#endif ++ 0, priv->screen_height, + 1024, + EV_AXIS_MIN_RES /* min_res */ , + EV_AXIS_MAX_RES /* max_res */ ); + xf86InitValuatorDefaults(dev, 1); +-#else +- xf86InitValuatorAxisStruct(dev, 0, priv->min_x, priv->max_x, +- xf86InitValuatorDefaults(dev, 1); +-#endif + + /* Initial position of pointer on screen: Centered */ + priv->cur_x=(priv->max_x - priv->min_x)/2; diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 790a01d7e..4152dcc0c 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 913a672cbd6da516de15965d594e20b9 PKG_DESCR:= Xorg server PKG_SECTION:= x11 -PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile libfontenc xkeyboard-config xkbcomp +PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile libfontenc xkeyboard-config xkbcomp libxau libxaw libxmu libxpm libxrender libxt libxxf86dga libxext libxdmcp libxv libsm libice libx11 PKG_BUILDDEP+= libX11 randrproto renderproto fixesproto damageproto scrnsaverproto resourceproto fontsproto videoproto compositeproto evieext libxkbfile libXfont pixman libpciaccess openssl xf86dgaproto PKG_URL:= http://www.x.org PKG_SITES:= ${MASTER_SITE_XORG} diff --git a/target/Config.in b/target/Config.in index b721f97c6..a23f3c651 100644 --- a/target/Config.in +++ b/target/Config.in @@ -205,6 +205,7 @@ config ADK_LINUX_X86_ALIX2D13 select ADK_KERNEL_EXT2_FS select ADK_KERNEL_NET_PCI select ADK_KERNEL_NETDEVICES + select ADK_KERNEL_NEW_LEDS select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_MII select BUSYBOX_HWCLOCK diff --git a/target/ag241/Makefile b/target/ag241/Makefile index 9848205cc..f6bba9c85 100644 --- a/target/ag241/Makefile +++ b/target/ag241/Makefile @@ -1,5 +1,3 @@ -# $Id: Makefile 30 2008-09-04 13:31:09Z wbx $ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. diff --git a/target/alix1c/Makefile b/target/alix1c/Makefile index 691cf1a08..c17a1ef8a 100644 --- a/target/alix1c/Makefile +++ b/target/alix1c/Makefile @@ -24,5 +24,6 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo @echo 'The linux kernel is here: $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel' @echo 'The nfs root tarball is here: ${BIN_DIR}/${ROOTFSTARBALL}' + @echo 'Do not forget to create device nodes for console,null and tty in your nfsroot' @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/alix2d/Makefile b/target/alix2d/Makefile index 691cf1a08..c17a1ef8a 100644 --- a/target/alix2d/Makefile +++ b/target/alix2d/Makefile @@ -24,5 +24,6 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo @echo 'The linux kernel is here: $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel' @echo 'The nfs root tarball is here: ${BIN_DIR}/${ROOTFSTARBALL}' + @echo 'Do not forget to create device nodes for console,null and tty in your nfsroot' @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/alix2d/kernel.config b/target/alix2d/kernel.config index a0badc9b6..434e2ad64 100644 --- a/target/alix2d/kernel.config +++ b/target/alix2d/kernel.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.31.5 -# Tue Nov 24 19:35:15 2009 +# Linux kernel version: 2.6.32 +# Sun Jan 10 11:31:53 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -16,7 +16,6 @@ CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_FAST_CMPXCHG_LOCAL=y CONFIG_MMU=y CONFIG_ZONE_DMA=y CONFIG_GENERIC_ISA_DMA=y @@ -34,7 +33,8 @@ CONFIG_ARCH_HAS_CPU_RELAX=y CONFIG_ARCH_HAS_DEFAULT_IDLE=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y -CONFIG_HAVE_DYNAMIC_PER_CPU_AREA=y +CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y +CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y # CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y @@ -76,11 +76,12 @@ CONFIG_SYSVIPC_SYSCTL=y # # RCU Subsystem # -CONFIG_CLASSIC_RCU=y -# CONFIG_TREE_RCU is not set -# CONFIG_PREEMPT_RCU is not set +CONFIG_TREE_RCU=y +# CONFIG_TREE_PREEMPT_RCU is not set +# CONFIG_RCU_TRACE is not set +CONFIG_RCU_FANOUT=32 +# CONFIG_RCU_FANOUT_EXACT is not set # CONFIG_TREE_RCU_TRACE is not set -# CONFIG_PREEMPT_RCU_TRACE is not set # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=14 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y @@ -110,21 +111,20 @@ CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y # CONFIG_AIO is not set -CONFIG_HAVE_PERF_COUNTERS=y +CONFIG_HAVE_PERF_EVENTS=y # -# Performance Counters +# Kernel Performance Events And Counters # +# CONFIG_PERF_EVENTS is not set # CONFIG_PERF_COUNTERS is not set # CONFIG_VM_EVENT_COUNTERS is not set # CONFIG_PCI_QUIRKS is not set -CONFIG_STRIP_ASM_SYMS=y # CONFIG_COMPAT_BRK is not set CONFIG_SLAB=y # CONFIG_SLUB is not set # CONFIG_SLOB is not set # CONFIG_PROFILING is not set -# CONFIG_MARKERS is not set CONFIG_HAVE_OPROFILE=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_HAVE_IOREMAP_PROT=y @@ -203,6 +203,7 @@ CONFIG_MGEODE_LX=y # CONFIG_MVIAC7 is not set # CONFIG_MPSC is not set # CONFIG_MCORE2 is not set +# CONFIG_MATOM is not set # CONFIG_GENERIC_CPU is not set # CONFIG_X86_GENERIC is not set CONFIG_X86_CPU=y @@ -218,7 +219,8 @@ CONFIG_X86_POPAD_OK=y CONFIG_X86_USE_PPRO_CHECKSUM=y CONFIG_X86_USE_3DNOW=y CONFIG_X86_TSC=y -CONFIG_X86_MINIMUM_CPU_FAMILY=4 +CONFIG_X86_CMPXCHG64=y +CONFIG_X86_MINIMUM_CPU_FAMILY=5 CONFIG_X86_DEBUGCTLMSR=y CONFIG_PROCESSOR_SELECT=y # CONFIG_CPU_SUP_INTEL is not set @@ -238,7 +240,6 @@ CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT is not set # CONFIG_X86_UP_APIC is not set # CONFIG_X86_MCE is not set -# CONFIG_X86_ANCIENT_MCE is not set # CONFIG_VM86 is not set # CONFIG_TOSHIBA is not set # CONFIG_I8K is not set @@ -276,6 +277,7 @@ CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y CONFIG_HAVE_MLOCK=y CONFIG_HAVE_MLOCKED_PAGE_BIT=y +# CONFIG_KSM is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_X86_CHECK_BIOS_CORRUPTION=y # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set @@ -305,16 +307,12 @@ CONFIG_CMDLINE="console=ttyS0,115200" # Power management and ACPI options # # CONFIG_PM is not set +# CONFIG_SFI is not set # # CPU Frequency scaling # # CONFIG_CPU_FREQ is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set |