diff options
23 files changed, 6745 insertions, 7384 deletions
diff --git a/mk/build.mk b/mk/build.mk index fd1d12c11..5821e6c20 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -37,6 +37,8 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PACKAGE_OPENAFS=n \ ADK_PACKAGE_OPENJDK7=n \ ADK_PKG_XORG=n \ + ADK_PKG_CONSOLE=n \ + ADK_PKG_TEST=n \ ADK_PKG_MPDBOX=n \ ADK_PKG_DEVELOPMENT=n \ ADK_PKG_CONSOLE=n \ diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 5ec5f3107..55830b23c 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -36,7 +36,7 @@ ROOTFS:= root=/dev/sda1 rootwait endif ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) -USB:= rootwait +USB:= rootwait root=/dev/sdc1 else USB:= rootdelay=2 endif diff --git a/package/base-files/Makefile b/package/base-files/Makefile index f325d2210..81fb1f6df 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.0 -PKG_RELEASE:= 69 +PKG_RELEASE:= 70 PKG_SECTION:= base PKG_DESCR:= basic files and scripts PKG_BUILDDEP:= pkgconf-host file-host diff --git a/package/base-files/src/etc/init.d/fs b/package/base-files/src/etc/init.d/fs index f79d9348d..75ae760e0 100644 --- a/package/base-files/src/etc/init.d/fs +++ b/package/base-files/src/etc/init.d/fs @@ -2,66 +2,17 @@ #INIT 60 [[ $1 = autostart ]] || exit 0 -# activate swap -[ -x /sbin/swapon ] && { swapon -a; } - -# activate any logical volumes -[ -x /usr/sbin/lvm ] && { lvm vgscan; lvm vgchange -ay; } - -# filesystem checks -[ -x /sbin/fsck.ext2 ] && { - for i in $(grep ext2 /etc/fstab|awk '{ print $1}');do fsck.ext2 $i;done; -} -[ -x /sbin/fsck.ext3 ] && { - for i in $(grep ext3 /etc/fstab|awk '{ print $1}');do fsck.ext3 $i;done; -} -[ -x /sbin/fsck.ext4 ] && { - for i in $(grep ext4 /etc/fstab|awk '{ print $1}');do fsck.ext4 $i;done; -} -[ -x /sbin/fsck.xfs ] && { - for i in $(grep xfs /etc/fstab|awk '{ print $1}');do xfs_repair $i;done; -} -# local filesystems -grep ext2 /proc/filesystems >/dev/null 2>&1 -if [ $? -eq 0 ];then - grep ext2 /etc/fstab >/dev/null 2>&1 - if [ $? -eq 0 ];then - mount -a -t ext2 - fi -fi -grep ext3 /proc/filesystems >/dev/null 2>&1 -if [ $? -eq 0 ];then - grep ext3 /etc/fstab >/dev/null 2>&1 - if [ $? -eq 0 ];then - mount -a -t ext3 - fi -fi -grep ext4 /proc/filesystems >/dev/null 2>&1 -if [ $? -eq 0 ];then - grep ext4 /etc/fstab >/dev/null 2>&1 - if [ $? -eq 0 ];then - mount -a -t ext4 - fi -fi -grep xfs /proc/filesystems >/dev/null 2>&1 -if [ $? -eq 0 ];then - grep xfs /etc/fstab >/dev/null 2>&1 - if [ $? -eq 0 ];then - mount -a -t xfs - fi -fi - # mount net filesystems (nfs/cifs) grep nfs /proc/filesystems >/dev/null 2>&1 if [ $? -eq 0 ];then - grep nfs /etc/fstab >/dev/null 2>&1 + grep -v "^#" /etc/fstab| grep nfs >/dev/null 2>&1 if [ $? -eq 0 ];then mount -a -t nfs fi fi grep cifs /proc/filesystems >/dev/null 2>&1 if [ $? -eq 0 ];then - grep cifs /etc/fstab >/dev/null 2>&1 + grep -v "^#" /etc/fstab| grep cifs >/dev/null 2>&1 if [ $? -eq 0 ];then mount -a -t cifs fi diff --git a/package/base-files/src/etc/init.d/fsnet b/package/base-files/src/etc/init.d/fsnet new file mode 100644 index 000000000..8f4397897 --- /dev/null +++ b/package/base-files/src/etc/init.d/fsnet @@ -0,0 +1,53 @@ +#!/bin/sh +#INIT 20 +[[ $1 = autostart ]] || exit 0 + +# activate swap +[ -x /sbin/swapon ] && { swapon -a; } + +# activate any logical volumes +[ -x /usr/sbin/lvm ] && { lvm vgscan; lvm vgchange -ay; } + +# filesystem checks +[ -x /sbin/fsck.ext2 ] && { + for i in $(grep -v "^#" /etc/fstab|grep ext2|awk '{ print $1}');do fsck.ext2 $i;done; +} +[ -x /sbin/fsck.ext3 ] && { + for i in $(grep -v "^#" /etc/fstab|grep ext3|awk '{ print $1}');do fsck.ext3 $i;done; +} +[ -x /sbin/fsck.ext4 ] && { + for i in $(grep -v "^#" /etc/fstab|grep ext4|awk '{ print $1}');do fsck.ext4 $i;done; +} +[ -x /sbin/fsck.xfs ] && { + for i in $(grep -v "^#" /etc/fstab|grep xfs|awk '{ print $1}');do xfs_repair $i;done; +} +# local filesystems +grep ext2 /proc/filesystems >/dev/null 2>&1 +if [ $? -eq 0 ];then + grep -v "^#" /etc/fstab |grep ext2 >/dev/null 2>&1 + if [ $? -eq 0 ];then + mount -a -t ext2 + fi +fi +grep ext3 /proc/filesystems >/dev/null 2>&1 +if [ $? -eq 0 ];then + grep -v "^#" /etc/fstab |grep ext3 >/dev/null 2>&1 + if [ $? -eq 0 ];then + mount -a -t ext3 + fi +fi +grep ext4 /proc/filesystems >/dev/null 2>&1 +if [ $? -eq 0 ];then + grep -v "^#" /etc/fstab |grep ext4 >/dev/null 2>&1 + if [ $? -eq 0 ];then + mount -a -t ext4 + fi +fi +grep xfs /proc/filesystems >/dev/null 2>&1 +if [ $? -eq 0 ];then + grep -v "^#" /etc/fstab |grep xfs >/dev/null 2>&1 + if [ $? -eq 0 ];then + mount -a -t xfs + fi +fi +exit 0 diff --git a/package/dosfstools/Makefile b/package/dosfstools/Makefile index 9b6c365a1..1dd82182a 100644 --- a/package/dosfstools/Makefile +++ b/package/dosfstools/Makefile @@ -4,26 +4,29 @@ include ${TOPDIR}/rules.mk PKG_NAME:= dosfstools -PKG_VERSION:= 3.0.9 +PKG_VERSION:= 3.0.26 PKG_RELEASE:= 2 -PKG_MD5SUM:= bd273cf8aa6341c0b52cbac72050bcf4 -PKG_DESCR:= Utilities to create and check MS-DOS FAT filesystems +PKG_MD5SUM:= 45012f5f56f2aae3afcd62120b9e5a08 +PKG_DESCR:= utilities to create and check FAT filesystems PKG_SECTION:= fs +PKG_BUILDDEP:= libiconv-tiny PKG_URL:= http://www.daniel-baumann.ch/software/dosfstools/ -PKG_SITES:= http://www.daniel-baumann.ch/software/dosfstools/ +PKG_SITES:= http://daniel-baumann.ch/files/software/dosfstools/ + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,DOSFSTOOLS,dosfstools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= manual -XAKE_FLAGS+= PREFIX="" OPTFLAGS="-D_FILE_OFFSET_BITS=64" +XAKE_FLAGS+= PREFIX="" -post-install: +dosfstools-install: ${INSTALL_DIR} ${IDIR_DOSFSTOOLS}/sbin ${CP} ${WRKINST}/sbin/dosfsck ${IDIR_DOSFSTOOLS}/sbin/ - ${CP} ${WRKINST}/sbin/fsck.{msdos,vfat} ${IDIR_DOSFSTOOLS}/sbin/ + ${CP} ${WRKINST}/sbin/fsck.{msdos,vfat,fat} ${IDIR_DOSFSTOOLS}/sbin/ ${CP} ${WRKINST}/sbin/mkdosfs ${IDIR_DOSFSTOOLS}/sbin/ - ${CP} ${WRKINST}/sbin/mkfs.{msdos,vfat} ${IDIR_DOSFSTOOLS}/sbin/ + ${CP} ${WRKINST}/sbin/mkfs.{msdos,vfat,fat} ${IDIR_DOSFSTOOLS}/sbin/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/dosfstools/patches/patch-Makefile b/package/dosfstools/patches/patch-Makefile index c20b7f4dc..1d127acbc 100644 --- a/package/dosfstools/patches/patch-Makefile +++ b/package/dosfstools/patches/patch-Makefile @@ -1,11 +1,13 @@ ---- dosfstools-3.0.9.orig/Makefile 2009-10-04 11:03:23.000000000 +0200 -+++ dosfstools-3.0.9/Makefile 2011-01-07 21:50:15.000000000 +0100 -@@ -29,7 +29,7 @@ OPTFLAGS = -O2 -fomit-frame-pointer $(sh +--- dosfstools-3.0.26.orig/Makefile 2014-01-17 07:09:28.000000000 +0100 ++++ dosfstools-3.0.26/Makefile 2014-03-13 08:58:52.000000000 +0100 +@@ -32,7 +32,9 @@ OPTFLAGS = -O2 -fomit-frame-pointer -D_G #WARNFLAGS = -Wall -pedantic -std=c99 - WARNFLAGS = -Wall + WARNFLAGS = -Wall -Wextra -Wno-sign-compare -Wno-missing-field-initializers -Wmissing-prototypes -Wstrict-prototypes DEBUGFLAGS = -g -CFLAGS += $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS) ++CFLAGS ?= +CFLAGS += $(WARNFLAGS) ++LDLIBS = -liconv VPATH = src diff --git a/package/samba/Makefile b/package/samba/Makefile index f29bf52e0..34cbeec8a 100644 --- a/package/samba/Makefile +++ b/package/samba/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= samba -PKG_VERSION:= 3.6.21 +PKG_VERSION:= 3.6.23 PKG_RELEASE:= 1 -PKG_MD5SUM:= faa67c625508dc495c082357913ccea6 +PKG_MD5SUM:= 2f7aee1dc5d31aefcb364600915b31dc PKG_DESCR:= NetBIOS/SMB file and print server PKG_SECTION:= net/fs PKG_BUILDDEP:= gettext-tiny util-linux popt diff --git a/package/squid/Makefile b/package/squid/Makefile index 890e64328..f8e6aaf72 100644 --- a/package/squid/Makefile +++ b/package/squid/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= squid PKG_VERSION:= 3.4.4 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= b36ab3696485a86b43d9194ac9b6b7fe PKG_DESCR:= squid web and cache proxy PKG_SECTION:= proxy diff --git a/package/squid/patches/patch-acinclude_lib-checks_m4 b/package/squid/patches/patch-acinclude_lib-checks_m4 new file mode 100644 index 000000000..b44b4eb27 --- /dev/null +++ b/package/squid/patches/patch-acinclude_lib-checks_m4 @@ -0,0 +1,72 @@ +--- squid-3.4.4.orig/acinclude/lib-checks.m4 2014-03-09 10:40:56.000000000 +0100 ++++ squid-3.4.4/acinclude/lib-checks.m4 2014-03-11 19:44:28.088928982 +0100 +@@ -95,69 +95,6 @@ AC_DEFUN([SQUID_CHECK_LIBIPHLPAPI],[ + SQUID_STATE_ROLLBACK(iphlpapi) + ]) + +-dnl Checks whether the OpenSSL SSL_get_certificate crashes squid and if a +-dnl workaround can be used instead of using the SSL_get_certificate +-AC_DEFUN([SQUID_CHECK_OPENSSL_GETCERTIFICATE_WORKS],[ +- AH_TEMPLATE(SQUID_SSLGETCERTIFICATE_BUGGY, "Define to 1 if the SSL_get_certificate crashes squid") +- AH_TEMPLATE(SQUID_USE_SSLGETCERTIFICATE_HACK, "Define to 1 to use squid workaround for SSL_get_certificate") +- SQUID_STATE_SAVE(check_SSL_get_certificate) +- LIBS="$SSLLIB $LIBS" +- if test "x$SSLLIBDIR" != "x"; then +- LIBS="$LIBS -Wl,-rpath -Wl,$SSLLIBDIR" +- fi +- +- AC_MSG_CHECKING(whether the SSL_get_certificate is buggy) +- AC_RUN_IFELSE([ +- AC_LANG_PROGRAM( +- [ +- #include <openssl/ssl.h> +- #include <openssl/err.h> +- ], +- [ +- SSLeay_add_ssl_algorithms(); +- SSL_CTX *sslContext = SSL_CTX_new(SSLv3_method()); +- SSL *ssl = SSL_new(sslContext); +- X509* cert = SSL_get_certificate(ssl); +- return 0; +- ]) +- ], +- [ +- AC_MSG_RESULT([no]) +- ], +- [ +- AC_DEFINE(SQUID_SSLGETCERTIFICATE_BUGGY, 1) +- AC_MSG_RESULT([yes]) +- ], +- []) +- +- AC_MSG_CHECKING(whether the workaround for SSL_get_certificate works) +- AC_RUN_IFELSE([ +- AC_LANG_PROGRAM( +- [ +- #include <openssl/ssl.h> +- #include <openssl/err.h> +- ], +- [ +- SSLeay_add_ssl_algorithms(); +- SSL_CTX *sslContext = SSL_CTX_new(SSLv3_method()); +- X509 ***pCert = (X509 ***)sslContext->cert; +- X509 *sslCtxCert = pCert && *pCert ? **pCert : (X509 *)0x1; +- if (sslCtxCert != NULL) +- return 1; +- return 0; +- ]) +- ], +- [ +- AC_MSG_RESULT([yes]) +- AC_DEFINE(SQUID_USE_SSLGETCERTIFICATE_HACK, 1) +- ], +- [ +- AC_MSG_RESULT([no]) +- ], +-[]) +- +-SQUID_STATE_ROLLBACK(check_SSL_get_certificate) +-]) + + dnl Checks whether the SSL_CTX_new and similar functions require + dnl a const 'SSL_METHOD *' argument diff --git a/package/squid/patches/patch-src_Makefile_am b/package/squid/patches/patch-src_Makefile_am new file mode 100644 index 000000000..9aec4eca3 --- /dev/null +++ b/package/squid/patches/patch-src_Makefile_am @@ -0,0 +1,11 @@ +--- squid-3.4.4.orig/src/Makefile.am 2014-03-09 10:40:56.000000000 +0100 ++++ squid-3.4.4/src/Makefile.am 2014-03-12 09:46:23.001434141 +0100 +@@ -981,7 +981,7 @@ cache_cf.o: cf_parser.cci + + # cf_gen builds the configuration files. + cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci +- $(HOSTCXX) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src ++ $(CXX_FOR_BUILD) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src + + # squid.conf.default is built by cf_gen when making cf_parser.cci + squid.conf.default squid.conf.documented: cf_parser.cci diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile index 78e30a09a..c06803164 100644 --- a/package/xfsprogs/Makefile +++ b/package/xfsprogs/Makefile @@ -9,8 +9,9 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= d6159f7a664d95b4c150d580399d4400 PKG_DESCR:= Utilities for XFS filesystems PKG_SECTION:= fs -PKG_BUILDDEP:= e2fsprogs util-linux +PKG_BUILDDEP:= e2fsprogs util-linux ncurses PKG_DEPENDS:= libuuid libpthread libblkid librt libgcc +PKG_DEPENDS+= libncurses PKG_URL:= http://oss.sgi.com/projects/xfs PKG_SITES:= ftp://oss.sgi.com/projects/xfs/cmd_tars/ \ ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/ diff --git a/target/config/Config.in b/target/config/Config.in index c50fbd289..3de5e3a23 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -213,6 +213,7 @@ config ADK_TARGET_KERNEL_MINICONFIG default "cubox-i" if ADK_TARGET_SYSTEM_CUBOX_I default "raspberry-pi" if ADK_TARGET_SYSTEM_RASPBERRY_PI default "sharp-zaurus" if ADK_TARGET_SYSTEM_SHARP_ZAURUS + default "lemote-yeelong" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG config ADK_QEMU_ARGS string @@ -612,7 +613,7 @@ config ADK_TARGET_CFLAGS config ADK_TARGET_CMDLINE string default "dwc_otg.fiq_split_enable=1" if ADK_TARGET_SYSTEM_RASPBERRY_PI - default "console=tty no_auto_cmd" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG + default "console=tty0" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default "console=ttymxc0,115200" if ADK_TARGET_SYSTEM_CUBOX_I default "console=ttyS0,9600" if ADK_TARGET_SYSTEM_FON_FON2100 default "console=ttyS0,38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio index c466bed45..8a4198aee 100644 --- a/target/linux/config/Config.in.audio +++ b/target/linux/config/Config.in.audio @@ -4,6 +4,9 @@ depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB || ADK_TARGET_WITH_SOUND config ADK_KERNEL_SND_ARM boolean +config ADK_KERNEL_SND_PCI + boolean + config ADK_KERNEL_SND_USB boolean @@ -36,7 +39,6 @@ config ADK_KPACKAGE_KMOD_SND_RAWMIDI config ADK_KPACKAGE_KMOD_SND_AC97_CODEC tristate - depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_SOUND config ADK_KPACKAGE_KMOD_SND prompt "kmod-snd...................... ALSA sound support" @@ -93,6 +95,7 @@ config ADK_KPACKAGE_KMOD_SND_ENS1370 config ADK_KPACKAGE_KMOD_SND_CS5535AUDIO prompt "kmod-snd-cs5535audio.......... ALSA AMD CS5535 driver" tristate + select ADK_KERNEL_SND_PCI select ADK_KPACKAGE_KMOD_SND_AC97_CODEC select ADK_KPACKAGE_KMOD_SND default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index 789b75b7d..7aabc0b7e 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -68,17 +68,6 @@ config ADK_KERNEL_NATSEMI default n help -config ADK_KERNEL_8139TOO - boolean - select ADK_KERNEL_NETDEVICES - select ADK_KERNEL_NET_ETHERNET - select ADK_KERNEL_NET_PCI - select ADK_KERNEL_MII - default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG - default n - help - - config ADK_KERNEL_VIA_RHINE boolean select ADK_KERNEL_NETDEVICES diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index f6fd22339..2d50e24b2 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -5,20 +5,23 @@ config ADK_KERNEL_USB_SUPPORT boolean config ADK_KERNEL_USB + boolean select ADK_KERNEL_USB_SUPPORT default y if ADK_TARGET_SYSTEM_QEMU_SH4 default y if ADK_TARGET_SYSTEM_QEMU_SH4EB - boolean + default n config ADK_KERNEL_USB_OHCI_HCD + boolean default y if ADK_TARGET_SYSTEM_QEMU_SH4 default y if ADK_TARGET_SYSTEM_QEMU_SH4EB - boolean + default n config ADK_KERNEL_USB_OHCI_HCD_PLATFORM + boolean default y if ADK_TARGET_SYSTEM_QEMU_SH4 default y if ADK_TARGET_SYSTEM_QEMU_SH4EB - boolean + default n config ADK_KERNEL_USB_LIBUSUAL tristate @@ -47,8 +50,6 @@ config ADK_KPACKAGE_KMOD_USB select ADK_KERNEL_NLS select ADK_KERNEL_USB_SUPPORT depends on !ADK_KERNEL_USB - default y if ADK_TARGET_SYSTEM_QEMU_I686 - 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 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 @@ -111,15 +112,12 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD tristate select ADK_PACKAGE_KMOD_USB_CONTROLLER depends on ADK_KPACKAGE_KMOD_USB - #depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG - default y if ADK_TARGET_SYSTEM_QEMU_SH4 - default y if ADK_TARGET_SYSTEM_QEMU_SH4EB default n help The Open Host Controller Interface (OHCI) is a standard for accessing @@ -176,8 +174,6 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI depends on ADK_KPACKAGE_KMOD_USB - default y if ADK_TARGET_SYSTEM_QEMU_I686 - 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 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 @@ -212,34 +208,34 @@ config ADK_PACKAGE_KMOD_USB_CONTROLLER config ADK_KPACKAGE_KMOD_USB_ACM prompt "kmod-usb-acm...................... Support for USB modems/isdn controllers" tristate - default n depends on ADK_PACKAGE_KMOD_USB_CONTROLLER + default n config ADK_KPACKAGE_KMOD_USB_PEGASUS prompt "kmod-usb-pegasus.................. Support for USB Pegasus" tristate - default n depends on ADK_PACKAGE_KMOD_USB_CONTROLLER + default n config ADK_KPACKAGE_KMOD_USB_HSO prompt "kmod-usb-hso...................... Support for USB HSO devices" tristate select ADK_KPACKAGE_KMOD_RFKILL select ADK_KPACKAGE_KMOD_USB_STORAGE - default n depends on ADK_PACKAGE_KMOD_USB_CONTROLLER + default n config ADK_KPACKAGE_KMOD_USB_PRINTER prompt "kmod-usb-printer.................. Support for USB printers" tristate - default n depends on ADK_PACKAGE_KMOD_USB_CONTROLLER + default n config ADK_KPACKAGE_KMOD_USB_SERIAL prompt "kmod-usb-serial................... Support for USB-to-serial converters" tristate - default n depends on ADK_PACKAGE_KMOD_USB_CONTROLLER + default n help Say Y here if you have a USB device that provides normal serial ports, or acts like a serial device, and you want to connect it to @@ -253,8 +249,8 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL config ADK_KPACKAGE_KMOD_USB_SERIAL_BELKIN prompt "kmod-usb-serial-belkin.......... Support for Belkin USB-to-serial converters" tristate - default n depends on ADK_KPACKAGE_KMOD_USB_SERIAL + default n help Say Y here if you want to use a Belkin USB Serial single port adaptor (F5U103 is one of the model numbers) or the Peracom single @@ -263,8 +259,8 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL_BELKIN config ADK_KPACKAGE_KMOD_USB_SERIAL_FTDI_SIO prompt "kmod-usb-serial-ftdi............ Support for FTDI USB-to-serial converter" tristate - default n depends on ADK_KPACKAGE_KMOD_USB_SERIAL + default n help Say Y here if you want to use a FTDI SIO single port USB to serial converter device. The implementation I have is called the USC-1000. @@ -276,8 +272,8 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL_FTDI_SIO config ADK_KPACKAGE_KMOD_USB_SERIAL_MCT_U232 prompt "kmod-usb-serial-mct-u232........ Support for Magic Control Technology USB-to-Serial converters" tristate - default n depends on ADK_KPACKAGE_KMOD_USB_SERIAL + default n help Say Y here if you want to use a USB Serial single port adapter from Magic Control Technology Corp. (U232 is one of the model numbers). @@ -288,8 +284,8 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL_MCT_U232 config ADK_KPACKAGE_KMOD_USB_SERIAL_PL2303 prompt "kmod-usb-serial-pl2303.......... Support for Prolific PL2303 USB-to-Serial converters" tristate - default n depends on ADK_KPACKAGE_KMOD_USB_SERIAL + default n help Say Y here if you want to use the PL2303 USB Serial single port adapter from Prolific. @@ -297,8 +293,8 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL_PL2303 config ADK_KPACKAGE_KMOD_USB_SERIAL_VISOR prompt "kmod-usb-serial-visor........... Support for Handspring Visor / Palm m50x / Sony Clie Driver" tristate - default n depends on ADK_KPACKAGE_KMOD_USB_SERIAL + default n help Say Y here if you want to connect to your HandSpring Visor, Palm m500 or m505 through its USB docking station. See @@ -308,43 +304,43 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL_VISOR config ADK_KPACKAGE_KMOD_USB_STORAGE prompt "kmod-usb-storage.................. Support for USB storage devices" tristate - default n depends on ADK_PACKAGE_KMOD_USB_CONTROLLER depends on !ADK_KERNEL_USB_STORAGE select ADK_KPACKAGE_KMOD_SCSI if !ADK_KERNEL_SCSI select ADK_KPACKAGE_KMOD_BLK_DEV_SD if !ADK_KERNEL_SCSI + default n config ADK_KPACKAGE_KMOD_USB_ATM prompt "kmod-usb-atm...................... Support for USB ATM devices" tristate - default n depends on ADK_PACKAGE_KMOD_USB_CONTROLLER + default n config ADK_KPACKAGE_KMOD_USB_ATM_SPEEDTOUCH prompt "kmod-usb-atm-speedtouch......... Support for USB Speedtouch ADSL modem" tristate - default n depends on ADK_KPACKAGE_KMOD_USB_ATM + default n config ADK_KPACKAGE_KMOD_USB_USBNET prompt "kmod-usb-usbnet................... Multi-purpose USB Networking Framework" tristate - default n depends on ADK_PACKAGE_KMOD_USB_CONTROLLER + default n config ADK_KPACKAGE_KMOD_SND_USB_AUDIO prompt "kmod-snd-usb-audio................ USB sound adapter" tristate - default n select ADK_KERNEL_SND_USB select ADK_KPACKAGE_KMOD_SND select ADK_KPACKAGE_KMOD_SND_RAWMIDI depends on ADK_PACKAGE_KMOD_USB_CONTROLLER + default n config ADK_KPACKAGE_KMOD_USB_SISUSBVGA prompt "kmod-usb-svga..................... USB 2.0 SVGA dongle support (Net2280/SiS315)" tristate - default n depends on ADK_PACKAGE_KMOD_USB_CONTROLLER + default n endmenu diff --git a/target/linux/kernel.config b/target/linux/kernel.config index de1324aa1..d69b28908 100644 --- a/target/linux/kernel.config +++ b/target/linux/kernel.config @@ -24,6 +24,7 @@ CONFIG_EMBEDDED=y CONFIG_MODULES=y CONFIG_BINFMT_ELF=y CONFIG_BINFMT_SCRIPT=y +CONFIG_HOTPLUG=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_STANDALONE=y diff --git a/target/mips/Makefile b/target/mips/Makefile index ae51eaa8e..68c2ea0fe 100644 --- a/target/mips/Makefile +++ b/target/mips/Makefile @@ -137,7 +137,7 @@ imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) @echo "Startup the netbook and type del to enter PMON:" @echo "PMON> load /dev/fs/ext2@usb0/boot/kernel" - @echo "PMON> g root=/dev/sdc1" + @echo "PMON> g" endif endif ifeq ($(ADK_TARGET_FS),cf) diff --git a/target/mips/kernel/lemote-yeelong b/target/mips/kernel/lemote-yeelong new file mode 100644 index 000000000..c37d40271 --- /dev/null +++ b/target/mips/kernel/lemote-yeelong @@ -0,0 +1,27 @@ +CONFIG_MIPS=y +CONFIG_MACH_LOONGSON=y +CONFIG_LEMOTE_MACH2F=y +CONFIG_CS5536=y +CONFIG_CPU_LOONGSON2F=y +CONFIG_CPU_NOP_WORKAROUNDS=y +CONFIG_CPU_JUMP_WORKAROUNDS=y +CONFIG_CPU_LOONGSON2F_WORKAROUNDS=y +CONFIG_64BIT=y +CONFIG_PAGE_SIZE_16KB=y +CONFIG_PCI=y +CONFIG_PCI_DOMAINS=y +CONFIG_MIPS32_COMPAT=y +CONFIG_COMPAT=y +CONFIG_MIPS32_O32=y +CONFIG_MIPS32_N32=y +CONFIG_BLK_DEV=y +CONFIG_NETDEVICES=y +CONFIG_NET_CORE=y +CONFIG_ETHERNET=y +CONFIG_NET_VENDOR_REALTEK=y +CONFIG_8139TOO=y +CONFIG_SERIO=y +CONFIG_SERIO_I8042=y +CONFIG_SERIO_SERPORT=y +CONFIG_SERIO_LIBPS2=y + diff --git a/target/mips/sys-available/lemote-yeelong b/target/mips/sys-available/lemote-yeelong index 10db77945..62eeb88ee 100644 --- a/target/mips/sys-available/lemote-yeelong +++ b/target/mips/sys-available/lemote-yeelong @@ -5,8 +5,6 @@ config ADK_TARGET_SYSTEM_LEMOTE_YEELONG select ADK_lemote_yeelong select ADK_LINUX_64 select ADK_CPU_LOONGSON2F - select ADK_KERNEL_MACH_LOONGSON - select ADK_KERNEL_LEMOTE_MACH2F select ADK_TARGET_WITH_USB_BOOT select ADK_TARGET_WITH_USB select ADK_TARGET_WITH_VGA @@ -15,6 +13,7 @@ config ADK_TARGET_SYSTEM_LEMOTE_YEELONG select ADK_TARGET_WITH_HDD select ADK_TARGET_WITH_PCI select ADK_TARGET_KERNEL_VMLINUZ + select ADK_USE_KERNEL_MINICONFIG help System profile for Lemote Yeelong laptop. diff --git a/target/sparc64/Makefile b/target/sparc64/Makefile index 12900ec8c..8fe5ebbcc 100644 --- a/target/sparc64/Makefile +++ b/target/sparc64/Makefile @@ -19,8 +19,7 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_SPARC64),y) @echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following command line:" ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) - @echo 'qemu-system-sparc64 -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -drive file=qemu-${CPU_ARCH}.img,if=virtio,index=0 \ - -net nic,model=virtio -net user' + @echo 'qemu-system-sparc64 -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -drive file=qemu-${CPU_ARCH}.img,if=virtio,index=0 -net nic,model=virtio -net user' else @echo 'qemu-system-sparc64 -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' endif diff --git a/toolchain/uClibc/patches/uclibc-git-20140212.patch b/toolchain/uClibc/patches/uclibc-git-20140313.patch index 049e3e5f3..561c08007 100644 --- a/toolchain/uClibc/patches/uclibc-git-20140212.patch +++ b/toolchain/uClibc/patches/uclibc-git-20140313.patch @@ -1,6 +1,6 @@ -diff -Nur uClibc-0.9.33.2/docs/man/arc4random.3 uClibc/docs/man/arc4random.3 +diff -Nur uClibc-0.9.33.2/docs/man/arc4random.3 uClibc-git/docs/man/arc4random.3 --- uClibc-0.9.33.2/docs/man/arc4random.3 1970-01-01 01:00:00.000000000 +0100 -+++ uClibc/docs/man/arc4random.3 2014-02-03 12:32:56.000000000 +0100 ++++ uClibc-git/docs/man/arc4random.3 2014-02-03 12:32:56.000000000 +0100 @@ -0,0 +1,110 @@ +.\" $OpenBSD: arc4random.3,v 1.19 2005/07/17 08:50:55 jaredy Exp $ +.\" @@ -112,9 +112,9 @@ diff -Nur uClibc-0.9.33.2/docs/man/arc4random.3 uClibc/docs/man/arc4random.3 +.Pp +These functions first appeared in +.Ox 2.1 . -diff -Nur uClibc-0.9.33.2/docs/PORTING uClibc/docs/PORTING +diff -Nur uClibc-0.9.33.2/docs/PORTING uClibc-git/docs/PORTING --- uClibc-0.9.33.2/docs/PORTING 2012-05-15 09:20:09.000000000 +0200 -+++ uClibc/docs/PORTING 2014-02-03 12:32:56.000000000 +0100 ++++ uClibc-git/docs/PORTING 2014-02-03 12:32:56.000000000 +0100 @@ -130,9 +130,6 @@ ==================== === Misc Cruft === @@ -125,9 +125,9 @@ diff -Nur uClibc-0.9.33.2/docs/PORTING uClibc/docs/PORTING - MAINTAINERS - presumably you're going to submit this code back to mainline and since you're the only one who cares about this arch (right now), you should add yourself to the toplevel MAINTAINERS file. do it. -diff -Nur uClibc-0.9.33.2/extra/config/check.sh uClibc/extra/config/check.sh +diff -Nur uClibc-0.9.33.2/extra/config/check.sh uClibc-git/extra/config/check.sh --- uClibc-0.9.33.2/extra/config/check.sh 2012-05-15 09:20:09.000000000 +0200 -+++ uClibc/extra/config/check.sh 2014-02-03 12:32:56.000000000 +0100 ++++ uClibc-git/extra/config/check.sh 2014-02-03 12:32:56.000000000 +0100 @@ -1,6 +1,6 @@ #!/bin/sh # Needed for systems without gettext @@ -136,9 +136,9 @@ diff -Nur uClibc-0.9.33.2/extra/config/check.sh uClibc/extra/config/check.sh #include <libintl.h> int main() { -diff -Nur uClibc-0.9.33.2/extra/config/conf.c uClibc/extra/config/conf.c +diff -Nur uClibc-0.9.33.2/extra/config/conf.c uClibc-git/extra/config/conf.c --- uClibc-0.9.33.2/extra/config/conf.c 2012-05-15 09:20:09.000000000 +0200 -+++ uClibc/extra/config/conf.c 2014-02-03 12:32:56.000000000 +0100 ++++ uClibc-git/extra/config/conf.c 2014-02-03 12:32:56.000000000 +0100 @@ -10,42 +10,48 @@ #include <string.h> #include <time.h> @@ -728,9 +728,9 @@ diff -Nur uClibc-0.9.33.2/extra/config/conf.c uClibc/extra/config/conf.c + if (fgets(str, size, in) == NULL) + fprintf(stderr, "\nError in reading or end of file.\n"); +} -diff -Nur uClibc-0.9.33.2/extra/config/confdata.c uClibc/extra/config/confdata.c +diff -Nur uClibc-0.9.33.2/extra/config/confdata.c uClibc-git/extra/config/confdata.c --- uClibc-0.9.33.2/extra/config/confdata.c 2012-05-15 09:20:09.000000000 +0200 -+++ uClibc/extra/config/confdata.c 2014-02-03 12:32:56.000000000 +0100 ++++ uClibc-git/extra/config/confdata.c 2014-02-03 12:32:56.000000000 +0100 @@ -5,24 +5,27 @@ #include <sys/stat.h> @@ -1939,9 +1939,9 @@ diff -Nur uClibc-0.9.33.2/extra/config/confdata.c uClibc/extra/conf |