From b2c64f8c2a07dce174b270d2cb35bd51ec2ca19b Mon Sep 17 00:00:00 2001 From: ms Date: Mon, 16 Jul 2007 00:12:10 +0000 Subject: [PATCH] =?utf8?q?Alte=20Buildroot-Dateien=20entfernt.=20Kernelcon?= =?utf8?q?fig=20erweitert=20f=C3=BCr=20Flash-Devices.=20losetup=20ins=20In?= =?utf8?q?stallationssystem=20kompiliert.=20Das=20Buildscript=20kann=20nun?= =?utf8?q?=20selbstst=C3=A4ndig=20auch=20auf=20andere=20Ports=20als=2021?= =?utf8?q?=20hochladen...?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@697 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/kernel/kernel.config.i586 | 12 +- config/kernel/kernel.config.i586.smp | 12 +- config/uClibc/buildroot.config-i586 | 335 --------------------------- config/uClibc/buildroot.config.cmd | 183 --------------- config/uClibc/busybox.config | 22 +- lfs/uClibc | 4 +- make.sh | 58 +++-- 7 files changed, 53 insertions(+), 573 deletions(-) delete mode 100644 config/uClibc/buildroot.config-i586 delete mode 100644 config/uClibc/buildroot.config.cmd diff --git a/config/kernel/kernel.config.i586 b/config/kernel/kernel.config.i586 index b62b3b76af..f7752a1f46 100644 --- a/config/kernel/kernel.config.i586 +++ b/config/kernel/kernel.config.i586 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16.50-ipfire -# Sun Jun 17 18:22:24 2007 +# Sun Jul 15 23:14:46 2007 # CONFIG_X86_32=y CONFIG_SEMAPHORE_SLEEPERS=y @@ -646,14 +646,16 @@ CONFIG_CONNECTOR=m # CONFIG_MTD=m # CONFIG_MTD_DEBUG is not set -# CONFIG_MTD_CONCAT is not set -# CONFIG_MTD_PARTITIONS is not set +CONFIG_MTD_CONCAT=m +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y # # User Modules And Translation Layers # -# CONFIG_MTD_CHAR is not set -# CONFIG_MTD_BLOCK is not set +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLOCK=m # CONFIG_MTD_BLOCK_RO is not set # CONFIG_FTL is not set # CONFIG_NFTL is not set diff --git a/config/kernel/kernel.config.i586.smp b/config/kernel/kernel.config.i586.smp index 2ffd85db05..43d0ff11f7 100644 --- a/config/kernel/kernel.config.i586.smp +++ b/config/kernel/kernel.config.i586.smp @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16.50-ipfire -# Sun Jun 17 18:22:41 2007 +# Sun Jul 15 23:15:28 2007 # CONFIG_X86_32=y CONFIG_SEMAPHORE_SLEEPERS=y @@ -652,14 +652,16 @@ CONFIG_CONNECTOR=m # CONFIG_MTD=m # CONFIG_MTD_DEBUG is not set -# CONFIG_MTD_CONCAT is not set -# CONFIG_MTD_PARTITIONS is not set +CONFIG_MTD_CONCAT=m +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y # # User Modules And Translation Layers # -# CONFIG_MTD_CHAR is not set -# CONFIG_MTD_BLOCK is not set +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLOCK=m # CONFIG_MTD_BLOCK_RO is not set # CONFIG_FTL is not set # CONFIG_NFTL is not set diff --git a/config/uClibc/buildroot.config-i586 b/config/uClibc/buildroot.config-i586 deleted file mode 100644 index dc4a8fef70..0000000000 --- a/config/uClibc/buildroot.config-i586 +++ /dev/null @@ -1,335 +0,0 @@ -# -# Automatically generated make config: don't edit -# -BR2_HAVE_DOT_CONFIG=y -# BR2_alpha is not set -# BR2_arm is not set -# BR2_armeb is not set -# BR2_cris is not set -BR2_i386=y -# 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_sh is not set -# BR2_sh64 is not set -# BR2_sparc is not set -# BR2_x86_64 is not set -# BR2_x86_i386 is not set -# BR2_x86_i486 is not set -BR2_x86_i586=y -# BR2_x86_i686 is not set -BR2_ARCH="i586" -BR2_ENDIAN="LITTLE" - -# -# Build options -# -BR2_WGET="wget --passive-ftp" -BR2_SVN="svn co" -BR2_ZCAT="zcat" -BR2_TAR_OPTIONS="" -BR2_DL_DIR="/usr/src/cache" -BR2_SOURCEFORGE_MIRROR="easynews" -BR2_STAGING_DIR="/opt/i586-uClibc" -BR2_TOPDIR_PREFIX="" -BR2_TOPDIR_SUFFIX="" -BR2_GNU_BUILD_SUFFIX="pc-linux-gnu" -BR2_GNU_TARGET_SUFFIX="linux-uclibc" -BR2_JLEVEL=4 - -# -# Toolchain Options -# - -# -# Kernel Header Options -# -# BR2_KERNEL_HEADERS_2_4_25 is not set -# BR2_KERNEL_HEADERS_2_4_27 is not set -# BR2_KERNEL_HEADERS_2_4_29 is not set -# BR2_KERNEL_HEADERS_2_4_31 is not set -# BR2_KERNEL_HEADERS_2_6_9 is not set -# BR2_KERNEL_HEADERS_2_6_11 is not set -BR2_KERNEL_HEADERS_2_6_12=y -# BR2_KERNEL_HEADERS_2_6_18 is not set -BR2_DEFAULT_KERNEL_HEADERS="2.6.12" - -# -# uClibc Options -# -# BR2_UCLIBC_VERSION_SNAPSHOT is not set -BR2_ENABLE_LOCALE=y -# BR2_PTHREADS_NONE is not set -# BR2_PTHREADS is not set -BR2_PTHREADS_OLD=y -# BR2_PTHREADS_NATIVE is not set - -# -# Binutils Options -# -# BR2_BINUTILS_VERSION_2_14_90_0_8 is not set -# BR2_BINUTILS_VERSION_2_15 is not set -# BR2_BINUTILS_VERSION_2_15_94_0_2_2 is not set -BR2_BINUTILS_VERSION_2_16_1=y -# BR2_BINUTILS_VERSION_2_16_90_0_3 is not set -# BR2_BINUTILS_VERSION_2_16_91_0_5 is not set -# BR2_BINUTILS_VERSION_2_16_91_0_6 is not set -# BR2_BINUTILS_VERSION_2_16_91_0_7 is not set -# BR2_BINUTILS_VERSION_2_17 is not set -# BR2_BINUTILS_VERSION_2_17_50_0_2 is not set -# BR2_BINUTILS_VERSION_2_17_50_0_3 is not set -# BR2_BINUTILS_VERSION_2_17_50_0_4 is not set -# BR2_BINUTILS_VERSION_2_17_50_0_5 is not set -# BR2_BINUTILS_VERSION_2_17_50_0_6 is not set -BR2_BINUTILS_VERSION="2.16.1" -BR2_EXTRA_BINUTILS_CONFIG_OPTIONS="" - -# -# Gcc Options -# -# BR2_GCC_VERSION_3_3_5 is not set -# BR2_GCC_VERSION_3_3_6 is not set -# BR2_GCC_VERSION_3_4_2 is not set -# BR2_GCC_VERSION_3_4_3 is not set -# BR2_GCC_VERSION_3_4_4 is not set -# BR2_GCC_VERSION_3_4_5 is not set -# BR2_GCC_VERSION_3_4_6 is not set -# BR2_GCC_VERSION_4_0_0 is not set -# BR2_GCC_VERSION_4_0_1 is not set -# BR2_GCC_VERSION_4_0_2 is not set -BR2_GCC_VERSION_4_0_3=y -# BR2_GCC_VERSION_4_1_0 is not set -# BR2_GCC_VERSION_4_1_1 is not set -# BR2_GCC_VERSION_4_2 is not set -# BR2_GCC_IS_SNAP is not set -BR2_GCC_VERSION="4.0.3" -# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set -BR2_EXTRA_GCC_CONFIG_OPTIONS="" -# BR2_INSTALL_LIBSTDCPP is not set -# BR2_INSTALL_OBJC is not set -BR2_GCC_SHARED_LIBGCC=y - -# -# Ccache Options -# -# BR2_CCACHE is not set - -# -# Gdb Options -# -# BR2_PACKAGE_GDB is not set -# BR2_PACKAGE_GDB_SERVER is not set -# BR2_PACKAGE_GDB_HOST is not set - -# -# elf2flt -# -# BR2_ELF2FLT is not set -# BR2_MKLIBS is not set - -# -# Common Toolchain Options -# -# BR2_PACKAGE_SSTRIP_TARGET is not set -# BR2_PACKAGE_SSTRIP_HOST is not set -BR2_ENABLE_MULTILIB=y -BR2_LARGEFILE=y -BR2_TARGET_OPTIMIZATION="-Os -pipe" -BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y - -# -# Package Selection for the target -# - -# -# The default minimal system -# -# BR2_PACKAGE_BUSYBOX is not set - -# -# The minimum needed to build a uClibc development system -# -# BR2_PACKAGE_BASH is not set -# BR2_PACKAGE_BZIP2 is not set -# BR2_PACKAGE_COREUTILS is not set -# BR2_PACKAGE_DIFFUTILS is not set -# BR2_PACKAGE_ED is not set -# BR2_PACKAGE_FINDUTILS is not set -# BR2_PACKAGE_FLEX is not set -# BR2_PACKAGE_GAWK is not set -# BR2_PACKAGE_GCC_TARGET is not set -# BR2_PACKAGE_CCACHE_TARGET is not set -# BR2_PACKAGE_GREP is not set -# BR2_PACKAGE_MAKE is not set -# BR2_PACKAGE_PATCH is not set -# BR2_PACKAGE_SED is not set -# BR2_PACKAGE_TAR is not set - -# -# Other stuff -# -# BR2_PACKAGE_ACPID is not set -# BR2_PACKAGE_ASTERISK is not set -# BR2_PACKAGE_AT is not set -# BR2_PACKAGE_AUTOCONF is not set -# BR2_PACKAGE_AUTOMAKE is not set -# BR2_PACKAGE_BERKELEYDB is not set -# BR2_PACKAGE_BIND is not set -# BR2_PACKAGE_BISON is not set -# BR2_PACKAGE_BOA is not set -# BR2_PACKAGE_BRIDGE is not set -# BR2_PACKAGE_CUSTOMIZE is not set -# BR2_PACKAGE_ISC_DHCP is not set -# BR2_PACKAGE_DIALOG is not set -# BR2_PACKAGE_DIRECTFB is not set -# BR2_PACKAGE_DISTCC is not set -# BR2_PACKAGE_DM is not set -# BR2_PACKAGE_DMRAID is not set -# BR2_PACKAGE_DNSMASQ is not set -# BR2_PACKAGE_DROPBEAR is not set -# BR2_PACKAGE_ETHTOOL is not set -# BR2_PACKAGE_EXPAT is not set -# BR2_PACKAGE_E2FSPROGS is not set -# BR2_PACKAGE_FAKEROOT is not set -# BR2_PACKAGE_FILE is not set -# BR2_PACKAGE_FREETYPE is not set -# BR2_PACKAGE_GETTEXT is not set -# BR2_PACKAGE_LIBINTL is not set -# BR2_PACKAGE_GZIP is not set -# BR2_PACKAGE_HASERL is not set -# BR2_PACKAGE_HDPARM is not set -# BR2_PACKAGE_HOSTAP is not set -# BR2_PACKAGE_HOTPLUG is not set -# BR2_PACKAGE_IOSTAT is not set -# BR2_PACKAGE_IPROUTE2 is not set -# BR2_PACKAGE_IPSEC_TOOLS is not set -# BR2_PACKAGE_IPTABLES is not set -# BR2_PACKAGE_JPEG is not set -# BR2_PACKAGE_LESS is not set -# BR2_PACKAGE_LIBCGI is not set -# BR2_PACKAGE_LIBCGICC is not set -# BR2_PACKAGE_LIBELF is not set -# BR2_PACKAGE_LIBFLOAT is not set -# BR2_PACKAGE_LIBGLIB12 is not set -# BR2_PACKAGE_LIBMAD is not set -# BR2_PACKAGE_LIBPCAP is not set -# BR2_PACKAGE_LIBPNG is not set -# BR2_PACKAGE_LIBSYSFS is not set -# BR2_PACKAGE_LIBTOOL is not set -# BR2_PACKAGE_LIBUSB is not set -# BR2_PACKAGE_LIGHTTPD is not set -# BR2_PACKAGE_LINKS is not set -# BR2_PACKAGE_LRZSZ is not set -# BR2_PACKAGE_LSOF is not set -# BR2_PACKAGE_LTP-TESTSUITE is not set -# BR2_PACKAGE_LTT is not set -# BR2_PACKAGE_LVM2 is not set -# BR2_PACKAGE_LZO is not set -# BR2_PACKAGE_LZMA is not set -# BR2_PACKAGE_M4 is not set -# BR2_PACKAGE_MDADM is not set -# BR2_PACKAGE_MEMTESTER is not set -# BR2_PACKAGE_MICROCOM is not set -# BR2_PACKAGE_MICROPERL is not set -# BR2_PACKAGE_MICROWIN is not set -# BR2_PACKAGE_MKDOSFS is not set -# BR2_PACKAGE_MODULE_INIT_TOOLS is not set -# BR2_PACKAGE_MODUTILS is not set -# BR2_PACKAGE_MPG123 is not set -# BR2_PACKAGE_MROUTED is not set -# BR2_PACKAGE_MTD is not set -# BR2_PACKAGE_NANO is not set -# BR2_PACKAGE_NBD is not set -# BR2_PACKAGE_NCURSES is not set -# BR2_PACKAGE_NETKITBASE is not set -# BR2_PACKAGE_NETKITTELNET is not set -# BR2_PACKAGE_NETSNMP is not set -# BR2_PACKAGE_NEWT is not set -# BR2_PACKAGE_NTP is not set -# BR2_PACKAGE_OPENNTPD is not set -# BR2_PACKAGE_OPENSSH is not set -# BR2_PACKAGE_OPENSSL is not set -# BR2_PACKAGE_OPENVPN is not set -# BR2_PACKAGE_PCIUTILS is not set -# BR2_PACKAGE_PKGCONFIG is not set -# BR2_PACKAGE_PORTAGE is not set -# BR2_PACKAGE_PORTMAP is not set -# BR2_PACKAGE_PPPD is not set -# BR2_PACKAGE_PROCPS is not set -# BR2_PACKAGE_PSMISC is not set -# BR2_PACKAGE_PYTHON is not set -# BR2_PACKAGE_QTE is not set -BR2_QTE_TMAKE_VERSION="1.13" -# BR2_PACKAGE_RAIDTOOLS is not set -# BR2_READLINE is not set -# BR2_PACKAGE_RSYNC is not set -# BR2_PACKAGE_RUBY is not set -# BR2_PACKAGE_RXVT is not set -# BR2_PACKAGE_SDL is not set -# BR2_PACKAGE_SFDISK is not set -# BR2_PACKAGE_SLANG is not set -# BR2_PACKAGE_SMARTMONTOOLS is not set -# BR2_PACKAGE_SOCAT is not set -# BR2_PACKAGE_SQLITE is not set -# BR2_PACKAGE_STRACE is not set -# BR2_PACKAGE_SUDO is not set -# BR2_PACKAGE_SYSKLOGD is not set -# BR2_PACKAGE_SYSVINIT is not set -# BR2_PACKAGE_TCL is not set -# BR2_PACKAGE_TCPDUMP is not set -# BR2_PACKAGE_TFTPD is not set -# BR2_PACKAGE_THTTPD is not set -# BR2_PACKAGE_TINYLOGIN is not set -# BR2_PACKAGE_TINYX is not set -# BR2_PACKAGE_TN5250 is not set -# BR2_PACKAGE_TTCP is not set -# BR2_PACKAGE_UDEV is not set -# BR2_PACKAGE_UDHCP is not set -# BR2_PACKAGE_UEMACS is not set -# BR2_PACKAGE_USBUTILS is not set -# BR2_PACKAGE_UTIL-LINUX is not set -# BR2_PACKAGE_VALGRIND is not set -# BR2_PACKAGE_VTUN is not set -# BR2_PACKAGE_WGET is not set -# BR2_PACKAGE_WHICH is not set -# BR2_PACKAGE_WIPE is not set -# BR2_PACKAGE_WIRELESS_TOOLS is not set -# BR2_PACKAGE_XFSPROGS is not set -# BR2_PACKAGE_ZLIB is not set - -# -# Target Options -# - -# -# filesystem for target device -# -# BR2_TARGET_ROOTFS_CRAMFS is not set -# BR2_TARGET_ROOTFS_CLOOP is not set -# BR2_TARGET_ROOTFS_EXT2 is not set -# BR2_TARGET_ROOTFS_JFFS2 is not set -# BR2_TARGET_ROOTFS_SQUASHFS is not set -# BR2_TARGET_ROOTFS_TAR is not set -# BR2_TARGET_ROOTFS_ISO9660 is not set - -# -# bootloader for target device -# -# BR2_TARGET_GRUB is not set -# BR2_TARGET_SYSLINUX is not set - -# -# Board Support Options -# -# BR2_TARGET_SOEKRIS_NET4521 is not set -# BR2_TARGET_SOEKRIS_NET4801 is not set -# BR2_TARGET_VIA_EPIA_MII is not set - -# -# Generic System Support -# -# BR2_TARGET_GENERIC_ACCESS_POINT is not set -# BR2_TARGET_GENERIC_FIREWALL is not set -# BR2_TARGET_GENERIC_DEV_SYSTEM is not set diff --git a/config/uClibc/buildroot.config.cmd b/config/uClibc/buildroot.config.cmd deleted file mode 100644 index 9a10a0ed4c..0000000000 --- a/config/uClibc/buildroot.config.cmd +++ /dev/null @@ -1,183 +0,0 @@ -deps_config := \ - target/generic/Config.in \ - target/device/jp/Config.in \ - target/device/Sharp/Config.in \ - target/device/Via/Config.in \ - target/device/AMD/Config.in \ - target/device/Hitachi/Config.in \ - target/device/Soekris/Config.in \ - target/device/Config.in \ - target/powerpc/yaboot/Config.in \ - target/x86/syslinux/Config.in \ - target/x86/grub/Config.in \ - target/iso9660/Config.in \ - target/tar/Config.in \ - target/squashfs/Config.in \ - target/jffs2/Config.in \ - target/ext2/Config.in \ - target/cloop/Config.in \ - target/cramfs/Config.in \ - target/Config.in \ - package/zlib/Config.in \ - package/xorg/Config.in \ - package/xfsprogs/Config.in \ - package/wireless-tools/Config.in \ - package/wipe/Config.in \ - package/which/Config.in \ - package/wget/Config.in \ - package/vtun/Config.in \ - package/valgrind/Config.in \ - package/util-linux/Config.in \ - package/usbutils/Config.in \ - package/uemacs/Config.in \ - package/udhcp/Config.in \ - package/udev/Config.in \ - package/ttcp/Config.in \ - package/tn5250/Config.in \ - package/tinyx/Config.in \ - package/tinylogin/Config.in \ - package/thttpd/Config.in \ - package/tftpd/Config.in \ - package/tcpdump/Config.in \ - package/tcl/Config.in \ - package/sysvinit/Config.in \ - package/sysklogd/Config.in \ - package/sudo/Config.in \ - package/strace/Config.in \ - package/sqlite/Config.in \ - package/socat/Config.in \ - package/smartmontools/Config.in \ - package/slang/Config.in \ - package/sfdisk/Config.in \ - package/sdl/Config.in \ - package/rxvt/Config.in \ - package/ruby/Config.in \ - package/rsync/Config.in \ - package/readline/Config.in \ - package/raidtools/Config.in \ - package/qte/Config.in \ - package/python/Config.in \ - package/psmisc/Config.in \ - package/procps/Config.in \ - package/pppd/Config.in \ - package/portmap/Config.in \ - package/portage/Config.in \ - package/pkgconfig/Config.in \ - package/pcmcia/Config.in \ - package/pciutils/Config.in \ - package/openvpn/Config.in \ - package/openssl/Config.in \ - package/openssh/Config.in \ - package/openntpd/Config.in \ - package/ntp/Config.in \ - package/newt/Config.in \ - package/netsnmp/Config.in \ - package/netkittelnet/Config.in \ - package/netkitbase/Config.in \ - package/ncurses/Config.in \ - package/nbd/Config.in \ - package/nano/Config.in \ - package/mtd/Config.in \ - package/mrouted/Config.in \ - package/mpg123/Config.in \ - package/modutils/Config.in \ - package/module-init-tools/Config.in \ - package/mkdosfs/Config.in \ - package/microwin/Config.in \ - package/microperl/Config.in \ - package/microcom/Config.in \ - package/memtester/Config.in \ - package/mdadm/Config.in \ - package/m4/Config.in \ - package/lzma/Config.in \ - package/lzo/Config.in \ - package/lvm2/Config.in \ - package/ltt/Config.in \ - package/ltrace/Config.in \ - package/ltp-testsuite/Config.in \ - package/lsof/Config.in \ - package/lrzsz/Config.in \ - package/links/Config.in \ - package/lighttpd/Config.in \ - package/libusb/Config.in \ - package/libtool/Config.in \ - package/libsysfs/Config.in \ - package/libpng/Config.in \ - package/libpcap/Config.in \ - package/libmad/Config.in \ - package/libgtk12/Config.in \ - package/libglib12/Config.in \ - package/libfloat/Config.in \ - package/libelf/Config.in \ - package/libcgicc/Config.in \ - package/libcgi/Config.in \ - package/less/Config.in \ - package/jpeg/Config.in \ - package/iptables/Config.in \ - package/ipsec-tools/Config.in \ - package/iproute2/Config.in \ - package/iostat/Config.in \ - package/hotplug/Config.in \ - package/hostap/Config.in \ - package/hdparm/Config.in \ - package/haserl/Config.in \ - package/gzip/Config.in \ - package/gettext/Config.in \ - package/freetype/Config.in \ - package/file/Config.in \ - package/fakeroot/Config.in \ - package/e2fsprogs/Config.in \ - package/expat/Config.in \ - package/ethtool/Config.in \ - package/dropbear/Config.in \ - package/dnsmasq/Config.in \ - package/dmraid/Config.in \ - package/dm/Config.in \ - package/distcc/Config.in \ - package/directfb/Config.in \ - package/dillo/Config.in \ - package/dialog/Config.in \ - package/dhcp/Config.in \ - package/customize/Config.in \ - package/bridge/Config.in \ - package/boa/Config.in \ - package/bison/Config.in \ - package/bind/Config.in \ - package/berkeleydb/Config.in \ - package/automake/Config.in \ - package/autoconf/Config.in \ - package/at/Config.in \ - package/asterisk/Config.in \ - package/acpid/Config.in \ - package/tar/Config.in \ - package/sed/Config.in \ - package/patch/Config.in \ - package/make/Config.in \ - package/grep/Config.in \ - toolchain/ccache/Config.in.2 \ - toolchain/gcc/Config.in.2 \ - package/gawk/Config.in \ - package/flex/Config.in \ - package/findutils/Config.in \ - package/ed/Config.in \ - package/diffutils/Config.in \ - package/coreutils/Config.in \ - package/bzip2/Config.in \ - package/bash/Config.in \ - package/busybox/Config.in \ - package/Config.in \ - toolchain/sstrip/Config.in \ - toolchain/mklibs/Config.in \ - toolchain/elf2flt/Config.in \ - toolchain/gdb/Config.in \ - toolchain/ccache/Config.in \ - toolchain/gcc/Config.in \ - toolchain/binutils/Config.in \ - toolchain/uClibc/Config.in \ - toolchain/kernel-headers/Config.in \ - toolchain/Config.in \ - Config.in - -.config include/config.h: $(deps_config) - -$(deps_config): diff --git a/config/uClibc/busybox.config b/config/uClibc/busybox.config index 63c0ed10c4..aa880abe7f 100644 --- a/config/uClibc/busybox.config +++ b/config/uClibc/busybox.config @@ -286,16 +286,16 @@ CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y # # Finding Utilities # -# CONFIG_FIND is not set -# CONFIG_FEATURE_FIND_PRINT0 is not set -# CONFIG_FEATURE_FIND_MTIME is not set -# CONFIG_FEATURE_FIND_MMIN is not set -# CONFIG_FEATURE_FIND_PERM is not set -# CONFIG_FEATURE_FIND_TYPE is not set -# CONFIG_FEATURE_FIND_XDEV is not set -# CONFIG_FEATURE_FIND_NEWER is not set -# CONFIG_FEATURE_FIND_INUM is not set -# CONFIG_FEATURE_FIND_EXEC is not set +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_NEWER=y +CONFIG_FEATURE_FIND_INUM=y +CONFIG_FEATURE_FIND_EXEC=y CONFIG_GREP=y CONFIG_FEATURE_GREP_EGREP_ALIAS=y CONFIG_FEATURE_GREP_FGREP_ALIAS=y @@ -402,7 +402,7 @@ CONFIG_FEATURE_FDISK_WRITABLE=y # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set # CONFIG_IPCRM is not set # CONFIG_IPCS is not set -# CONFIG_LOSETUP is not set +CONFIG_LOSETUP=y # CONFIG_MDEV is not set # CONFIG_FEATURE_MDEV_CONF is not set # CONFIG_FEATURE_MDEV_EXEC is not set diff --git a/lfs/uClibc b/lfs/uClibc index 166e1aa5ce..ebd67457ef 100644 --- a/lfs/uClibc +++ b/lfs/uClibc @@ -48,14 +48,12 @@ STAGING_DIR=/opt/$(MACHINE)-uClibc # Top-level Rules ############################################################################### -objects = $(DL_FILE) buildroot-snapshot-20061026.tar.bz2 uClibc-locale-030818.tgz +objects = $(DL_FILE) uClibc-locale-030818.tgz $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -buildroot-snapshot-20061026.tar.bz2 = $(DL_FROM)/buildroot-snapshot-20061026.tar.bz2 uClibc-locale-030818.tgz = $(DL_FROM)/uClibc-locale-030818.tgz $(DL_FILE)_MD5 = 1ada58d919a82561061e4741fb6abd29 -buildroot-snapshot-20061026.tar.bz2_MD5 = ecc5d48a780e46a56d1d39207d5868bd uClibc-locale-030818.tgz_MD5 = d75b2239b4e27c3c9cbed1c8f6eabba6 install : $(TARGET) diff --git a/make.sh b/make.sh index b2a714d135..a01e29c5f1 100755 --- a/make.sh +++ b/make.sh @@ -966,45 +966,41 @@ uploadsrc) exit 0 ;; upload) - case "$2" in - iso) - echo -e "Uploading the iso to $FTP_ISO_PATH/$SVN_REVISION." - cat < .ftp-commands + FTP_ISO_PORT=`echo "$FTP_ISO_URL" | awk -F: '{ print $2 }'` + FTP_ISO_URL=`echo "$FTP_ISO_URL" | awk -F: '{ print $1 }'` + if [ -z $FTP_ISO_PORT ]; then + FTP_ISO_PORT=21 + fi + cat < .ftp-commands mkdir -p $FTP_ISO_PATH$SVN_REVISION -ls -lah +mkdir -p $FTP_ISO_PATH$SVN_REVISION/paks quit EOF - ncftp -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL < .ftp-commands - rm -f .ftp-commands + ncftp -u $FTP_ISO_USER -p $FTP_ISO_PASS -P $FTP_ISO_PORT $FTP_ISO_URL < .ftp-commands + rm -f .ftp-commands + + case "$2" in + iso) + echo -e "Uploading the iso to $FTP_ISO_PATH/$SVN_REVISION." + md5sum ipfire-$VERSION.$MACHINE-full.iso > ipfire-$VERSION.$MACHINE-full.iso.md5 - ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/ ipfire-$VERSION.$MACHINE-full.iso - ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/ ipfire-$VERSION.$MACHINE-full.iso.md5 - if [ -e ipfire-$VERSION.$MACHINE-devel.iso ]; then - md5sum ipfire-$VERSION.$MACHINE-devel.iso > ipfire-$VERSION.$MACHINE-devel.iso.md5 - ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/ ipfire-$VERSION.$MACHINE-devel.iso - ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/ ipfire-$VERSION.$MACHINE-devel.iso.md5 - fi - ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/ ipfire-source-r$SVN_REVISION.tar.gz - ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/ svn_status - if [ "$?" -eq "0" ]; then - echo -e "The iso of Revision $SVN_REVISION was successfully uploaded to $FTP_ISO_URL$FTP_ISO_PATH$SVN_REVISION/." - else - echo -e "There was an error while uploading the iso to the ftp server." - exit 1 - fi + for i in "svn_status ipfire-source-r$SVN_REVISION.tar.gz ipfire-$VERSION.$MACHINE-full.iso ipfire-$VERSION.$MACHINE-full.iso.md5 ipfire-$VERSION.$MACHINE-devel.iso ipfire-$VERSION.$MACHINE-devel.iso.md5"; do + #if [ -e "$i" ]; then + ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS -P $FTP_ISO_PORT $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/ $i + if [ "$?" -eq "0" ]; then + echo "The file with name $i was successfully uploaded to $FTP_ISO_URL$FTP_ISO_PATH$SVN_REVISION/." + else + echo "There was an error while uploading the file $i to the ftp server." + exit 1 + fi + #fi + done if [ "$3" = "--with-sources-cd" ]; then - ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH/$SVN_REVISION/ ipfire-sources-cd-$VERSION.$MACHINE.iso + ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS -P $FTP_ISO_PORT $FTP_ISO_URL $FTP_ISO_PATH/$SVN_REVISION/ ipfire-sources-cd-$VERSION.$MACHINE.iso fi ;; paks) - cat < .ftp-commands -mkdir -p $FTP_ISO_PATH$SVN_REVISION/paks -ls -lah -quit -EOF - ncftp -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL < .ftp-commands - rm -f .ftp-commands - ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/paks packages/* + ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS -P $FTP_ISO_PORT $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/paks packages/* if [ "$?" -eq "0" ]; then echo -e "The packages were successfully uploaded to $FTP_ISO_URL$FTP_ISO_PATH$SVN_REVISION/." else -- 2.39.2