diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-09-30 16:22:31 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-09-30 16:22:31 +0200 |
| commit | 9e2f663b590fb3f1fcf2f03fe057d129bf58764a (patch) | |
| tree | 852729f8936531a15631a0a5ae5608b9355ee227 | |
| parent | 48d5f90b13f0cf886417a2b408547a7310e56102 (diff) | |
| parent | f1ed9c711fd901acee1f8f22f8e7a4440f181fe5 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
29 files changed, 907 insertions, 829 deletions
@@ -177,6 +177,7 @@ config ADK_COMPRESSION_TOOL default "xz" if ADK_TARGET_INITRAMFS_COMPRESSION_XZ default "lzma -9" if ADK_TARGET_INITRAMFS_COMPRESSION_LZMA default "lzop" if ADK_TARGET_INITRAMFS_COMPRESSION_LZO + default "gzip -n9" help source "target/linux/Config.in" diff --git a/mk/image.mk b/mk/image.mk index 57664464e..095b69c1d 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -143,7 +143,7 @@ ${BIN_DIR}/${INITRAMFS}_list: ${TARGET_DIR} ) >>$@ ${BIN_DIR}/${INITRAMFS}: ${BIN_DIR}/${INITRAMFS}_list - bash ${LINUX_DIR}/usr/gen_init_cpio ${BIN_DIR}/${INITRAMFS}_list | \ + ${LINUX_DIR}/usr/gen_init_cpio ${BIN_DIR}/${INITRAMFS}_list | \ ${ADK_COMPRESSION_TOOL} -c >$@ ${BUILD_DIR}/root.squashfs: ${TARGET_DIR} diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile index 8f9f1b3d6..0d6881c48 100644 --- a/package/alsa-utils/Makefile +++ b/package/alsa-utils/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= b65e9a04181bd7c9db7667a4566f8dc3 PKG_DESCR:= ALSA mixer utility PKG_SECTION:= multimedia -PKG_DEPENDS:= alsa-lib libpthread +PKG_DEPENDS:= alsa-lib libpthread libgcc PKG_BUILDDEP:= alsa-lib PKG_URL:= http://www.alsa-project.org/ PKG_SITES:= ftp://ftp.alsa-project.org/pub/utils/ diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 605922737..8ff743270 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -65,6 +65,9 @@ endif ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILE),y) $(SED) 's#ttyS#ttyAMA#g' $(IDIR_BASE_FILES)/etc/inittab endif +ifeq ($(ADK_TARGET_SYSTEM_ARANYM),y) + $(SED) 's#ttyS#nfcon0#g' $(IDIR_BASE_FILES)/etc/inittab +endif $(SED) 's#@SPEED@#$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)#' $(IDIR_BASE_FILES)/etc/inittab test -z $(ADK_RUNTIME_HOSTNAME) || \ echo $(ADK_RUNTIME_HOSTNAME) > $(IDIR_BASE_FILES)/etc/hostname; \ diff --git a/package/cairo/Makefile b/package/cairo/Makefile index 93453d917..887a60425 100644 --- a/package/cairo/Makefile +++ b/package/cairo/Makefile @@ -10,6 +10,7 @@ PKG_MD5SUM:= f101a9e88b783337b20b2e26dfd26d5f PKG_DESCR:= cairo graphics library PKG_SECTION:= libs PKG_DEPENDS:= fontconfig libfreetype libpng libx11 pixman +PKG_DEPENDS+= libxrender PKG_BUILDDEP:= libpng pixman freetype fontconfig libX11 libXrender glib PKG_BUILDDEP+= libXext PKG_URL:= http://cairographics.org/ diff --git a/package/cifs-utils/Makefile b/package/cifs-utils/Makefile index 4b718b07d..e12c6caf7 100644 --- a/package/cifs-utils/Makefile +++ b/package/cifs-utils/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= cifs-utils -PKG_VERSION:= 6.0 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 371e007a201be90c16497cd9bd5e2553 +PKG_VERSION:= 6.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= f83ef48ab1154aa74dd4cf1c1202bf04 PKG_DESCR:= CIFS utilities PKG_SECTION:= net/fs PKG_DEPENDS:= kmod-cifs diff --git a/package/collectd/Makefile b/package/collectd/Makefile index 942e88942..af8ffaf3d 100644 --- a/package/collectd/Makefile +++ b/package/collectd/Makefile @@ -4,16 +4,21 @@ include ${TOPDIR}/rules.mk PKG_NAME:= collectd -PKG_VERSION:= 5.0.1 +PKG_VERSION:= 5.4.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= a405d6cca021748fea43b60348b72b0c +PKG_MD5SUM:= d4176b3066f3b85d85343d3648ea43f6 PKG_DESCR:= System statistics collection daemon PKG_SECTION:= misc -PKG_DEPENDS:= libpthread +PKG_BUILDDEP:= libtool +PKG_DEPENDS:= libpthread libltdl PKG_URL:= http://collectd.org/ PKG_SITES:= http://collectd.org/files/ PKG_FLAVOURS_COLLECTD:= WITH_CPU WITH_LOAD WITH_MEMORY WITH_PING +PKG_FLAVOURS_COLLECTD+= WITH_RRD +PKGFD_WITH_RRD:= enable RRD output +PKGFB_WITH_RRD:= rrdtool +PKGFS_WITH_RRD:= librrd PKGFD_WITH_CPU:= collect CPU statistics PKGFD_WITH_LOAD:= collect system load statistics PKGFD_WITH_MEMORY:= collect memory usage statistics @@ -36,11 +41,14 @@ ifneq (${ADK_PACKAGE_COLLECTD_WITH_PING},y) DISABLE_PING:=--disable-ping endif -CONFIGURE_ARGS+= --disable-apache \ +CONFIGURE_ARGS+= --disable-aggregation \ + --disable-apache \ --disable-apcups \ --disable-apple_sensors \ --disable-ascent \ --disable-battery \ + --disable-cgroups \ + --disable-conntrack \ ${DISABLE_CPU} \ --disable-cpufreq \ --disable-contextswitch \ @@ -50,6 +58,7 @@ CONFIGURE_ARGS+= --disable-apache \ --disable-dns \ --disable-email \ --disable-entropy \ + --disable-ethstat \ --disable-exec \ --disable-filecount \ --disable-fscache \ @@ -61,38 +70,47 @@ CONFIGURE_ARGS+= --disable-apache \ ${DISABLE_LOAD} \ --disable-madwifi \ --disable-mbmon \ + --disable-md \ --disable-memcached \ ${DISABLE_MEMORY} \ --disable-multimeter \ --disable-mysql \ - --disable-openvpn \ - --disable-python \ - --disable-postgresql \ - --disable-powerdns \ --disable-network \ --disable-nginx \ --disable-nfs \ --disable-ntpd \ + --disable-numa \ --disable-nut \ + --disable-olsrd \ + --disable-openvpn \ + --disable-python \ + --disable-postgresql \ + --disable-powerdns \ --disable-perl \ ${DISABLE_PING} \ --disable-processes \ + --disable-protocols \ --disable-sensors \ --disable-serial \ --disable-logfile \ + --disable-statsd \ --disable-swap \ - --disable-syslog \ + --enable-syslog \ --disable-tape \ --disable-target_notification \ --disable-target_replace \ --disable-target_set \ + --disable-tcpconns \ --disable-teamspeak2 \ --disable-ted \ --disable-thermal \ --disable-unixsock \ --disable-users \ + --disable-uptime \ + --disable-uuid \ --disable-vserver \ --disable-wireless \ + --disable-write_graphite \ --disable-write_http \ --with-fp-layout=nothing \ --without-java \ @@ -106,6 +124,9 @@ XAKE_FLAGS+= LIBS='-lm -lltdl' post-install: ${INSTALL_DIR} ${IDIR_COLLECTD}/usr/lib/collectd \ ${IDIR_COLLECTD}/usr/sbin ${IDIR_COLLECTD}/etc + ${INSTALL_DIR} ${IDIR_COLLECTD}/usr/share/collectd + ${CP} ${WRKINST}/usr/share/collectd/types.db \ + ${IDIR_COLLECTD}/usr/share/collectd ${INSTALL_BIN} ${WRKINST}/usr/sbin/collectd ${IDIR_COLLECTD}/usr/sbin ${CP} ${WRKINST}/usr/lib/collectd/*.so \ ${IDIR_COLLECTD}/usr/lib/collectd diff --git a/package/collectd/patches/patch-src_Makefile_in b/package/collectd/patches/patch-src_Makefile_in deleted file mode 100644 index d1580516a..000000000 --- a/package/collectd/patches/patch-src_Makefile_in +++ /dev/null @@ -1,13 +0,0 @@ ---- collectd-5.0.1.orig/src/Makefile.in 2011-10-14 22:54:14.000000000 +0200 -+++ collectd-5.0.1/src/Makefile.in 2011-10-22 18:57:51.000000000 +0200 -@@ -56,8 +56,8 @@ bin_PROGRAMS = collectd-nagios$(EXEEXT) - # too. -octo - @BUILD_WITH_LIBSTATGRAB_TRUE@am__append_13 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS) - @BUILD_WITH_LIBSTATGRAB_TRUE@am__append_14 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS) --@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_15 = $(LIBLTDL) liboconfig/liboconfig.la --@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_16 = $(LIBLTDL) liboconfig/liboconfig.la -+@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_15 = liboconfig/liboconfig.la -+@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_16 = liboconfig/liboconfig.la - @BUILD_WITH_OWN_LIBOCONFIG_FALSE@am__append_17 = -loconfig - @BUILD_WITH_LIBSOCKET_TRUE@am__append_18 = -lsocket - @BUILD_AIX_TRUE@am__append_19 = -lm diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile index 003cd9783..9c024504c 100644 --- a/package/libgcc/Makefile +++ b/package/libgcc/Makefile @@ -11,7 +11,7 @@ PKG_SECTION:= libs NO_DISTFILES:= 1 -PKG_ARCH_DEPENDS:= !sh !avr32 +PKG_ARCH_DEPENDS:= !avr32 include ${TOPDIR}/mk/package.mk @@ -24,8 +24,12 @@ INSTALL_STYLE:= manual do-install: ifeq ($(ADK_NATIVE),) ${INSTALL_DIR} ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) +ifeq ($(ADK_LINUX_SH),y) + ${CP} ${STAGING_TARGET_DIR}/lib/!m1/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) +else ${CP} ${STAGING_TARGET_DIR}/$(ADK_TARGET_LIBC_PATH)/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) endif +endif ifeq ($(ADK_TARGET_MULTILIB_X86_32),y) ${INSTALL_DIR} ${IDIR_LIBGCC}/lib32 ${CP} ${STAGING_TARGET_DIR_32}/lib/libgcc*.so* ${IDIR_LIBGCC}/lib32 diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile index cf395108d..cdc2fe9bb 100644 --- a/package/libpthread/Makefile +++ b/package/libpthread/Makefile @@ -43,8 +43,8 @@ INSTALL_STYLE:= manual libpthread-install: ifeq ($(ADK_NATIVE),) - ${INSTALL_DIR} ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH) ifeq ($(ADK_TARGET_LIB_MUSL),) + ${INSTALL_DIR} ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH) ${CP} ${STAGING_TARGET_DIR}/lib/libpthread*.so* ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH) endif endif diff --git a/package/mpd/Makefile b/package/mpd/Makefile index 39cf4b0c8..d8ad8eac5 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= b68be330deeb23989c08a9fefd9fcdeb PKG_DESCR:= A music player daemon PKG_SECTION:= multimedia -PKG_DEPENDS:= glib libstdcxx +PKG_DEPENDS:= glib libstdcxx libgcc PKG_FDEPENDS:= glib libstdcxx PKG_BUILDDEP:= glib PKG_URL:= http://www.musicpd.org/ diff --git a/package/mpd/files/mpd.conf b/package/mpd/files/mpd.conf index 48af33c4a..d05c29e44 100644 --- a/package/mpd/files/mpd.conf +++ b/package/mpd/files/mpd.conf @@ -1,8 +1,8 @@ # An example configuration file for MPD user "mpd" music_directory "/music" -playlist_directory "~/playlists" -db_file "~/.database" +playlist_directory "/etc/mpd/playlists" +db_file "/etc/mpd/database" pid_file "/var/run/mpd/mpd.pid" log_file "syslog" # An example of an ALSA output diff --git a/package/rrdtool/Makefile b/package/rrdtool/Makefile index a047f032c..840633559 100644 --- a/package/rrdtool/Makefile +++ b/package/rrdtool/Makefile @@ -4,25 +4,29 @@ include ${TOPDIR}/rules.mk PKG_NAME:= rrdtool -PKG_VERSION:= 1.2.30 +PKG_VERSION:= 1.4.8 PKG_RELEASE:= 1 -PKG_MD5SUM:= 19b24f7184a8dbf7b48c1bbb565ad9fb -PKG_DESCR:= Round Robin Database (RRD) management library and tools +PKG_MD5SUM:= dbe59386db97fd2f2216729facd74ca8 +PKG_DESCR:= Round Robin Database (RRD) management library PKG_SECTION:= libs PKG_DEPENDS:= libart libfreetype libpng zlib +PKG_DEPENDS+= glib cairo pango PKG_BUILDDEP:= libxml2 cgilib freetype libart libpng +PKG_BUILDDEP+= glib cairo pango PKG_URL:= http://oss.oetiker.ch/ PKG_SITES:= http://oss.oetiker.ch/rrdtool/pub/ PKG_SUBPKGS:= LIBRRD RRDCGI RRDTOOL -PKG_SECTION_RRDCGI:= misc -PKG_SECTION_RRDTOOL:= misc +PKGSC_RRDCGI:= misc +PKGSD_RRDCGI:= RRD CGI +PKGSC_RRDTOOL:= misc +PKGSD_RRDTOOL:= RRD tool include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBRRD,librrd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,RRDCGI,rrdcgi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION_RRDCGI})) -$(eval $(call PKG_template,RRDTOOL,rrdtool,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION_RRDTOOL})) +$(eval $(call PKG_template,RRDCGI,rrdcgi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_RRDCGI})) +$(eval $(call PKG_template,RRDTOOL,rrdtool,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_RRDTOOL})) CONFIGURE_ENV+= rd_cv_ieee_works=yes CONFIGURE_ARGS+= --enable-rrdcgi \ @@ -30,21 +34,22 @@ CONFIGURE_ARGS+= --enable-rrdcgi \ --disable-perl \ --disable-ruby \ --disable-tcl \ - --disable-python \ - --without-x \ - --with-rrd-default-font=/usr/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf + --disable-python TARGET_CPPFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/freetype2 +TARGET_LDFLAGS+= -lglib-2.0 +XAKE_FLAGS+= GCC_HONOUR_COPTS=s -post-install: +rrdtool-install: ${INSTALL_DIR} ${IDIR_RRDTOOL}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/rrdtool ${WRKINST}/usr/bin/rrdupdate \ ${IDIR_RRDTOOL}/usr/bin/ + +rrdcgi-install: ${INSTALL_DIR} ${IDIR_RRDCGI}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/rrdcgi ${IDIR_RRDCGI}/usr/bin/ + +librrd-install: ${INSTALL_DIR} ${IDIR_LIBRRD}/usr/lib - ${CP} ${WRKINST}/usr/lib/librrd.so.* ${IDIR_LIBRRD}/usr/lib/ - ${INSTALL_DIR} ${IDIR_LIBRRD}/usr/share/rrdtool/fonts - ${CP} ${WRKBUILD}/src/DejaVuSansMono-Roman.ttf \ - ${IDIR_LIBRRD}/usr/share/rrdtool/fonts/ + ${CP} ${WRKINST}/usr/lib/librrd*.so* ${IDIR_LIBRRD}/usr/lib/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/rrdtool/patches/patch-configure b/package/rrdtool/patches/patch-configure deleted file mode 100644 index 852d96098..000000000 --- a/package/rrdtool/patches/patch-configure +++ /dev/null @@ -1,21 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- rrdtool-1.2.30.orig/configure 2009-01-19 15:29:29.000000000 +0100 -+++ rrdtool-1.2.30/configure 2009-05-09 04:31:25.000000000 +0200 -@@ -26320,7 +26320,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - ex_check_save_CPPFLAGS=${CPPFLAGS} - ex_check_save_LDFLAGS=${LDFLAGS} - if test "x/usr/include/libart-2.0" != "x"; then -- CPPFLAGS="$CPPFLAGS -I/usr/include/libart-2.0" -+ CPPFLAGS="$CPPFLAGS" - fi - { echo "$as_me:$LINENO: checking for art_vpath_add_point in -lart_lgpl_2" >&5 - echo $ECHO_N "checking for art_vpath_add_point in -lart_lgpl_2... $ECHO_C" >&6; } -@@ -27916,7 +27916,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - ex_check_save_CPPFLAGS=${CPPFLAGS} - ex_check_save_LDFLAGS=${LDFLAGS} - if test "x/usr/include/freetype2" != "x"; then -- CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2" -+ CPPFLAGS="$CPPFLAGS" - fi - { echo "$as_me:$LINENO: checking for FT_Init_FreeType in -lfreetype" >&5 - echo $ECHO_N "checking for FT_Init_FreeType in -lfreetype... $ECHO_C" >&6; } diff --git a/package/rrdtool/patches/patch-ltmain_sh b/package/rrdtool/patches/patch-ltmain_sh deleted file mode 100644 index 940e4a403..000000000 --- a/package/rrdtool/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- rrdtool-1.2.30.orig/ltmain.sh 2007-03-14 16:47:55.000000000 +0100 -+++ rrdtool-1.2.30/ltmain.sh 2011-01-16 22:22:28.000000000 +0100 -@@ -1623,7 +1623,7 @@ EOF - # -pg pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ -- -t[45]*|-txscale*|@*) -+ -t[45]*|-txscale*|@*|-fstack-protector*|-flto) - - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. @@ -43,6 +43,7 @@ ADK_RUNTIME_TMPFS_SIZE:= $(strip $(subst ",, $(ADK_RUNTIME_TMPFS_SIZE))) ADK_RUNTIME_CONSOLE_SERIAL_SPEED:= $(strip $(subst ",, $(ADK_RUNTIME_CONSOLE_SERIAL_SPEED))) ADK_HOST:= $(strip $(subst ",, $(ADK_HOST))) ADK_VENDOR:= $(strip $(subst ",, $(ADK_VENDOR))) +ADK_COMPRESSION_TOOL:= $(strip $(subst ",, $(ADK_COMPRESSION_TOOL))) ADK_TOOLS_ADDPATTERN_ARGS:= $(strip $(subst ",, $(ADK_TOOLS_ADDPATTERN_ARGS))) ADK_KERNEL_VERSION:= $(strip $(subst ",, $(ADK_KERNEL_VERSION))) ADK_PARAMETER_NETCONSOLE_SRC_IP:= $(strip $(subst ",, $(ADK_PARAMETER_NETCONSOLE_SRC_IP))) diff --git a/scripts/create-sys b/scripts/create-sys index c34a6ac3a..d34a0e443 100755 --- a/scripts/create-sys +++ b/scripts/create-sys @@ -32,7 +32,7 @@ for i in $systems;do systemu=$(echo $system|tr '[:upper:]' '[:lower:]') system=$(echo $system|tr '[:upper:]_' '[:lower:]-') system=$(echo $system|sed 's#x86-64#x86_64#') - if [ "${system%-*}" = "toolchain" -o "${system%-*}" = "qemu" -o "${system%-*}" = "vbox" ];then + if [ "${system%-*}" = "toolchain" -o "${system%-*}" = "qemu" -o "${system%-*}" = "vbox" -o "${system%-*}" = "aranym" ];then printf "\tdefault \"${system%-*}\" if ADK_$systemu\n" >> $topdir/target/config/Config.in.system.default else printf "\tdefault \"${system}\" if ADK_$systemu\n" >> $topdir/target/config/Config.in.system.default diff --git a/scripts/update-sys b/scripts/update-sys index 64b56a7dd..6c82dc626 100755 --- a/scripts/update-sys +++ b/scripts/update-sys @@ -49,7 +49,7 @@ config $archsym boolean EOF -if [ "${system}" = "toolchain" -o "${system}" = "qemu" -o "${system}" = "vbox" ];then +if [ "${system}" = "toolchain" -o "${system}" = "qemu" -o "${system}" = "vbox" -o "${system}" = "aranym" ];then sys=${system}-$cpuarch else sys=$system diff --git a/target/config/Config.in b/target/config/Config.in index a14ef5b7a..6a7c05d82 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -542,7 +542,8 @@ config ADK_TARGET_CMDLINE default "console=ttyS0,115200 console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_SPITZ default "console=ttyAMA0 console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILE default "console=ttyS0,115200 console=tty0 fbcon=rotate:1" if ADK_TARGET_SYSTEM_SHARP_ZAURUS - default "console=tty0" if ADK_TARGET_SYSTEM_QEMU_SH + default "console=ttySC1 console=tty0" if ADK_TARGET_SYSTEM_QEMU_SH + default "console=ttyS0" if ADK_TARGET_SYSTEM_ARANYM_M68K default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_FOXBOARD_LX @@ -672,6 +673,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS bool "initramfs filesystem" depends on \ ADK_HARDWARE_QEMU || \ + ADK_TARGET_SYSTEM_ARANYM_M68K || \ ADK_LINUX_ARM || \ ADK_LINUX_MIPS || \ ADK_LINUX_PPC || \ @@ -731,7 +733,7 @@ config ADK_TARGET_ROOTFS_NFSROOT select ADK_KERNEL_NFS_COMMON select ADK_KERNEL_IP_PNP select ADK_KERNEL_IP_PNP_DHCP - depends on !ADK_HARDWARE_QEMU && !ADK_HARDWARE_VBOX + depends on !ADK_HARDWARE_QEMU && !ADK_HARDWARE_VBOX && !ADK_TARGET_SYSTEM_ARANYM_M68K depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI help Root filesystem mounted via NFS. (DHCP) diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics index dfa31bba7..e35f97ac4 100644 --- a/target/linux/config/Config.in.graphics +++ b/target/linux/config/Config.in.graphics @@ -20,6 +20,7 @@ config ADK_KERNEL_VGA_CONSOLE boolean default y if ADK_HARDWARE_VBOX default y if ADK_HARDWARE_QEMU + default y if ADK_TARGET_SYSTEM_ARANYM_M68K default n config ADK_KERNEL_FONTS diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input index 3eff14a42..a4079c37b 100644 --- a/target/linux/config/Config.in.input +++ b/target/linux/config/Config.in.input @@ -5,6 +5,7 @@ config ADK_KERNEL_INPUT boolean default y if ADK_TARGET_SYSTEM_QEMU_I686 default y if ADK_TARGET_SYSTEM_QEMU_X86_64 + default y if ADK_TARGET_SYSTEM_ARANYM_M68K default y if ADK_TARGET_SYSTEM_VBOX_I686 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 @@ -19,6 +20,16 @@ config ADK_KERNEL_INPUT default y if ADK_TARGET_SYSTEM_RASPBERRY_PI default n +config ADK_KERNEL_KEYBOARD_ATARI + boolean + default y if ADK_TARGET_SYSTEM_ARANYM_M68K + default n + +config ADK_KERNEL_MOUSE_ATARI + boolean + default y if ADK_TARGET_SYSTEM_ARANYM_M68K + default n + config ADK_KERNEL_KEYBOARD_GPIO boolean default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS @@ -48,6 +59,7 @@ config ADK_KERNEL_INPUT_KEYBOARD boolean default y if ADK_TARGET_SYSTEM_QEMU_I686 default y if ADK_TARGET_SYSTEM_QEMU_X86_64 + default y if ADK_TARGET_SYSTEM_ARANYM_M68K default y if ADK_TARGET_SYSTEM_VBOX_I686 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 @@ -82,6 +94,7 @@ config ADK_KERNEL_INPUT_MOUSE boolean default y if ADK_TARGET_SYSTEM_QEMU_I686 default y if ADK_TARGET_SYSTEM_QEMU_X86_64 + default y if ADK_TARGET_SYSTEM_ARANYM_M68K default y if ADK_TARGET_SYSTEM_VBOX_I686 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index 710e4987e..fa0c3171f 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -31,6 +31,7 @@ config ADK_KPACKAGE_KMOD_USB select ADK_KERNEL_NLS depends on !ADK_KERNEL_USB default y if ADK_TARGET_SYSTEM_QEMU_I686 + default y if ADK_TARGET_SYSTEM_QEMU_SH default y if ADK_TARGET_SYSTEM_QEMU_X86_64 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 @@ -115,6 +116,7 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD default y if ADK_TARGET_SYSTEM_INTEL_ATOM default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG + default y if ADK_TARGET_SYSTEM_QEMU_SH default n help The Open Host Controller Interface (OHCI) is a standard for accessing diff --git a/target/m68k/kernel.config b/target/m68k/kernel.config index 99a53dd7a..7fa647489 100644 --- a/target/m68k/kernel.config +++ b/target/m68k/kernel.config @@ -1,38 +1,34 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/m68k 3.4.4 Kernel Configuration +# Linux/m68k 3.9.11 Kernel Configuration # CONFIG_M68K=y CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_TIME_LOW_RES=y -CONFIG_ARCH_USES_GETTIMEOFFSET=y CONFIG_NO_IOPORT=y # CONFIG_NO_DMA is not set CONFIG_ZONE_DMA=y -CONFIG_CPU_HAS_ADDRESS_SPACES=y -CONFIG_FPU=y CONFIG_HZ=100 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_IRQ_WORK=y # # General setup # -CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set -CONFIG_DEFAULT_HOSTNAME="(none)" -CONFIG_SWAP=y +CONFIG_DEFAULT_HOSTNAME="openadk" +# CONFIG_SWAP is not set CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y -# CONFIG_POSIX_MQUEUE is not set -# CONFIG_BSD_PROCESS_ACCT is not set +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y # CONFIG_FHANDLE is not set -# CONFIG_TASKSTATS is not set # CONFIG_AUDIT is not set CONFIG_HAVE_GENERIC_HARDIRQS=y @@ -41,12 +37,21 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y # CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_ARCH_USES_GETTIMEOFFSET=y + +# +# CPU/Task time and stats accounting +# +CONFIG_TICK_CPU_ACCOUNTING=y +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set # # RCU Subsystem # CONFIG_TINY_RCU=y # CONFIG_PREEMPT_RCU is not set +# CONFIG_RCU_STALL_COMMON is not set # CONFIG_TREE_RCU_TRACE is not set CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y @@ -59,6 +64,8 @@ CONFIG_NAMESPACES=y # CONFIG_USER_NS is not set # CONFIG_PID_NS is not set # CONFIG_NET_NS is not set +CONFIG_UIDGID_CONVERTED=y +# CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set # CONFIG_SCHED_AUTOGROUP is not set # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_RELAY is not set @@ -66,14 +73,15 @@ CONFIG_NAMESPACES=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y -# CONFIG_EXPERT is not set +CONFIG_EXPERT=y +CONFIG_HAVE_UID16=y CONFIG_UID16=y # CONFIG_SYSCTL_SYSCALL is not set CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y -CONFIG_ELF_CORE=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y @@ -82,7 +90,7 @@ CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_AIO=y -# CONFIG_EMBEDDED is not set +CONFIG_EMBEDDED=y # # Kernel Performance Events And Counters @@ -92,7 +100,15 @@ CONFIG_SLUB_DEBUG=y # CONFIG_COMPAT_BRK is not set # CONFIG_SLAB is not set CONFIG_SLUB=y +# CONFIG_SLOB is not set # CONFIG_PROFILING is not set +# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_HAVE_MOD_ARCH_SPECIFIC=y +CONFIG_MODULES_USE_ELF_RELA=y +CONFIG_MODULES_USE_ELF_REL=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_OLD_SIGACTION=y # # GCOV-based kernel profiling @@ -104,9 +120,10 @@ CONFIG_BASE_SMALL=0 CONFIG_MODULES=y # CONFIG_MODULE_FORCE_LOAD is not set CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_MODULE_SIG is not set CONFIG_BLOCK=y # CONFIG_LBDAF is not set # CONFIG_BLK_DEV_BSG is not set @@ -117,8 +134,9 @@ CONFIG_BLOCK=y # Partition Types # # CONFIG_PARTITION_ADVANCED is not set -CONFIG_MAC_PARTITION=y +CONFIG_ATARI_PARTITION=y CONFIG_MSDOS_PARTITION=y +CONFIG_EFI_PARTITION=y # # IO Schedulers @@ -128,34 +146,11 @@ CONFIG_IOSCHED_NOOP=y # CONFIG_IOSCHED_CFQ is not set CONFIG_DEFAULT_NOOP=y CONFIG_DEFAULT_IOSCHED="noop" -# CONFIG_INLINE_SPIN_TRYLOCK is not set -# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK is not set -# CONFIG_INLINE_SPIN_LOCK_BH is not set -# CONFIG_INLINE_SPIN_LOCK_IRQ is not set -# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set -# CONFIG_INLINE_SPIN_UNLOCK_BH is not set CONFIG_INLINE_SPIN_UNLOCK_IRQ=y -# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_READ_TRYLOCK is not set -# CONFIG_INLINE_READ_LOCK is not set -# CONFIG_INLINE_READ_LOCK_BH is not set -# CONFIG_INLINE_READ_LOCK_IRQ is not set -# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set CONFIG_INLINE_READ_UNLOCK=y -# CONFIG_INLINE_READ_UNLOCK_BH is not set CONFIG_INLINE_READ_UNLOCK_IRQ=y -# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set -# CONFIG_INLINE_WRITE_TRYLOCK is not set -# CONFIG_INLINE_WRITE_LOCK is not set -# CONFIG_INLINE_WRITE_LOCK_BH is not set -# CONFIG_INLINE_WRITE_LOCK_IRQ is not set -# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set CONFIG_INLINE_WRITE_UNLOCK=y -# CONFIG_INLINE_WRITE_UNLOCK_BH is not set CONFIG_INLINE_WRITE_UNLOCK_IRQ=y -# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set -# CONFIG_MUTEX_SPIN_ON_OWNER is not set # CONFIG_FREEZER is not set CONFIG_MMU=y CONFIG_MMU_MOTOROLA=y @@ -169,9 +164,9 @@ CONFIG_MMU_MOTOROLA=y # CONFIG_M68KCLASSIC=y # CONFIG_COLDFIRE is not set -CONFIG_M68020=y +# CONFIG_M68020 is not set # CONFIG_M68030 is not set -# CONFIG_M68040 is not set +CONFIG_M68040=y # CONFIG_M68060 is not set # @@ -180,15 +175,16 @@ CONFIG_M68020=y # CONFIG_M68KFPU_EMU is not set # CONFIG_ADVANCED is not set CONFIG_ARCH_DISCONTIGMEM_ENABLE=y -CONFIG_M68K_L2_CACHE=y CONFIG_NODES_SHIFT=3 +CONFIG_CPU_HAS_ADDRESS_SPACES=y +CONFIG_FPU=y # # Machine Types # # CONFIG_AMIGA is not set -# CONFIG_ATARI is not set -CONFIG_MAC=y +CONFIG_ATARI=y +# CONFIG_MAC is not set # CONFIG_APOLLO is not set # CONFIG_VME is not set # CONFIG_HP300 is not set @@ -198,18 +194,15 @@ CONFIG_MAC=y # # Bus Support # -CONFIG_NUBUS=y # CONFIG_GENERIC_ISA_DMA is not set -# CONFIG_ARCH_SUPPORTS_MSI is not set # # Kernel Features # -CONFIG_SELECT_MEMORY_MODEL=y -CONFIG_DISCONTIGMEM_MANUAL=y CONFIG_DISCONTIGMEM=y CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_NEED_MULTIPLE_NODES=y +# CONFIG_HAVE_BOOTMEM_INFO_NODE |