diff -Narup buildroot-20080919/.defconfig buildroot-20080919-obs/.defconfig --- buildroot-20080919/.defconfig 2008-09-19 16:15:40.000000000 +0900 +++ buildroot-20080919-obs/.defconfig 2008-09-20 10:57:33.000000000 +0900 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Mon Feb 18 09:11:56 2008 +# Thu Mar 13 22:53:53 2008 # BR2_HAVE_DOT_CONFIG=y # BR2_alpha is not set @@ -9,47 +9,52 @@ BR2_HAVE_DOT_CONFIG=y # BR2_avr32 is not set # BR2_cris is not set # BR2_ia64 is not set -BR2_i386=y +# BR2_i386 is not set # BR2_m68k is not set # BR2_mips is not set # BR2_mipsel is not set # BR2_nios2 is not set -# BR2_powerpc is not set +BR2_powerpc=y # BR2_s390 is not set # BR2_sh is not set # BR2_sh64 is not set # BR2_sparc is not set # BR2_sparc64 is not set # BR2_x86_64 is not set -# BR2_x86_i386 is not set -# BR2_x86_i486 is not set -# BR2_x86_i586 is not set -BR2_x86_i686=y -# BR2_x86_pentiumpro is not set -# BR2_x86_pentium_mmx is not set -# BR2_x86_pentium_m is not set -# BR2_x86_pentium2 is not set -# BR2_x86_pentium3 is not set -# BR2_x86_pentium4 is not set -# BR2_x86_prescott is not set -# BR2_x86_nocona is not set -# BR2_x86_core2 is not set -# BR2_x86_k6 is not set -# BR2_x86_k6_2 is not set -# BR2_x86_athlon is not set -# BR2_x86_athlon_4 is not set -# BR2_x86_opteron is not set -# BR2_x86_opteron_sse3 is not set -# BR2_x86_barcelona is not set -# BR2_x86_geode is not set -# BR2_x86_c3 is not set -# BR2_x86_winchip_c6 is not set -# BR2_x86_winchip2 is not set -BR2_ARCH="i686" -BR2_ENDIAN="LITTLE" -BR2_GCC_TARGET_TUNE="i686" -BR2_GCC_TARGET_ARCH="i686" +# BR2_generic_powerpc is not set +BR2_powerpc_obs266=y +# BR2_powerpc_401 is not set +# BR2_powerpc_403 is not set +# BR2_powerpc_405 is not set +# BR2_powerpc_405fp is not set +# BR2_powerpc_440 is not set +# BR2_powerpc_440fp is not set +# BR2_powerpc_505 is not set +# BR2_powerpc_601 is not set +# BR2_powerpc_602 is not set +# BR2_powerpc_603 is not set +# BR2_powerpc_603e is not set +# BR2_powerpc_604 is not set +# BR2_powerpc_604e is not set +# BR2_powerpc_620 is not set +# BR2_powerpc_630 is not set +# BR2_powerpc_740 is not set +# BR2_powerpc_7400 is not set +# BR2_powerpc_7450 is not set +# BR2_powerpc_750 is not set +# BR2_powerpc_801 is not set +# BR2_powerpc_821 is not set +# BR2_powerpc_823 is not set +# BR2_powerpc_860 is not set +# BR2_powerpc_970 is not set +# BR2_powerpc_8540 is not set +BR2_ARCH="powerpc" +BR2_ENDIAN="BIG" +BR2_GCC_TARGET_TUNE="405" # # Target options # + +BR2_LARGEFILE=y +BR2_KERNEL_LINUX=y diff -Narup buildroot-20080919/package/Config.in buildroot-20080919-obs/package/Config.in --- buildroot-20080919/package/Config.in 2008-09-19 16:15:40.000000000 +0900 +++ buildroot-20080919-obs/package/Config.in 2008-09-20 11:00:05.000000000 +0900 @@ -95,6 +95,7 @@ source "package/ltt/Config.in" if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS source "package/module-init-tools/Config.in" source "package/modutils/Config.in" +source "package/obstools/Config.in" endif source "package/ng-spice-rework/Config.in" source "package/popt/Config.in" diff -Narup buildroot-20080919/package/busybox/Config.in buildroot-20080919-obs/package/busybox/Config.in --- buildroot-20080919/package/busybox/Config.in 2008-09-19 16:15:27.000000000 +0900 +++ buildroot-20080919-obs/package/busybox/Config.in 2008-09-20 10:57:33.000000000 +0900 @@ -85,8 +85,10 @@ config BR2_PACKAGE_BUSYBOX_CONFIG default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_8_X default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_9_X default "package/busybox/busybox-1.6.0.config" if BR2_BUSYBOX_VERSION_1_10_X - default "package/busybox/busybox-1.11.x.config" if BR2_BUSYBOX_VERSION_1_11_X - default "package/busybox/busybox-1.11.x.config" if BR2_BUSYBOX_VERSION_1_12_X + default "package/busybox/busybox-1.11.x.config" if BR2_BUSYBOX_VERSION_1_11_X && !BR2_powerpc_obs266 + default "package/busybox/busybox-1.11.x.obs266.config" if BR2_BUSYBOX_VERSION_1_11_X && BR2_powerpc_obs266 + default "package/busybox/busybox-1.11.x.config" if BR2_BUSYBOX_VERSION_1_12_X && !BR2_powerpc_obs266 + default "package/busybox/busybox-1.11.x.obs266.config" if BR2_BUSYBOX_VERSION_1_12_X && BR2_powerpc_obs266 help Some people may wish to use their own modified BusyBox configuration file, and will specify their config file location with this option. diff -Narup buildroot-20080919/package/busybox/busybox-1.11.x.obs266.config buildroot-20080919-obs/package/busybox/busybox-1.11.x.obs266.config --- buildroot-20080919/package/busybox/busybox-1.11.x.obs266.config 1970-01-01 09:00:00.000000000 +0900 +++ buildroot-20080919-obs/package/busybox/busybox-1.11.x.obs266.config 2008-09-20 10:57:33.000000000 +0900 @@ -0,0 +1,853 @@ +# +# Automatically generated make config: don't edit +# Busybox version: 1.12.0 +# Sun Aug 31 00:24:41 2008 +# +CONFIG_HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +CONFIG_DESKTOP=y +# CONFIG_EXTRA_COMPAT is not set +# CONFIG_FEATURE_ASSUME_UNICODE is not set +CONFIG_FEATURE_BUFFERS_USE_MALLOC=y +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_SHOW_USAGE=y +CONFIG_FEATURE_VERBOSE_USAGE=y +# CONFIG_FEATURE_COMPRESS_USAGE is not set +CONFIG_FEATURE_INSTALLER=y +# CONFIG_LOCALE_SUPPORT is not set +CONFIG_GETOPT_LONG=y +CONFIG_FEATURE_DEVPTS=y +CONFIG_FEATURE_CLEAN_UP=y +# CONFIG_FEATURE_PIDFILE is not set +CONFIG_FEATURE_SUID=y +# CONFIG_FEATURE_SUID_CONFIG is not set +# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set +# CONFIG_SELINUX is not set +# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" +CONFIG_FEATURE_SYSLOG=y +# CONFIG_FEATURE_HAVE_RPC is not set + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_PIE is not set +# CONFIG_NOMMU is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_INDIVIDUAL is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +# CONFIG_LFS is not set +CONFIG_CROSS_COMPILER_PREFIX="" + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_WERROR is not set +CONFIG_NO_DEBUG_LIB=y +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set +CONFIG_INCLUDE_SUSv2=y +# CONFIG_PARSE is not set + +# +# Installation Options +# +# CONFIG_INSTALL_NO_USR is not set +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set +# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set +# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set +CONFIG_PREFIX="./_install" + +# +# Busybox Library Tuning +# +CONFIG_PASSWORD_MINLEN=6 +CONFIG_MD5_SIZE_VS_SPEED=2 +# CONFIG_FEATURE_FAST_TOP is not set +# CONFIG_FEATURE_ETC_NETWORKS is not set +CONFIG_FEATURE_EDITING=y +CONFIG_FEATURE_EDITING_MAX_LEN=1024 +CONFIG_FEATURE_EDITING_VI=y +CONFIG_FEATURE_EDITING_HISTORY=999 +CONFIG_FEATURE_EDITING_SAVEHISTORY=y +CONFIG_FEATURE_TAB_COMPLETION=y +# CONFIG_FEATURE_USERNAME_COMPLETION is not set +CONFIG_FEATURE_EDITING_FANCY_PROMPT=y +# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set +CONFIG_FEATURE_COPYBUF_KB=4 +CONFIG_MONOTONIC_SYSCALL=y +CONFIG_IOCTL_HEX2STR_ERROR=y +CONFIG_FEATURE_HWIB=y + +# +# Applets +# + +# +# Archival Utilities +# +# CONFIG_FEATURE_SEAMLESS_LZMA is not set +# CONFIG_FEATURE_SEAMLESS_BZ2 is not set +CONFIG_FEATURE_SEAMLESS_GZ=y +# CONFIG_FEATURE_SEAMLESS_Z is not set +CONFIG_AR=y +# CONFIG_FEATURE_AR_LONG_FILENAMES is not set +CONFIG_BUNZIP2=y +# CONFIG_BZIP2 is not set +CONFIG_CPIO=y +# CONFIG_FEATURE_CPIO_O is not set +# CONFIG_DPKG is not set +# CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +CONFIG_GUNZIP=y +CONFIG_GZIP=y +# CONFIG_RPM2CPIO is not set +# CONFIG_RPM is not set +CONFIG_TAR=y +CONFIG_FEATURE_TAR_CREATE=y +# CONFIG_FEATURE_TAR_AUTODETECT is not set +CONFIG_FEATURE_TAR_FROM=y +# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set +# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +CONFIG_FEATURE_TAR_LONG_OPTIONS=y +# CONFIG_FEATURE_TAR_UNAME_GNAME is not set +# CONFIG_UNCOMPRESS is not set +CONFIG_UNLZMA=y +# CONFIG_FEATURE_LZMA_FAST is not set +CONFIG_UNZIP=y + +# +# Coreutils +# +CONFIG_BASENAME=y +# CONFIG_CAL is not set +CONFIG_CAT=y +CONFIG_CATV=y +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +CONFIG_CHROOT=y +CONFIG_CKSUM=y +# CONFIG_COMM is not set +CONFIG_CP=y +CONFIG_CUT=y +CONFIG_DATE=y +CONFIG_FEATURE_DATE_ISOFMT=y +CONFIG_DD=y +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +CONFIG_FEATURE_DD_IBS_OBS=y +CONFIG_DF=y +# CONFIG_FEATURE_DF_INODE is not set +CONFIG_DIRNAME=y +CONFIG_DOS2UNIX=y +CONFIG_UNIX2DOS=y +CONFIG_DU=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set +# CONFIG_EXPAND is not set +# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set +CONFIG_EXPR=y +CONFIG_EXPR_MATH_SUPPORT_64=y +CONFIG_FALSE=y +CONFIG_FOLD=y +CONFIG_HEAD=y +CONFIG_FEATURE_FANCY_HEAD=y +CONFIG_HOSTID=y +CONFIG_ID=y +CONFIG_INSTALL=y +CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y +CONFIG_LENGTH=y +CONFIG_LN=y +CONFIG_LOGNAME=y +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +CONFIG_FEATURE_LS_COLOR=y +CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +CONFIG_FEATURE_MV_LONG_OPTIONS=y +CONFIG_NICE=y +CONFIG_NOHUP=y +CONFIG_OD=y +CONFIG_PRINTENV=y +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +CONFIG_REALPATH=y +CONFIG_RM=y +CONFIG_RMDIR=y +# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set +CONFIG_SEQ=y +CONFIG_SHA1SUM=y +CONFIG_SLEEP=y +# CONFIG_FEATURE_FANCY_SLEEP is not set +# CONFIG_FEATURE_FLOAT_SLEEP is not set +CONFIG_SORT=y +CONFIG_FEATURE_SORT_BIG=y +# CONFIG_SPLIT is not set +# CONFIG_FEATURE_SPLIT_FANCY is not set +# CONFIG_STAT is not set +# CONFIG_FEATURE_STAT_FORMAT is not set +CONFIG_STTY=y +# CONFIG_SUM is not set +CONFIG_SYNC=y +# CONFIG_TAC is not set +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +CONFIG_FEATURE_TEE_USE_BLOCK_IO=y +CONFIG_TEST=y +CONFIG_FEATURE_TEST_64=y +CONFIG_TOUCH=y +CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +CONFIG_FEATURE_TR_EQUIV=y +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +# CONFIG_UNEXPAND is not set +# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set +CONFIG_UNIQ=y +CONFIG_USLEEP=y +CONFIG_UUDECODE=y +CONFIG_UUENCODE=y +CONFIG_WC=y +# CONFIG_FEATURE_WC_LARGE is not set +CONFIG_WHO=y +CONFIG_WHOAMI=y +CONFIG_YES=y + +# +# Common options for cp and mv +# +CONFIG_FEATURE_PRESERVE_HARDLINKS=y + +# +# Common options for ls, more and telnet +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +CONFIG_CHVT=y +CONFIG_CLEAR=y +CONFIG_DEALLOCVT=y +CONFIG_DUMPKMAP=y +# CONFIG_KBD_MODE is not set +CONFIG_LOADFONT=y +CONFIG_LOADKMAP=y +CONFIG_OPENVT=y +CONFIG_RESET=y +CONFIG_RESIZE=y +CONFIG_FEATURE_RESIZE_PRINT=y +CONFIG_SETCONSOLE=y +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set +# CONFIG_SETFONT is not set +CONFIG_SETKEYCODES=y +CONFIG_SETLOGCONS=y +# CONFIG_SHOWKEY is not set + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +CONFIG_PIPE_PROGRESS=y +CONFIG_RUN_PARTS=y +CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y +# CONFIG_FEATURE_RUN_PARTS_FANCY is not set +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y +CONFIG_WHICH=y + +# +# Editors +# +CONFIG_AWK=y +CONFIG_FEATURE_AWK_MATH=y +CONFIG_CMP=y +CONFIG_DIFF=y +CONFIG_FEATURE_DIFF_BINARY=y +CONFIG_FEATURE_DIFF_DIR=y +# CONFIG_FEATURE_DIFF_MINIMAL is not set +# CONFIG_ED is not set +CONFIG_PATCH=y +CONFIG_SED=y +CONFIG_VI=y +CONFIG_FEATURE_VI_MAX_LEN=4096 +CONFIG_FEATURE_VI_8BIT=y +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_SEARCH=y +CONFIG_FEATURE_VI_USE_SIGNALS=y +CONFIG_FEATURE_VI_DOT_CMD=y +CONFIG_FEATURE_VI_READONLY=y +CONFIG_FEATURE_VI_SETOPTS=y +CONFIG_FEATURE_VI_SET=y +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y +CONFIG_FEATURE_ALLOW_EXEC=y + +# +# Finding Utilities +# +CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y +CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_PERM=y +CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_XDEV=y +CONFIG_FEATURE_FIND_MAXDEPTH=y +CONFIG_FEATURE_FIND_NEWER=y +# CONFIG_FEATURE_FIND_INUM is not set +CONFIG_FEATURE_FIND_EXEC=y +CONFIG_FEATURE_FIND_USER=y +CONFIG_FEATURE_FIND_GROUP=y +CONFIG_FEATURE_FIND_NOT=y +CONFIG_FEATURE_FIND_DEPTH=y +CONFIG_FEATURE_FIND_PAREN=y +CONFIG_FEATURE_FIND_SIZE=y +CONFIG_FEATURE_FIND_PRUNE=y +# CONFIG_FEATURE_FIND_DELETE is not set +CONFIG_FEATURE_FIND_PATH=y +CONFIG_FEATURE_FIND_REGEX=y +# CONFIG_FEATURE_FIND_CONTEXT is not set +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=y +CONFIG_FEATURE_GREP_CONTEXT=y +CONFIG_XARGS=y +# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set +CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y +CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y +CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y + +# +# Init Utilities +# +CONFIG_INIT=y +# CONFIG_DEBUG_INIT is not set +CONFIG_FEATURE_USE_INITTAB=y +CONFIG_FEATURE_KILL_REMOVED=y +CONFIG_FEATURE_KILL_DELAY=0 +CONFIG_FEATURE_INIT_SCTTY=y +CONFIG_FEATURE_INIT_SYSLOG=y +CONFIG_FEATURE_EXTRA_QUIET=y +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set +CONFIG_HALT=y +CONFIG_MESG=y + +# +# Login/Password Management Utilities +# +CONFIG_FEATURE_SHADOWPASSWDS=y +# CONFIG_USE_BB_PWD_GRP is not set +# CONFIG_USE_BB_SHADOW is not set +CONFIG_USE_BB_CRYPT=y +CONFIG_ADDGROUP=y +# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set +CONFIG_DELGROUP=y +# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set +# CONFIG_FEATURE_CHECK_NAMES is not set +CONFIG_ADDUSER=y +# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set +CONFIG_DELUSER=y +CONFIG_GETTY=y +CONFIG_FEATURE_UTMP=y +CONFIG_FEATURE_WTMP=y +CONFIG_LOGIN=y +# CONFIG_PAM is not set +# CONFIG_LOGIN_SCRIPTS is not set +CONFIG_FEATURE_NOLOGIN=y +CONFIG_FEATURE_SECURETTY=y +CONFIG_PASSWD=y +CONFIG_FEATURE_PASSWD_WEAK_CHECK=y +# CONFIG_CRYPTPW is not set +# CONFIG_CHPASSWD is not set +CONFIG_SU=y +CONFIG_FEATURE_SU_SYSLOG=y +CONFIG_FEATURE_SU_CHECKS_SHELLS=y +CONFIG_SULOGIN=y +CONFIG_VLOCK=y + +# +# Linux Ext2 FS Progs +# +CONFIG_CHATTR=y +CONFIG_FSCK=y +CONFIG_LSATTR=y + +# +# Linux Module Utilities +# +# CONFIG_MODPROBE_SMALL is not set +# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set +# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set +# CONFIG_DEPMOD is not set +# CONFIG_FEATURE_DEPMOD_PRUNE_FANCY is not set +# CONFIG_FEATURE_DEPMOD_ALIAS is not set +CONFIG_INSMOD=y +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +CONFIG_FEATURE_INSMOD_LOAD_MAP=y +CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL=y +CONFIG_RMMOD=y +CONFIG_LSMOD=y +CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y +CONFIG_MODPROBE=y +CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y +CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y +# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set + +# +# Options common to multiple modutils +# +CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +# CONFIG_FEATURE_2_4_MODULES is not set +CONFIG_FEATURE_2_6_MODULES=y +CONFIG_DEFAULT_MODULES_DIR="/lib/modules" +CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" +# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set + +# +# Linux System Utilities +# +CONFIG_DMESG=y +CONFIG_FEATURE_DMESG_PRETTY=y +# CONFIG_FBSET is not set +# CONFIG_FEATURE_FBSET_FANCY is not set +# CONFIG_FEATURE_FBSET_READMODE is not set +CONFIG_FDFLUSH=y +CONFIG_FDFORMAT=y +# CONFIG_FDISK is not set +# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set +# CONFIG_FEATURE_FDISK_WRITABLE is not set +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_FDISK_ADVANCED is not set +# CONFIG_FINDFS is not set +CONFIG_FREERAMDISK=y +# CONFIG_FSCK_MINIX is not set +# CONFIG_MKFS_MINIX is not set +# CONFIG_FEATURE_MINIX2 is not set +CONFIG_GETOPT=y +CONFIG_HEXDUMP=y +# CONFIG_FEATURE_HEXDUMP_REVERSE is not set +# CONFIG_HD is not set +CONFIG_HWCLOCK=y +CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y +CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y +CONFIG_IPCRM=y +CONFIG_IPCS=y +CONFIG_LOSETUP=y +CONFIG_MDEV=y +CONFIG_FEATURE_MDEV_CONF=y +# CONFIG_FEATURE_MDEV_RENAME is not set +# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set +CONFIG_FEATURE_MDEV_EXEC=y +# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set +CONFIG_MKSWAP=y +# CONFIG_FEATURE_MKSWAP_V0 is not set +CONFIG_MORE=y +CONFIG_FEATURE_USE_TERMIOS=y +# CONFIG_VOLUMEID is not set +# CONFIG_FEATURE_VOLUMEID_EXT is not set +# CONFIG_FEATURE_VOLUMEID_REISERFS is not set +# CONFIG_FEATURE_VOLUMEID_FAT is not set +# CONFIG_FEATURE_VOLUMEID_HFS is not set +# CONFIG_FEATURE_VOLUMEID_JFS is not set +# CONFIG_FEATURE_VOLUMEID_XFS is not set +# CONFIG_FEATURE_VOLUMEID_NTFS is not set +# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set +# CONFIG_FEATURE_VOLUMEID_UDF is not set +# CONFIG_FEATURE_VOLUMEID_LUKS is not set +# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set +# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set +# CONFIG_FEATURE_VOLUMEID_ROMFS is not set +# CONFIG_FEATURE_VOLUMEID_SYSV is not set +# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set +# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set +CONFIG_MOUNT=y +# CONFIG_FEATURE_MOUNT_FAKE is not set +# CONFIG_FEATURE_MOUNT_VERBOSE is not set +# CONFIG_FEATURE_MOUNT_HELPERS is not set +# CONFIG_FEATURE_MOUNT_LABEL is not set +# CONFIG_FEATURE_MOUNT_NFS is not set +CONFIG_FEATURE_MOUNT_CIFS=y +CONFIG_FEATURE_MOUNT_FLAGS=y +CONFIG_FEATURE_MOUNT_FSTAB=y +CONFIG_PIVOT_ROOT=y +CONFIG_RDATE=y +# CONFIG_RDEV is not set +CONFIG_READPROFILE=y +# CONFIG_RTCWAKE is not set +# CONFIG_SCRIPT is not set +CONFIG_SETARCH=y +CONFIG_SWAPONOFF=y +# CONFIG_FEATURE_SWAPON_PRI is not set +CONFIG_SWITCH_ROOT=y +CONFIG_UMOUNT=y +CONFIG_FEATURE_UMOUNT_ALL=y + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set + +# +# Miscellaneous Utilities +# +# CONFIG_ADJTIMEX is not set +# CONFIG_BBCONFIG is not set +# CONFIG_CHAT is not set +# CONFIG_FEATURE_CHAT_NOFAIL is not set +# CONFIG_FEATURE_CHAT_TTY_HIFI is not set +# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set +# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set +# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set +# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set +# CONFIG_FEATURE_CHAT_CLR_ABORT is not set +CONFIG_CHRT=y +CONFIG_CROND=y +CONFIG_DEBUG_CROND_OPTION=y +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +CONFIG_CRONTAB=y +CONFIG_DC=y +# CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set +CONFIG_EJECT=y +# CONFIG_FEATURE_EJECT_SCSI is not set +# CONFIG_FBSPLASH is not set +# CONFIG_INOTIFYD is not set +CONFIG_LAST=y +CONFIG_FEATURE_LAST_SMALL=y +# CONFIG_FEATURE_LAST_FANCY is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=9999999 +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +CONFIG_FEATURE_LESS_FLAGCS=y +# CONFIG_FEATURE_LESS_MARKS is not set +CONFIG_FEATURE_LESS_REGEXP=y +CONFIG_HDPARM=y +CONFIG_FEATURE_HDPARM_GET_IDENTITY=y +# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set +# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set +CONFIG_MAKEDEVS=y +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +CONFIG_FEATURE_MAKEDEVS_TABLE=y +# CONFIG_MAN is not set +# CONFIG_MICROCOM is not set +CONFIG_MOUNTPOINT=y +CONFIG_MT=y +# CONFIG_RAIDAUTORUN is not set +# CONFIG_READAHEAD is not set +CONFIG_RUNLEVEL=y +# CONFIG_RX is not set +CONFIG_SETSID=y +CONFIG_STRINGS=y +# CONFIG_TASKSET is not set +# CONFIG_FEATURE_TASKSET_FANCY is not set +CONFIG_TIME=y +# CONFIG_TTYSIZE is not set +CONFIG_WATCHDOG=y + +# +# Networking Utilities +# +# CONFIG_FEATURE_IPV6 is not set +# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set +# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +# CONFIG_ARP is not set +CONFIG_ARPING=y +# CONFIG_BRCTL is not set +# CONFIG_FEATURE_BRCTL_FANCY is not set +# CONFIG_FEATURE_BRCTL_SHOW is not set +CONFIG_DNSD=y +CONFIG_ETHER_WAKE=y +# CONFIG_FAKEIDENTD is not set +# CONFIG_FTPGET is not set +# CONFIG_FTPPUT is not set +# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set +CONFIG_HOSTNAME=y +# CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_RANGES is not set +# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set +# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set +# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set +# CONFIG_FEATURE_HTTPD_PROXY is not set +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +CONFIG_FEATURE_IFCONFIG_SLIP=y +CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y +CONFIG_FEATURE_IFCONFIG_HW=y +# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set +# CONFIG_IFENSLAVE is not set +CONFIG_IFUPDOWN=y +CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" +CONFIG_FEATURE_IFUPDOWN_IP=y +# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set +# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set +CONFIG_FEATURE_IFUPDOWN_IPV4=y +# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set +CONFIG_FEATURE_IFUPDOWN_MAPPING=y +# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set +CONFIG_INETD=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y +# CONFIG_FEATURE_INETD_RPC is not set +CONFIG_IP=y +CONFIG_FEATURE_IP_ADDRESS=y +CONFIG_FEATURE_IP_LINK=y +CONFIG_FEATURE_IP_ROUTE=y +CONFIG_FEATURE_IP_TUNNEL=y +CONFIG_FEATURE_IP_RULE=y +CONFIG_FEATURE_IP_SHORT_FORMS=y +# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set +CONFIG_IPADDR=y +CONFIG_IPLINK=y +CONFIG_IPROUTE=y +CONFIG_IPTUNNEL=y +CONFIG_IPRULE=y +# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IPCALC_FANCY is not set +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set +CONFIG_NAMEIF=y +# CONFIG_FEATURE_NAMEIF_EXTENDED is not set +# CONFIG_NC is not set +# CONFIG_NC_SERVER is not set +# CONFIG_NC_EXTRA is not set +CONFIG_NETSTAT=y +# CONFIG_FEATURE_NETSTAT_WIDE is not set +# CONFIG_FEATURE_NETSTAT_PRG is not set +CONFIG_NSLOOKUP=y +CONFIG_PING=y +# CONFIG_PING6 is not set +CONFIG_FEATURE_FANCY_PING=y +# CONFIG_PSCAN is not set +CONFIG_ROUTE=y +# CONFIG_SENDMAIL is not set +# CONFIG_FETCHMAIL is not set +# CONFIG_SLATTACH is not set +CONFIG_TELNET=y +CONFIG_FEATURE_TELNET_TTYPE=y +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +# CONFIG_TELNETD is not set +# CONFIG_FEATURE_TELNETD_STANDALONE is not set +CONFIG_TFTP=y +# CONFIG_TFTPD is not set +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +CONFIG_FEATURE_TFTP_BLOCKSIZE=y +# CONFIG_DEBUG_TFTP is not set +CONFIG_TRACEROUTE=y +# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +CONFIG_APP_UDHCPD=y +CONFIG_APP_DHCPRELAY=y +CONFIG_APP_DUMPLEASES=y +# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases" +CONFIG_APP_UDHCPC=y +CONFIG_FEATURE_UDHCPC_ARPING=y +# CONFIG_FEATURE_UDHCP_PORT is not set +# CONFIG_FEATURE_UDHCP_DEBUG is not set +# CONFIG_FEATURE_RFC3397 is not set +CONFIG_DHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 +CONFIG_VCONFIG=y +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +# CONFIG_ZCIP is not set +# CONFIG_TCPSVD is not set +# CONFIG_UDPSVD is not set + +# +# Process Utilities +# +CONFIG_FREE=y +CONFIG_FUSER=y +CONFIG_KILL=y +CONFIG_KILLALL=y +CONFIG_KILLALL5=y +# CONFIG_NMETER is not set +# CONFIG_PGREP is not set +CONFIG_PIDOF=y +CONFIG_FEATURE_PIDOF_SINGLE=y +CONFIG_FEATURE_PIDOF_OMIT=y +# CONFIG_PKILL is not set +CONFIG_PS=y +CONFIG_FEATURE_PS_WIDE=y +# CONFIG_FEATURE_PS_TIME is not set +# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y +# CONFIG_FEATURE_TOP_DECIMALS is not set +# CONFIG_FEATURE_TOPMEM is not set +CONFIG_UPTIME=y +CONFIG_WATCH=y + +# +# Shells +# +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_MSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +CONFIG_ASH=y + +# +# Ash Shell Options +# +CONFIG_ASH_BASH_COMPAT=y +CONFIG_ASH_JOB_CONTROL=y +CONFIG_ASH_READ_NCHARS=y +CONFIG_ASH_READ_TIMEOUT=y +CONFIG_ASH_ALIAS=y +CONFIG_ASH_MATH_SUPPORT=y +CONFIG_ASH_MATH_SUPPORT_64=y +# CONFIG_ASH_GETOPTS is not set +CONFIG_ASH_BUILTIN_ECHO=y +CONFIG_ASH_BUILTIN_PRINTF=y +CONFIG_ASH_BUILTIN_TEST=y +CONFIG_ASH_CMDCMD=y +# CONFIG_ASH_MAIL is not set +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +CONFIG_ASH_RANDOM_SUPPORT=y +CONFIG_ASH_EXPAND_PRMT=y +# CONFIG_HUSH is not set +# CONFIG_HUSH_HELP is not set +# CONFIG_HUSH_INTERACTIVE is not set +# CONFIG_HUSH_JOB is not set +# CONFIG_HUSH_TICK is not set +# CONFIG_HUSH_IF is not set +# CONFIG_HUSH_LOOPS is not set +# CONFIG_HUSH_CASE is not set +# CONFIG_LASH is not set +# CONFIG_MSH is not set + +# +# Bourne Shell Options +# +CONFIG_FEATURE_SH_EXTRA_QUIET=y +# CONFIG_FEATURE_SH_STANDALONE is not set +# CONFIG_FEATURE_SH_NOFORK is not set +# CONFIG_CTTYHACK is not set + +# +# System Logging Utilities +# +CONFIG_SYSLOGD=y +CONFIG_FEATURE_ROTATE_LOGFILE=y +CONFIG_FEATURE_REMOTE_LOG=y +# CONFIG_FEATURE_SYSLOGD_DUP is not set +# CONFIG_FEATURE_IPC_SYSLOG is not set +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE= +# CONFIG_LOGREAD is not set +# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set +CONFIG_KLOGD=y +CONFIG_LOGGER=y + +# +# Runit Utilities +# +# CONFIG_RUNSV is not set +# CONFIG_RUNSVDIR is not set +# CONFIG_SV is not set +# CONFIG_SVLOGD is not set +# CONFIG_CHPST is not set +# CONFIG_SETUIDGID is not set +# CONFIG_ENVUIDGID is not set +# CONFIG_ENVDIR is not set +# CONFIG_SOFTLIMIT is not set +# CONFIG_CHCON is not set +# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set +# CONFIG_GETENFORCE is not set +# CONFIG_GETSEBOOL is not set +# CONFIG_LOAD_POLICY is not set +# CONFIG_MATCHPATHCON is not set +# CONFIG_RESTORECON is not set +# CONFIG_RUNCON is not set +# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set +# CONFIG_SELINUXENABLED is not set +# CONFIG_SETENFORCE is not set +# CONFIG_SETFILES is not set +# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set +# CONFIG_SETSEBOOL is not set +# CONFIG_SESTATUS is not set + +# +# Print Utilities +# +# CONFIG_LPD is not set +# CONFIG_LPR is not set +# CONFIG_LPQ is not set diff -Narup buildroot-20080919/package/iptables/iptables.mk buildroot-20080919-obs/package/iptables/iptables.mk --- buildroot-20080919/package/iptables/iptables.mk 2008-09-19 16:15:23.000000000 +0900 +++ buildroot-20080919-obs/package/iptables/iptables.mk 2008-09-20 10:57:33.000000000 +0900 @@ -3,17 +3,64 @@ # iptables # ############################################################# -IPTABLES_VERSION = 1.4.1 -IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2 -IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables - -IPTABLES_CONF_OPT = --libexecdir=/usr/lib -IPTABLES_INSTALL_TARGET = YES -IPTABLES_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-strip - -IPTABLES_AUTORECONF = YES -IPTABLES_DEPENDENCIES = -IPTABLES_CONFIGURE_OPT = --with-kernel=$(LINUX_HEADERS_DIR) -IPTABLES_MAKE_OPT = GLIB_GENMARSHAL=/usr/bin/glib-genmarshal GLIB_MKENUMS=/usr/bin +IPTABLES_VERSION:=1.3.8 +IPTABLES_SOURCE_URL:=http://ftp.netfilter.org/pub/iptables +IPTABLES_SOURCE:=iptables-$(IPTABLES_VERSION).tar.bz2 +IPTABLES_CAT:=$(BZCAT) +IPTABLES_BUILD_DIR:=$(BUILD_DIR)/iptables-$(IPTABLES_VERSION) -$(eval $(call AUTOTARGETS,package,iptables)) +$(DL_DIR)/$(IPTABLES_SOURCE): + $(WGET) -P $(DL_DIR) $(IPTABLES_SOURCE_URL)/$(IPTABLES_SOURCE) + +$(IPTABLES_BUILD_DIR)/.unpacked: $(DL_DIR)/$(IPTABLES_SOURCE) + $(IPTABLES_CAT) $(DL_DIR)/$(IPTABLES_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + touch $@ + +$(IPTABLES_BUILD_DIR)/.configured: $(IPTABLES_BUILD_DIR)/.unpacked + # Allow patches. Needed for openwrt for instance. + toolchain/patch-kernel.sh $(IPTABLES_BUILD_DIR) package/iptables/ iptables\*.patch + # + $(SED) "s;\[ -f /usr/include/netinet/ip6.h \];grep -q '__UCLIBC_HAS_IPV6__ 1' \ + $(STAGING_DIR)/usr/include/bits/uClibc_config.h;" $(IPTABLES_BUILD_DIR)/Makefile + touch $@ + +$(IPTABLES_BUILD_DIR)/iptables: $(IPTABLES_BUILD_DIR)/.configured + $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(IPTABLES_BUILD_DIR) \ + KERNEL_DIR=$(LINUX_HEADERS_DIR) \ + COPT_FLAGS="$(TARGET_CFLAGS)" \ + PREFIX=/usr \ + INCDIR="\$$(PREFIX)/include" \ + MANDIR="\$$(PREFIX)/share/man" + +$(TARGET_DIR)/usr/sbin/iptables: $(IPTABLES_BUILD_DIR)/iptables + $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(IPTABLES_BUILD_DIR) \ + KERNEL_DIR=$(LINUX_HEADERS_DIR) \ + COPT_FLAGS="$(TARGET_CFLAGS)" \ + PREFIX=/usr \ + INCDIR="\$$(PREFIX)/include" \ + MANDIR="\$$(PREFIX)/share/man" \ + DESTDIR=$(TARGET_DIR) install + $(STRIPCMD) $(TARGET_DIR)/usr/sbin/iptables* + $(STRIPCMD) $(TARGET_DIR)/usr/lib/iptables/*.so +ifneq ($(BR2_HAVE_MANPAGES),y) + rm -rf $(TARGET_DIR)/usr/share/man +endif + +iptables: $(TARGET_DIR)/usr/sbin/iptables + +iptables-source: $(DL_DIR)/$(IPTABLES_SOURCE) + +iptables-clean: + -$(MAKE1) -C $(IPTABLES_BUILD_DIR) clean + rm -rf $(TARGET_DIR)/usr/sbin/iptables* $(TARGET_DIR)/usr/lib/iptables + +iptables-dirclean: + rm -rf $(IPTABLES_BUILD_DIR) +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_IPTABLES)),y) +TARGETS+=iptables +endif diff -Narup buildroot-20080919/package/ltrace/ltrace.mk buildroot-20080919-obs/package/ltrace/ltrace.mk --- buildroot-20080919/package/ltrace/ltrace.mk 2008-09-19 16:15:30.000000000 +0900 +++ buildroot-20080919-obs/package/ltrace/ltrace.mk 2008-09-20 10:57:33.000000000 +0900 @@ -36,6 +36,9 @@ endif toolchain/patch-kernel.sh $(LTRACE_DIR) package/ltrace ltrace\*.patch $(CONFIG_UPDATE) $(@D) chmod +x $(LTRACE_DIR)/configure +ifeq ($(BR2_powerpc_obs266),y) + ln -sf ppc $(LTRACE_DIR)/sysdeps/linux-gnu/powerpc +endif touch $@ $(LTRACE_DIR)/.configured: $(LTRACE_DIR)/.patched diff -Narup buildroot-20080919/package/obstools/Config.in buildroot-20080919-obs/package/obstools/Config.in --- buildroot-20080919/package/obstools/Config.in 1970-01-01 09:00:00.000000000 +0900 +++ buildroot-20080919-obs/package/obstools/Config.in 2008-09-20 10:57:33.000000000 +0900 @@ -0,0 +1,8 @@ +config BR2_PACKAGE_OBS_TOOLS + bool "OpenBlockS tools" + depends on BR2_openblocks266 || BR2_openmicroserver + default n + help + Tools for Plathome's OpenBlockS266/OpenMicroServer include flashcfg, pshd and runled. + + http://www.plathome.co.jp/ diff -Narup buildroot-20080919/package/obstools/obs-init.sh buildroot-20080919-obs/package/obstools/obs-init.sh --- buildroot-20080919/package/obstools/obs-init.sh 1970-01-01 09:00:00.000000000 +0900 +++ buildroot-20080919-obs/package/obstools/obs-init.sh 2008-09-20 10:57:33.000000000 +0900 @@ -0,0 +1,7 @@ +#!/bin/sh +# +# Start the OpenBlockS tools... +# + +/usr/sbin/pshd +/usr/sbin/runled diff -Narup buildroot-20080919/package/obstools/obs-pshd.patch buildroot-20080919-obs/package/obstools/obs-pshd.patch --- buildroot-20080919/package/obstools/obs-pshd.patch 1970-01-01 09:00:00.000000000 +0900 +++ buildroot-20080919-obs/package/obstools/obs-pshd.patch 2008-09-20 10:57:33.000000000 +0900 @@ -0,0 +1,11 @@ +--- obstools.orig/pshd.c 2008-03-01 16:06:14.000000000 +0900 ++++ obstools/pshd.c 2008-03-02 22:10:07.000000000 +0900 +@@ -174,7 +174,7 @@ main(int argc, char *argv[]) + exit(-1); + } + /* At this point, push sw has been pushed! shutdown system */ +- execl("/sbin/shutdown", "shutdown", "-h", "now", NULL); ++ execl("/sbin/poweroff", "poweroff", NULL); + return 0; + } + } diff -Narup buildroot-20080919/package/obstools/obs266-flashcfg.patch buildroot-20080919-obs/package/obstools/obs266-flashcfg.patch --- buildroot-20080919/package/obstools/obs266-flashcfg.patch 1970-01-01 09:00:00.000000000 +0900 +++ buildroot-20080919-obs/package/obstools/obs266-flashcfg.patch 2008-09-20 10:57:33.000000000 +0900 @@ -0,0 +1,84 @@ +--- obstools.orig/flashcfg-obs266.c 2008-03-01 16:06:30.000000000 +0900 ++++ obstools/flashcfg-obs266.c 2008-03-02 22:12:40.000000000 +0900 +@@ -275,8 +275,8 @@ flash_prog_kern(char *kern) + return; + } + +- if ((ofd = open("/dev/mtd/1", O_RDWR)) < 0) { +- perror("/dev/mtd/1"); ++ if ((ofd = open("/dev/mtd1", O_RDWR)) < 0) { ++ perror("/dev/mtd1"); + close(ifd); + return; + } +@@ -333,7 +333,7 @@ flash_save_param(int target, char *list) + if (target == 's') { + sect_size = SECT1_SIZE; + maxsize = PARAM_SIZE; +- strcpy(targetdevice, "/dev/mtd/0"); ++ strcpy(targetdevice, "/dev/mtd0"); + } else if (target == 'S') { + if (USER_SIZE == 0) { + usage(); +@@ -341,7 +341,7 @@ flash_save_param(int target, char *list) + } + sect_size = SECT2_SIZE; + maxsize = USER_SIZE; +- strcpy(targetdevice, "/dev/mtd/4"); ++ strcpy(targetdevice, "/dev/mtd4"); + } else { + return; + } +@@ -354,7 +354,7 @@ flash_save_param(int target, char *list) + + if ((pid = fork()) == 0) { + /* in child */ +- execl("/usr/bin/tar", "tar", "cvpTzf", list, localbuf, NULL); ++ execl("/bin/tar", "tar", "-cvpzT", list, "-f", localbuf, NULL); + /* not reached here */ + } else { + wait(&st); +@@ -442,7 +442,7 @@ flash_extract_param(int target) + char targetdevice[256]; + + if (target == 'x') { +- strcpy(targetdevice, "/dev/mtd/0"); ++ strcpy(targetdevice, "/dev/mtd0"); + } else if (target == 'X') { + if (read_proc_mtd()) { + fprintf(stderr, "cannot read /proc/mtd\n"); +@@ -452,14 +452,14 @@ flash_extract_param(int target) + usage(); + exit (0); + } +- strcpy(targetdevice, "/dev/mtd/4"); ++ strcpy(targetdevice, "/dev/mtd4"); + } else { + return; + } + + if ((pid = fork()) == 0) { + /* in child */ +- execl("/usr/bin/tar", "tar", "--no-time-check", ++ execl("/bin/tar", "tar", + "-xvpzf", targetdevice, + "-C", "/", NULL); + /* not reached here */ +@@ -487,7 +487,7 @@ void flash_delete_param(int target) + if (target == 'd') { + sect_size = SECT1_SIZE; + maxsize = PARAM_SIZE; +- strcpy(targetdevice, "/dev/mtd/0"); ++ strcpy(targetdevice, "/dev/mtd0"); + } else if (target == 'D') { + if (USER_SIZE == 0) { + usage(); +@@ -495,7 +495,7 @@ void flash_delete_param(int target) + } + sect_size = SECT2_SIZE; + maxsize = USER_SIZE; +- strcpy(targetdevice, "/dev/mtd/4"); ++ strcpy(targetdevice, "/dev/mtd4"); + } else { + return; + } diff -Narup buildroot-20080919/package/obstools/obstools.mk buildroot-20080919-obs/package/obstools/obstools.mk --- buildroot-20080919/package/obstools/obstools.mk 1970-01-01 09:00:00.000000000 +0900 +++ buildroot-20080919-obs/package/obstools/obstools.mk 2008-09-20 10:57:33.000000000 +0900 @@ -0,0 +1,70 @@ +############################################################# +# +# OpenBlockS266 tools (flashcfg, pshd, runled) +# +############################################################# +OBSTOOLS_DIR:=$(BUILD_DIR)/obstools +OBSTOOLS_SOURCE_URL:=ftp://ftp.plathome.co.jp/pub/ssdlinux/src/usr.sbin + +OBS_VER:=obs266 +OBSTOOLS_CFLAGS:=-DHAVE_PUSHSW_OBS2XX_H -DCONFIG_OPENBLOCKS266 -DCONFIG_OBS266 -DKERNEL_26 -I$(LINUX_HEADERS_DIR)/include + +OBSTOOLS_FLASHCFG_BIN:=flashcfg +OBSTOOLS_FLASHCFG_DL_URL:=$(OBSTOOLS_SOURCE_URL)/$(OBSTOOLS_FLASHCFG_BIN)/$(OBS_VER)/$(OBSTOOLS_FLASHCFG_BIN).c + +OBSTOOLS_PSHD_BIN:=pshd +OBSTOOLS_PSHD_DL_URL:=$(OBSTOOLS_SOURCE_URL)/$(OBSTOOLS_PSHD_BIN)/$(OBSTOOLS_PSHD_BIN).c + +OBSTOOLS_RUNLED_BIN:=runled +OBSTOOLS_RUNLED_DL_URL:=$(OBSTOOLS_SOURCE_URL)/$(OBSTOOLS_RUNLED_BIN)/$(OBS_VER)/$(OBSTOOLS_RUNLED_BIN).c + +OBSTOOLS_DL_DIR:=$(DL_DIR)/obstools + +$(OBSTOOLS_DL_DIR)/$(OBSTOOLS_FLASHCFG_BIN)-$(OBS_VER).c: + -mkdir -p $(OBSTOOLS_DL_DIR) + $(WGET) $(OBSTOOLS_FLASHCFG_DL_URL) -O $(OBSTOOLS_DL_DIR)/$(OBSTOOLS_FLASHCFG_BIN)-$(OBS_VER).c + +$(OBSTOOLS_DL_DIR)/$(OBSTOOLS_PSHD_BIN).c: + -mkdir -p $(OBSTOOLS_DL_DIR) + $(WGET) $(OBSTOOLS_PSHD_DL_URL) -O $(OBSTOOLS_DL_DIR)/$(OBSTOOLS_PSHD_BIN).c + +$(OBSTOOLS_DL_DIR)/$(OBSTOOLS_RUNLED_BIN)-$(OBS_VER).c: + -mkdir -p $(OBSTOOLS_DL_DIR) + $(WGET) $(OBSTOOLS_RUNLED_DL_URL) -O $(OBSTOOLS_DL_DIR)/$(OBSTOOLS_RUNLED_BIN)-$(OBS_VER).c + +$(OBSTOOLS_DIR)/.patched: $(OBSTOOLS_DL_DIR)/$(OBSTOOLS_FLASHCFG_BIN)-$(OBS_VER).c $(OBSTOOLS_DL_DIR)/$(OBSTOOLS_PSHD_BIN).c $(OBSTOOLS_DL_DIR)/$(OBSTOOLS_RUNLED_BIN)-$(OBS_VER).c + -mkdir -p $(OBSTOOLS_DIR) + cp $(OBSTOOLS_DL_DIR)/* $(OBSTOOLS_DIR) + toolchain/patch-kernel.sh $(OBSTOOLS_DIR) package/obstools obs-*.patch $(OBS_VER)*.patch + touch $(OBSTOOLS_DIR)/.patched + +$(OBSTOOLS_DIR)/$(OBSTOOLS_FLASHCFG_BIN): $(OBSTOOLS_DIR)/.patched + $(TARGET_CC) $(TARGET_CFLAGS) $(OBSTOOLS_CFLAGS) -o $@ $@-$(OBS_VER).c + -$(STRIP) $@ + +$(OBSTOOLS_DIR)/$(OBSTOOLS_PSHD_BIN): $(OBSTOOLS_DIR)/.patched + $(TARGET_CC) $(TARGET_CFLAGS) $(OBSTOOLS_CFLAGS) -o $@ $@.c + -$(STRIP) $@ + +$(OBSTOOLS_DIR)/$(OBSTOOLS_RUNLED_BIN): $(OBSTOOLS_DIR)/.patched + $(TARGET_CC) $(TARGET_CFLAGS) -o $@ $@-$(OBS_VER).c + -$(STRIP) $@ + +$(OBSTOOLS_DIR)/.copied: $(OBSTOOLS_DIR)/$(OBSTOOLS_FLASHCFG_BIN) $(OBSTOOLS_DIR)/$(OBSTOOLS_PSHD_BIN) $(OBSTOOLS_DIR)/$(OBSTOOLS_RUNLED_BIN) + cp -a $^ $(TARGET_DIR)/usr/sbin/ + install -m 755 package/obstools/obs-init.sh $(TARGET_DIR)/etc/init.d/S99obs + touch $(OBSTOOLS_DIR)/.copied + +obstools: uclibc $(OBSTOOLS_DIR)/.copied + +obstools-clean: + rm -rf $(OBSTOOLS_DIR) + +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_OBS_TOOLS)),y) +TARGETS+=obstools +endif diff -Narup buildroot-20080919/package/openssh/S50sshd buildroot-20080919-obs/package/openssh/S50sshd --- buildroot-20080919/package/openssh/S50sshd 2008-09-19 16:15:29.000000000 +0900 +++ buildroot-20080919-obs/package/openssh/S50sshd 2008-09-20 10:57:33.000000000 +0900 @@ -7,23 +7,23 @@ [ -f /usr/bin/ssh-keygen ] || exit 0 # Check for the SSH1 RSA key -if [ ! -f /etc/ssh_host_key ] ; then +if [ ! -f /etc/ssh/ssh_host_key ] ; then echo Generating RSA Key... - /usr/bin/ssh-keygen -t rsa1 -f /etc/ssh_host_key -C '' -N '' + /usr/bin/ssh-keygen -t rsa1 -f /etc/ssh/ssh_host_key -C '' -N '' fi # Check for the SSH2 RSA key -if [ ! -f /etc/ssh_host_rsa_key ] ; then +if [ ! -f /etc/ssh/ssh_host_rsa_key ] ; then echo Generating RSA Key... - /usr/bin/ssh-keygen -t rsa -f /etc/ssh_host_rsa_key -C '' -N '' + /usr/bin/ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -C '' -N '' fi # Check for the SSH2 DSA key -if [ ! -f /etc/ssh_host_dsa_key ] ; then +if [ ! -f /etc/ssh/ssh_host_dsa_key ] ; then echo Generating DSA Key... echo THIS CAN TAKE A MINUTE OR TWO DEPENDING ON YOUR PROCESSOR! echo - /usr/bin/ssh-keygen -t dsa -f /etc/ssh_host_dsa_key -C '' -N '' + /usr/bin/ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -C '' -N '' fi umask 077 diff -Narup buildroot-20080919/package/openssh/openssh.mk buildroot-20080919-obs/package/openssh/openssh.mk --- buildroot-20080919/package/openssh/openssh.mk 2008-09-19 16:15:29.000000000 +0900 +++ buildroot-20080919-obs/package/openssh/openssh.mk 2008-09-20 10:57:33.000000000 +0900 @@ -3,7 +3,7 @@ # openssh # ############################################################# -OPENSSH_VERSION=4.6p1 +OPENSSH_VERSION=4.7p1 OPENSSH_SITE=ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_DIR=$(BUILD_DIR)/openssh-$(OPENSSH_VERSION) OPENSSH_SOURCE=openssh-$(OPENSSH_VERSION).tar.gz @@ -32,7 +32,7 @@ $(OPENSSH_DIR)/.configured: $(OPENSSH_DI --sbindir=/usr/sbin \ --libdir=/lib \ --libexecdir=/usr/sbin \ - --sysconfdir=/etc \ + --sysconfdir=/etc/ssh \ --datadir=/usr/share \ --localstatedir=/var \ --mandir=/usr/man \ diff -Narup buildroot-20080919/package/openssh/openssh.patch buildroot-20080919-obs/package/openssh/openssh.patch --- buildroot-20080919/package/openssh/openssh.patch 2008-09-19 16:15:29.000000000 +0900 +++ buildroot-20080919-obs/package/openssh/openssh.patch 2008-09-20 10:57:33.000000000 +0900 @@ -79,15 +79,6 @@ + --- openssh-4.6p1.oorig/sshd_config 2006-07-24 06:06:47.000000000 +0200 +++ openssh-4.6p1/sshd_config 2007-06-28 15:58:49.000000000 +0200 -@@ -11,7 +11,7 @@ - # default value. - - #Port 22 --#Protocol 2,1 -+Protocol 2 - #AddressFamily any - #ListenAddress 0.0.0.0 - #ListenAddress :: @@ -83,9 +83,11 @@ #AllowTcpForwarding yes #GatewayPorts no diff -Narup buildroot-20080919/package/openssh/openssh.without-__progname.patch buildroot-20080919-obs/package/openssh/openssh.without-__progname.patch --- buildroot-20080919/package/openssh/openssh.without-__progname.patch 1970-01-01 09:00:00.000000000 +0900 +++ buildroot-20080919-obs/package/openssh/openssh.without-__progname.patch 2008-09-20 10:57:33.000000000 +0900 @@ -0,0 +1,38 @@ +diff -Narup openssh-4.7p1.orig/openbsd-compat/bsd-misc.c openssh-4.7p1/openbsd-compat/bsd-misc.c +--- openssh-4.7p1.orig/openbsd-compat/bsd-misc.c 2007-06-11 13:34:53.000000000 +0900 ++++ openssh-4.7p1/openbsd-compat/bsd-misc.c 2008-02-29 02:45:18.000000000 +0900 +@@ -32,9 +32,9 @@ + + #include "xmalloc.h" + +-#ifndef HAVE___PROGNAME ++/*#ifndef HAVE___PROGNAME*/ + char *__progname; +-#endif ++/*#endif*/ + + /* + * NB. duplicate __progname in case it is an alias for argv[0] +@@ -42,11 +42,11 @@ char *__progname; + */ + char *ssh_get_progname(char *argv0) + { +-#ifdef HAVE___PROGNAME ++/*#ifdef HAVE___PROGNAME + extern char *__progname; + + return xstrdup(__progname); +-#else ++#else*/ + char *p; + + if (argv0 == NULL) +@@ -58,7 +58,7 @@ char *ssh_get_progname(char *argv0) + p++; + + return (xstrdup(p)); +-#endif ++/*#endif*/ + } + + #ifndef HAVE_SETLOGIN diff -Narup buildroot-20080919/package/rp-pppoe/rp-pppoe.mk buildroot-20080919-obs/package/rp-pppoe/rp-pppoe.mk --- buildroot-20080919/package/rp-pppoe/rp-pppoe.mk 2008-09-19 16:15:27.000000000 +0900 +++ buildroot-20080919-obs/package/rp-pppoe/rp-pppoe.mk 2008-09-20 10:57:33.000000000 +0900 @@ -9,9 +9,11 @@ RP_PPPOE_PATCH:=rp-pppoe_$(RP_PPPOE_VERS RP_PPPOE_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/r/rp-pppoe RP_PPPOE_TOPDIR:=$(BUILD_DIR)/rp-pppoe-$(RP_PPPOE_VERSION) RP_PPPOE_DIR:=$(BUILD_DIR)/rp-pppoe-$(RP_PPPOE_VERSION)/src +RP_PPPOE_SCRIPTS_DIR:=$(RP_PPPOE_TOPDIR)/scripts +RP_PPPOE_CONFIGS_DIR:=$(RP_PPPOE_TOPDIR)/configs RP_PPPOE_CAT:=$(ZCAT) RP_PPPOE_BINARY:=pppoe -RP_PPPOE_TARGET_BINARY:=usr/sbin/pppoe +RP_PPPOE_TARGET_DIR:=$(TARGET_DIR)/usr/sbin $(DL_DIR)/$(RP_PPPOE_SOURCE): $(WGET) -P $(DL_DIR) $(RP_PPPOE_SITE)/$(RP_PPPOE_SOURCE) @@ -51,22 +53,33 @@ $(RP_PPPOE_TOPDIR)/.configured: $(RP_PPP $(RP_PPPOE_DIR)/$(RP_PPPOE_BINARY): $(RP_PPPOE_TOPDIR)/.configured $(MAKE) -C $(RP_PPPOE_DIR) -$(TARGET_DIR)/$(RP_PPPOE_TARGET_BINARY): $(RP_PPPOE_DIR)/$(RP_PPPOE_BINARY) +$(RP_PPPOE_TARGET_DIR)/$(RP_PPPOE_BINARY): $(RP_PPPOE_DIR)/$(RP_PPPOE_BINARY) cp -dpf $(RP_PPPOE_DIR)/$(RP_PPPOE_BINARY) $@ + cp -dpf $(RP_PPPOE_DIR)/$(RP_PPPOE_BINARY)-{server,relay,sniff} \ + $(RP_PPPOE_TARGET_DIR) + chmod +x $(RP_PPPOE_SCRIPTS_DIR)/* + cp -dpf $(RP_PPPOE_SCRIPTS_DIR)/$(RP_PPPOE_BINARY)-{connect,status} \ + $(RP_PPPOE_TARGET_DIR) + cp -dpf $(RP_PPPOE_SCRIPTS_DIR)/$(RP_PPPOE_BINARY)-{start,stop,setup} \ + $(RP_PPPOE_TARGET_DIR) + mkdir -p $(TARGET_DIR)/etc/ppp + cp -dpf $(RP_PPPOE_CONFIGS_DIR)/* $(TARGET_DIR)/etc/ppp/ ifeq ($(BR2_HAVE_MANPAGES),y) mkdir -p $(TARGET_DIR)/usr/share/man/man8 $(INSTALL) -m 644 $(RP_PPPOE_TOPDIR)/man/pppoe.8 $(TARGET_DIR)/usr/share/man/man8/pppoe.8 endif $(STRIPCMD) $(STRIP_STRIP_ALL) $@ -rp-pppoe: uclibc $(TARGET_DIR)/$(RP_PPPOE_TARGET_BINARY) +rp-pppoe: uclibc $(RP_PPPOE_TARGET_DIR)/$(RP_PPPOE_BINARY) rp-pppoe-source: $(DL_DIR)/$(RP_PPPOE_SOURCE) $(RP_PPPOE_PATCH_FILE) rp-pppoe-clean: -$(MAKE) -C $(RP_PPPOE_DIR) clean - rm -f $(TARGET_DIR)/$(RP_PPPOE_TARGET_BINARY) \ + rm -f $(RP_PPPOE_TARGET_DIR)/$(RP_PPPOE_BINARY) \ + $(RP_PPPOE_TARGET_DIR)/$(RP_PPPOE_BINARY)-* \ $(TARGET_DIR)/usr/share/man/man8/pppoe.8* + rm -rf $(TARGET_DIR)/etc/ppp rp-pppoe-dirclean: rm -rf $(RP_PPPOE_TOPDIR) diff -Narup buildroot-20080919/package/tar/tar.patch buildroot-20080919-obs/package/tar/tar.patch --- buildroot-20080919/package/tar/tar.patch 1970-01-01 09:00:00.000000000 +0900 +++ buildroot-20080919-obs/package/tar/tar.patch 2008-09-20 10:57:33.000000000 +0900 @@ -0,0 +1,24 @@ +diff -Narup tar-1.19.orig/lib/mbchar.h tar-1.19/lib/mbchar.h +--- tar-1.19.orig/lib/mbchar.h 2007-09-28 22:11:36.000000000 +0900 ++++ tar-1.19/lib/mbchar.h 2008-02-29 15:40:51.000000000 +0900 +@@ -237,7 +237,7 @@ typedef struct mbchar mbchar_t; + #define MB_UNPRINTABLE_WIDTH 1 + + static inline int +-mb_width_aux (wint_t wc) ++mb_width_aux (int wc) + { + int w = wcwidth (wc); + /* For unprintable characters, arbitrarily return 0 for control characters +diff -Narup tar-1.19.orig/lib/regcomp.c tar-1.19/lib/regcomp.c +--- tar-1.19.orig/lib/regcomp.c 2007-09-28 22:11:36.000000000 +0900 ++++ tar-1.19/lib/regcomp.c 2008-02-29 15:41:06.000000000 +0900 +@@ -864,7 +864,7 @@ init_dfa (re_dfa_t *dfa, size_t pat_len) + dfa->state_table = calloc (sizeof (struct re_state_table_entry), table_size); + dfa->state_hash_mask = table_size - 1; + +- dfa->mb_cur_max = MB_CUR_MAX; ++ dfa->mb_cur_max = 1; + #ifdef _LIBC + if (dfa->mb_cur_max == 6 + && strcmp (_NL_CURRENT (LC_CTYPE, _NL_CTYPE_CODESET_NAME), "UTF-8") == 0) diff -Narup buildroot-20080919/target/Config.in.arch buildroot-20080919-obs/target/Config.in.arch --- buildroot-20080919/target/Config.in.arch 2008-09-19 16:15:15.000000000 +0900 +++ buildroot-20080919-obs/target/Config.in.arch 2008-09-20 10:57:33.000000000 +0900 @@ -1,6 +1,6 @@ choice prompt "Target Architecture" - default BR2_i386 + default BR2_powerpc help Select the target architecture family to build for. @@ -425,11 +425,14 @@ endchoice choice prompt "Target Architecture Variant" depends on BR2_powerpc - default BR2_generic_powerpc + default BR2_powerpc_obs266 help Specific CPU variant to use config BR2_generic_powerpc bool "generic" +config BR2_powerpc_obs266 + bool "OpenBlockS266" + select BR2_PACKAGE_OBS_TOOLS config BR2_powerpc_401 bool "401" config BR2_powerpc_403 @@ -612,6 +615,7 @@ config BR2_GCC_TARGET_TUNE default mips64 if BR2_mips_64 default mips64r2 if BR2_mips_64r2 default mips16 if BR2_mips_16 + default 405 if BR2_powerpc_obs266 default 401 if BR2_powerpc_401 default 403 if BR2_powerpc_403 default 405 if BR2_powerpc_405 diff -Narup buildroot-20080919/target/generic/device_table.txt buildroot-20080919-obs/target/generic/device_table.txt --- buildroot-20080919/target/generic/device_table.txt 2008-09-19 16:15:15.000000000 +0900 +++ buildroot-20080919-obs/target/generic/device_table.txt 2008-09-20 10:57:33.000000000 +0900 @@ -71,13 +71,13 @@ /dev/fb c 640 0 5 29 0 0 1 4 #/dev/ttySA c 666 0 0 204 5 0 1 3 /dev/psaux c 666 0 0 10 1 0 0 - -#/dev/ppp c 666 0 0 108 0 - - - +/dev/ppp c 666 0 0 108 0 - - - # Input stuff -/dev/input d 755 0 0 - - - - - -/dev/input/mice c 640 0 0 13 63 0 0 - -/dev/input/mouse c 660 0 0 13 32 0 1 4 -/dev/input/event c 660 0 0 13 64 0 1 4 +#/dev/input d 755 0 0 - - - - - +#/dev/input/mice c 640 0 0 13 63 0 0 - +#/dev/input/mouse c 660 0 0 13 32 0 1 4 +#/dev/input/event c 660 0 0 13 64 0 1 4 #/dev/input/js c 660 0 0 13 0 0 1 4 @@ -103,8 +103,8 @@ # IDE Devices /dev/hda b 640 0 0 3 0 0 0 - /dev/hda b 640 0 0 3 1 1 1 15 -/dev/hdb b 640 0 0 3 64 0 0 - -/dev/hdb b 640 0 0 3 65 1 1 15 +#/dev/hdb b 640 0 0 3 64 0 0 - +#/dev/hdb b 640 0 0 3 65 1 1 15 #/dev/hdc b 640 0 0 22 0 0 0 - #/dev/hdc b 640 0 0 22 1 1 1 15 #/dev/hdd b 640 0 0 22 64 0 0 - @@ -169,3 +169,8 @@ #/dev/mcd b 640 0 0 23 0 0 0 - #/dev/optcd b 640 0 0 17 0 0 0 - +# OpenBlockS +/dev/nvram c 644 0 0 240 0 0 1 2 +/dev/pushsw c 660 0 2 10 170 0 0 - +/dev/segled c 660 0 2 10 171 0 0 - +/dev/watchdog c 600 0 0 10 130 0 0 - diff -Narup buildroot-20080919/target/generic/target_skeleton/etc/TZ buildroot-20080919-obs/target/generic/target_skeleton/etc/TZ --- buildroot-20080919/target/generic/target_skeleton/etc/TZ 2008-09-19 16:15:15.000000000 +0900 +++ buildroot-20080919-obs/target/generic/target_skeleton/etc/TZ 2008-09-20 10:57:33.000000000 +0900 @@ -1 +1 @@ -MST7MDT +JST-9 diff -Narup buildroot-20080919/target/generic/target_skeleton/etc/flashcfg buildroot-20080919-obs/target/generic/target_skeleton/etc/flashcfg --- buildroot-20080919/target/generic/target_skeleton/etc/flashcfg 1970-01-01 09:00:00.000000000 +0900 +++ buildroot-20080919-obs/target/generic/target_skeleton/etc/flashcfg 2008-09-20 10:57:33.000000000 +0900 @@ -0,0 +1,10 @@ +/etc/flashcfg +/etc/fstab +/etc/group +/etc/hostname +/etc/hosts +/etc/inittab +/etc/network/interfaces +/etc/passwd +/etc/securetty +/etc/shadow diff -Narup buildroot-20080919/target/generic/target_skeleton/etc/inittab buildroot-20080919-obs/target/generic/target_skeleton/etc/inittab --- buildroot-20080919/target/generic/target_skeleton/etc/inittab 2008-09-19 16:15:15.000000000 +0900 +++ buildroot-20080919-obs/target/generic/target_skeleton/etc/inittab 2008-09-20 10:57:33.000000000 +0900 @@ -24,17 +24,17 @@ null::sysinit:/sbin/route add -net 127.0 ::sysinit:/etc/init.d/rcS # Set up a couple of getty's -tty1::respawn:/sbin/getty 38400 tty1 -tty2::respawn:/sbin/getty 38400 tty2 +#tty1::respawn:/sbin/getty 38400 tty1 +#tty2::respawn:/sbin/getty 38400 tty2 # Put a getty on the serial port -#ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100 +ttyS0::respawn:/sbin/getty -L ttyS0 9600 vt100 # Logging junk null::sysinit:/bin/touch /var/log/messages null::respawn:/sbin/syslogd -n -m 0 null::respawn:/sbin/klogd -n -tty3::respawn:/usr/bin/tail -f /var/log/messages +#tty3::respawn:/usr/bin/tail -f /var/log/messages # Stuff to do for the 3-finger salute ::ctrlaltdel:/sbin/reboot diff -Narup buildroot-20080919/target/linux/Makefile.in buildroot-20080919-obs/target/linux/Makefile.in --- buildroot-20080919/target/linux/Makefile.in 2008-09-19 16:15:07.000000000 +0900 +++ buildroot-20080919-obs/target/linux/Makefile.in 2008-09-20 10:57:33.000000000 +0900 @@ -63,6 +63,11 @@ LINUX26_BINLOC=arch/$(KERNEL_ARCH)/boot/ endif endif +ifeq ($(BR2_powerpc_obs266),y) +KERNEL_ARCH=ppc +LINUX26_BINLOC=arch/ppc/boot/images/$(LINUX26_FORMAT).treeboot +endif + # File name for the Linux kernel binary ifndef LINUX26_KERNEL LINUX26_KERNEL=$(BINARIES_DIR)/linux-kernel-$(LINUX26_VERSION)-$(KERNEL_ARCH) @@ -131,6 +136,15 @@ endif ifeq ($(BR2_KERNEL_HEADERS_RT),y) toolchain/patch-kernel.sh $(LINUX26_DIR) $(DL_DIR) $(LINUX_RT_SOURCE) endif +ifeq ($(BR2_powerpc_obs266),y) +ifneq ($(LINUX_OBS_PATCH_1),) + toolchain/patch-kernel.sh $(LINUX26_DIR) $(DL_DIR) $(LINUX_OBS_PATCH_1) +endif +ifneq ($(LINUX_OBS_PATCH_2),) + toolchain/patch-kernel.sh $(LINUX26_DIR) $(DL_DIR) $(LINUX_OBS_PATCH_2) +endif + toolchain/patch-kernel.sh $(LINUX26_DIR) $(DL_DIR) $(LINUX_OBS_BR_PATCH) +endif ifeq ($(BR2_KERNEL_HEADERS_PATCH_DIR),y) toolchain/patch-kernel.sh $(LINUX26_DIR) $(KERNEL_HEADERS_PATCH_DIR) \ linux-$(LINUX26_VERSION)-\*.patch{,.gz,.bz2} diff -Narup buildroot-20080919/target/powerpc/obs-linux/obs-linux.mk buildroot-20080919-obs/target/powerpc/obs-linux/obs-linux.mk --- buildroot-20080919/target/powerpc/obs-linux/obs-linux.mk 1970-01-01 09:00:00.000000000 +0900 +++ buildroot-20080919-obs/target/powerpc/obs-linux/obs-linux.mk 2008-09-20 10:57:33.000000000 +0900 @@ -0,0 +1,31 @@ +############################################################# +# +# Linux kernel initrd for OpenBlockS +# +############################################################# +OBS_IMAGE:=zImage.initrd.treeboot +LINUX_IMAGE_DIR:=arch/ppc/boot/images +RAMDISK_IMAGE:=ramdisk.image + +$(BINARIES_DIR)/$(OBS_IMAGE): linux26 + rm -f $(LINUX26_DIR)/$(LINUX_IMAGE_DIR)/$(RAMDISK_IMAGE).gz + cp $(EXT2_TARGET) $(LINUX26_DIR)/$(LINUX_IMAGE_DIR)/$(RAMDISK_IMAGE) + gzip -9 $(LINUX26_DIR)/$(LINUX_IMAGE_DIR)/$(RAMDISK_IMAGE) + $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) \ + $(LINUX26_FORMAT).initrd + cp $(LINUX26_DIR)/$(LINUX_IMAGE_DIR)/$(OBS_IMAGE) \ + $(BINARIES_DIR)/$(OBS_IMAGE) + +linux-initrd: ext2root $(BINARIES_DIR)/$(OBS_IMAGE) + +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_KERNEL_LINUX)),y) +ifeq ($(strip $(BR2_powerpc_obs266)),y) +TARGETS+=linux-initrd +endif +endif + diff -Narup buildroot-20080919/toolchain/kernel-headers/Config.in buildroot-20080919-obs/toolchain/kernel-headers/Config.in --- buildroot-20080919/toolchain/kernel-headers/Config.in 2008-09-19 16:15:02.000000000 +0900 +++ buildroot-20080919-obs/toolchain/kernel-headers/Config.in 2008-09-20 10:59:08.000000000 +0900 @@ -6,6 +6,7 @@ comment "Kernel Header Options" choice prompt "Kernel Headers" + default BR2_KERNEL_HEADERS_2_6_26_OBS266 if BR2_powerpc_obs266 default BR2_KERNEL_HEADERS_2_6_26 help @@ -56,6 +57,10 @@ choice depends on BR2_DEPRECATED bool "Linux 2.6.24.x kernel headers" + config BR2_KERNEL_HEADERS_2_6_24_OBS266 + depends on !BR2_avr32 && !BR2_nios2 && BR2_powerpc_obs266 + bool "Linux 2.6.24 kernel headers (OpenBlockS266)" + config BR2_KERNEL_HEADERS_2_6_25 depends on BR2_RECENT bool "Linux 2.6.25.x kernel headers" @@ -63,6 +68,10 @@ choice config BR2_KERNEL_HEADERS_2_6_26 bool "Linux 2.6.26.x kernel headers" + config BR2_KERNEL_HEADERS_2_6_26_OBS266 + depends on !BR2_avr32 && !BR2_nios2 && BR2_powerpc_obs266 + bool "Linux 2.6.26 kernel headers (OpenBlockS266)" + config BR2_KERNEL_HEADERS_SNAP bool "Linux 2.6 snapshot" @@ -107,7 +116,9 @@ config BR2_DEFAULT_KERNEL_HEADERS default "2.6.22.10" if BR2_KERNEL_HEADERS_2_6_22 default "2.6.23" if BR2_KERNEL_HEADERS_2_6_23 default "2.6.24.7" if BR2_KERNEL_HEADERS_2_6_24 + default "2.6.24.7" if BR2_KERNEL_HEADERS_2_6_24_OBS266 default "2.6.25.15" if BR2_KERNEL_HEADERS_2_6_25 default "2.6.26.2" if BR2_KERNEL_HEADERS_2_6_26 + default "2.6.26.5" if BR2_KERNEL_HEADERS_2_6_26_OBS266 default "2.6" if BR2_KERNEL_HEADERS_SNAP diff -Narup buildroot-20080919/toolchain/kernel-headers/kernel-headers-new.makefile buildroot-20080919-obs/toolchain/kernel-headers/kernel-headers-new.makefile --- buildroot-20080919/toolchain/kernel-headers/kernel-headers-new.makefile 2008-09-19 16:15:02.000000000 +0900 +++ buildroot-20080919-obs/toolchain/kernel-headers/kernel-headers-new.makefile 2008-09-20 10:57:33.000000000 +0900 @@ -34,6 +34,21 @@ ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.2 LINUX_RT_VERSION:=rt20 endif +ifeq ($(BR2_powerpc_obs266),y) +LINUX_OBS_PATCH_SITE:=ftp://ftp.plathome.co.jp/pub/ssdlinux/distfiles +LINUX_OBS_BR_PATCH_SITE:=http://www.asahi-net.or.jp/~jg3h-snj/openblocks/kernel +ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.24.7") +LINUX_OBS_BR_PATCH_VERSION:=002 +LINUX_OBS_BR_PATCH:=linux-$(LINUX_HEADERS_VERSION)-$(LINUX_OBS_BR_PATCH_VERSION)-obs.patch.bz2 +endif +ifeq ("$(DEFAULT_KERNEL_HEADERS)","2.6.26.5") +LINUX_OBS_PATCH_1:=linux-2.6.26.0.patch.bz2 +LINUX_OBS_PATCH_2:=linux-2.6.26.5-001-obs.patch.bz2 +LINUX_OBS_BR_PATCH_VERSION:=001 +LINUX_OBS_BR_PATCH:=linux-2.6.26-$(LINUX_OBS_BR_PATCH_VERSION)-obs.br.patch.bz2 +endif +endif + ifeq ($(LINUX_HEADERS_IS_KERNEL),y) # Need to redefine KERNEL_HEADERS_PATCH_DIR if you want # board specific kernel headers @@ -48,6 +63,22 @@ $(DL_DIR)/$(LINUX_RT_SOURCE): $(WGET) -P $(DL_DIR) $(LINUX_RT_SITE)/$(LINUX_RT_SOURCE) endif +ifeq ($(BR2_powerpc_obs266),y) +ifneq ($(LINUX_OBS_PATCH_1),) +LINUX_HEADERS_DEPENDS+=$(DL_DIR)/$(LINUX_OBS_PATCH_1) +$(DL_DIR)/$(LINUX_OBS_PATCH_1): + $(WGET) -P $(DL_DIR) $(LINUX_OBS_PATCH_SITE)/$(LINUX_OBS_PATCH_1) +endif +ifneq ($(LINUX_OBS_PATCH_2),) +LINUX_HEADERS_DEPENDS+=$(DL_DIR)/$(LINUX_OBS_PATCH_2) +$(DL_DIR)/$(LINUX_OBS_PATCH_2): + $(WGET) -P $(DL_DIR) $(LINUX_OBS_PATCH_SITE)/$(LINUX_OBS_PATCH_2) +endif +LINUX_HEADERS_DEPENDS+=$(DL_DIR)/$(LINUX_OBS_BR_PATCH) +$(DL_DIR)/$(LINUX_OBS_BR_PATCH): + $(WGET) -P $(DL_DIR) $(LINUX_OBS_BR_PATCH_SITE)/$(LINUX_OBS_BR_PATCH) +endif + $(LINUX_HEADERS_UNPACK_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE) @echo "*** Using kernel-headers generated from kernel source" rm -rf $(LINUX_HEADERS_DIR) @@ -69,6 +100,15 @@ endif ifeq ($(BR2_KERNEL_HEADERS_RT),y) toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) $(DL_DIR) $(LINUX_RT_SOURCE) endif +ifeq ($(BR2_powerpc_obs266),y) +ifneq ($(LINUX_OBS_PATCH_1),) + toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) $(DL_DIR) $(LINUX_OBS_PATCH_1) +endif +ifneq ($(LINUX_OBS_PATCH_2),) + toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) $(DL_DIR) $(LINUX_OBS_PATCH_2) +endif + toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) $(DL_DIR) $(LINUX_OBS_BR_PATCH) +endif ifeq ($(BR2_KERNEL_HEADERS_PATCH_DIR),y) toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) $(KERNEL_HEADERS_PATCH_DIR) \ \*.patch{,.gz,.bz2} @@ -80,12 +120,26 @@ endif touch $@ $(LINUX_HEADERS_DIR)/.configured: $(LINUX_HEADERS_UNPACK_DIR)/.patched +ifeq ($(BR2_powerpc_obs266),y) + (cd $(LINUX_HEADERS_UNPACK_DIR); \ + $(MAKE) ARCH=powerpc \ + HOSTCC="$(HOSTCC)" HOSTCFLAGS="$(HOSTCFLAGS)" \ + HOSTCXX="$(HOSTCXX)" \ + INSTALL_HDR_PATH=$(LINUX_HEADERS_DIR) headers_install; \ + ) + cp -a $(LINUX_HEADERS_UNPACK_DIR)/include/asm-ppc/* \ + $(LINUX_HEADERS_DIR)/include/asm/ + rm -rf $(LINUX_HEADERS_DIR)/include/linux + ln -sf $(LINUX_HEADERS_UNPACK_DIR)/include/linux \ + $(LINUX_HEADERS_DIR)/include/linux +else (cd $(LINUX_HEADERS_UNPACK_DIR); \ $(MAKE) ARCH=$(KERNEL_ARCH) \ HOSTCC="$(HOSTCC)" HOSTCFLAGS="$(HOSTCFLAGS)" \ HOSTCXX="$(HOSTCXX)" \ INSTALL_HDR_PATH=$(LINUX_HEADERS_DIR) headers_install; \ ) +endif touch $@ endif