diff options
| -rw-r--r-- | Config.in | 1 | ||||
| -rw-r--r-- | mk/build.mk | 1 | ||||
| -rw-r--r-- | package/lynx/Makefile | 2 | ||||
| -rw-r--r-- | package/rarpd/patches/patch-Makefile_in | 9 | ||||
| -rw-r--r-- | target/ibmx40/kernel.config | 36 | ||||
| -rw-r--r-- | target/ibmx40/uclibc.config | 2 | ||||
| -rw-r--r-- | tools/cpio/src/cpio.c | 15 |
7 files changed, 36 insertions, 30 deletions
@@ -44,6 +44,7 @@ config ADK_DEVELSYSTEM select BUSYBOX_TEE select BUSYBOX_WGET select BUSYBOX_YES + select BUSYBOX_TRUE select ADK_PACKAGE_BASH select ADK_PACKAGE_BINUTILS select ADK_PACKAGE_BZIP2 diff --git a/mk/build.mk b/mk/build.mk index f33fd5ad2..9530da61d 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -18,7 +18,6 @@ DEFCONFIG= ADK_DEVELSYSTEM=n \ ADK_FORCE_PARALLEL=n \ ADK_PACKAGE_BZR=n \ ADK_PACKAGE_GRUB=n \ - ADK_PACKAGE_XORG_SERVER_WITH_DRI=n \ ADK_PACKAGE_AUFS2_UTIL=n \ ADK_PACKAGE_BASE_FILES=y \ ADK_PACKAGE_MGETTY=n \ diff --git a/package/lynx/Makefile b/package/lynx/Makefile index ab9215be6..410c4e1e4 100644 --- a/package/lynx/Makefile +++ b/package/lynx/Makefile @@ -6,7 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME= lynx PKG_VERSION= 2.8.7 PKG_RELEASE= 1 -PKG_MD5SUM= 124253e635f7c76bdffc47b9d036c812 +PKG_MD5SUM= e36d70f3f09b2d502055ca67f09e363c PKG_DESCR:= Standard text browser PKG_SECTION:= browser PKG_DEPENDS:= libncurses libopenssl zlib diff --git a/package/rarpd/patches/patch-Makefile_in b/package/rarpd/patches/patch-Makefile_in new file mode 100644 index 000000000..58be90d10 --- /dev/null +++ b/package/rarpd/patches/patch-Makefile_in @@ -0,0 +1,9 @@ +--- rarpd-1.1.orig/Makefile.in 1999-10-20 22:57:13.000000000 +0200 ++++ rarpd-1.1/Makefile.in 2010-07-16 14:34:08.453125000 +0200 +@@ -13,5 +13,5 @@ rarpd: rarpd.o @LIBOBJS@ + $(CC) @LDFLAGS@ -o $@ rarpd.o @LIBOBJS@ @LIBS@ + + install: rarpd +- $(ENSUREDIR) $(DESTDIR)$(SBINDIR) 755 ++ @mkdir -p $(DESTDIR)$(SBINDIR) + $(INSTALL) -c -m 0755 rarpd $(DESTDIR)$(SBINDIR) diff --git a/target/ibmx40/kernel.config b/target/ibmx40/kernel.config index c3526ecc7..d40b3bdc8 100644 --- a/target/ibmx40/kernel.config +++ b/target/ibmx40/kernel.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.34 -# Thu May 20 21:14:06 2010 +# Wed Jul 28 23:45:42 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -97,12 +97,7 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y # CONFIG_SYSFS_DEPRECATED_V2 is not set # CONFIG_RELAY is not set # CONFIG_NAMESPACES is not set -CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="" -# CONFIG_RD_GZIP is not set -# CONFIG_RD_BZIP2 is not set -CONFIG_RD_LZMA=y -# CONFIG_RD_LZO is not set +# CONFIG_BLK_DEV_INITRD is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y @@ -294,10 +289,7 @@ CONFIG_VM86=y # CONFIG_TOSHIBA is not set # CONFIG_I8K is not set # CONFIG_X86_REBOOTFIXUPS is not set -CONFIG_MICROCODE=y -CONFIG_MICROCODE_INTEL=y -# CONFIG_MICROCODE_AMD is not set -CONFIG_MICROCODE_OLD_INTERFACE=y +# CONFIG_MICROCODE is not set CONFIG_X86_MSR=y CONFIG_X86_CPUID=y # CONFIG_NOHIGHMEM is not set @@ -491,9 +483,7 @@ CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y # CONFIG_STANDALONE is not set # CONFIG_PREVENT_FIRMWARE_BUILD is not set -CONFIG_FW_LOADER=y -# CONFIG_FIRMWARE_IN_KERNEL is not set -CONFIG_EXTRA_FIRMWARE="" +# CONFIG_FW_LOADER is not set # CONFIG_SYS_HYPERVISOR is not set # CONFIG_CONNECTOR is not set # CONFIG_MTD is not set @@ -730,9 +720,9 @@ CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_XTKBD is not set CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=y -CONFIG_MOUSE_PS2_ALPS=y -CONFIG_MOUSE_PS2_LOGIPS2PP=y -CONFIG_MOUSE_PS2_SYNAPTICS=y +# CONFIG_MOUSE_PS2_ALPS is not set +# CONFIG_MOUSE_PS2_LOGIPS2PP is not set +# CONFIG_MOUSE_PS2_SYNAPTICS is not set CONFIG_MOUSE_PS2_TRACKPOINT=y # CONFIG_MOUSE_PS2_ELANTECH is not set # CONFIG_MOUSE_PS2_SENTELIC is not set @@ -764,10 +754,10 @@ CONFIG_SERIO_LIBPS2=y # CONFIG_VT=y # CONFIG_CONSOLE_TRANSLATIONS is not set -CONFIG_VT_CONSOLE=y +# CONFIG_VT_CONSOLE is not set CONFIG_HW_CONSOLE=y # CONFIG_VT_HW_CONSOLE_BINDING is not set -CONFIG_DEVKMEM=y +# CONFIG_DEVKMEM is not set # CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_NOZOMI is not set @@ -775,9 +765,9 @@ CONFIG_DEVKMEM=y # Serial drivers # CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y +# CONFIG_SERIAL_8250_CONSOLE is not set CONFIG_FIX_EARLYCON_MEM=y -CONFIG_SERIAL_8250_PCI=y +# CONFIG_SERIAL_8250_PCI is not set CONFIG_SERIAL_8250_NR_UARTS=4 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set @@ -786,7 +776,6 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # Non-8250 serial port support # CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_SERIAL_JSM is not set # CONFIG_SERIAL_TIMBERDALE is not set CONFIG_UNIX98_PTYS=y @@ -950,7 +939,7 @@ CONFIG_RTC_DRV_CMOS=y # TI VLYNQ # # CONFIG_STAGING is not set -CONFIG_X86_PLATFORM_DEVICES=y +# CONFIG_X86_PLATFORM_DEVICES is not set # # Firmware Drivers @@ -1231,7 +1220,6 @@ CONFIG_GENERIC_FIND_LAST_BIT=y # CONFIG_CRC32 is not set # CONFIG_CRC7 is not set # CONFIG_LIBCRC32C is not set -CONFIG_DECOMPRESS_LZMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y diff --git a/target/ibmx40/uclibc.config b/target/ibmx40/uclibc.config index 5eb214a35..288dc1b77 100644 --- a/target/ibmx40/uclibc.config +++ b/target/ibmx40/uclibc.config @@ -109,7 +109,7 @@ UCLIBC_HAS___PROGNAME=y UCLIBC_HAS_PTY=y ASSUME_DEVPTS=y UNIX98PTY_ONLY=y -# UCLIBC_HAS_GETPT is not set +UCLIBC_HAS_GETPT=y UCLIBC_HAS_TM_EXTENSIONS=y UCLIBC_HAS_TZ_CACHING=y UCLIBC_HAS_TZ_FILE=y diff --git a/tools/cpio/src/cpio.c b/tools/cpio/src/cpio.c index 00f4a16b7..d91f25dc1 100644 --- a/tools/cpio/src/cpio.c +++ b/tools/cpio/src/cpio.c @@ -81,7 +81,8 @@ int sysv3; #if defined (__linux__) || defined (__sun) || defined (__FreeBSD__) || \ defined (__hpux) || defined (_AIX) || defined (__NetBSD__) || \ - defined (__OpenBSD__) || defined (__DragonFly__) || defined (__APPLE__) + defined (__OpenBSD__) || defined (__DragonFly__) || \ + defined (__APPLE__) || defined (__CYGWIN__) #include <sys/mtio.h> #else /* SVR4.2MP */ #include <sys/scsi.h> @@ -4495,7 +4496,8 @@ tseek(off_t n) int i = (n - poffs) / tapeblock; #if defined (__linux__) || defined (__sun) || defined (__FreeBSD__) || \ defined (__hpux) || defined (_AIX) || defined (__NetBSD__) || \ - defined (__OpenBSD__) || defined (__DragonFly__) || defined (__APPLE__) + defined (__OpenBSD__) || defined (__DragonFly__) || \ + defined (__APPLE__) || defined (__CYGWIN__) struct mtop mo; mo.mt_op = i > 0 ? MTFSR : MTBSR; mo.mt_count = i > 0 ? i : -i; @@ -4735,7 +4737,7 @@ mstat(void) emsg(3, "Error during stat() of archive"); done(1); } -#if defined (__linux__) +#if defined (__linux__) if ((mtst.st_mode&S_IFMT) == S_IFCHR) { struct mtget mg; if (ioctl(mt, MTIOCGET, &mg) == 0) @@ -4787,6 +4789,13 @@ mstat(void) if (ioctl(mt, MTIOCGET, &mg) == 0) tapeblock = mg.mt_blksiz; } +#elif defined (__CYGWIN__) + if ((mtst.st_mode&S_IFMT) == S_IFCHR) { + struct mtget mg; + if (ioctl(mt, MTIOCGET, &mg) == 0) + tapeblock = (mg.mt_dsreg&MT_ST_BLKSIZE_MASK) >> + MT_ST_BLKSIZE_SHIFT; + } #elif defined (__hpux) || defined (_AIX) #else /* SVR4.2MP */ if ((mtst.st_mode&S_IFMT) == S_IFCHR) { |