mirror of
https://github.com/FOGProject/fos.git
synced 2026-04-28 08:09:12 -05:00
Fix buildroot configs.
This commit is contained in:
2
build.sh
2
build.sh
@@ -128,7 +128,7 @@ deps="subversion git mercurial meld build-essential rsync libncurses-dev gcc-mul
|
||||
echo -n "Please wait while we check your and or install dependencies........"
|
||||
apt-get install $deps -y > /dev/null
|
||||
echo "Done"
|
||||
echo "Preparing the build environment please wait........"
|
||||
echo "# Preparing the build environment please wait #"
|
||||
[[ ! -f "arch" ]] && echo $arch > arch
|
||||
currentArch=$(cat arch)
|
||||
if [[ $buildFS == 'y' ]]; then
|
||||
|
||||
@@ -7,11 +7,7 @@ BR2_HOST_GCC_AT_LEAST_4_6=y
|
||||
BR2_HOST_GCC_AT_LEAST_4_7=y
|
||||
BR2_HOST_GCC_AT_LEAST_4_8=y
|
||||
BR2_HOST_GCC_AT_LEAST_4_9=y
|
||||
<<<<<<< HEAD:configs/fsx64.config
|
||||
BR2_HOST_GCC_AT_LEAST_5=y
|
||||
=======
|
||||
BR2_HOSTARCH_NEEDS_IA32_COMPILER=y
|
||||
>>>>>>> origin/master:buildroot/.config
|
||||
|
||||
#
|
||||
# Target options
|
||||
@@ -97,10 +93,7 @@ BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
|
||||
BR2_LUAROCKS_MIRROR="http://rocks.moonscript.org"
|
||||
BR2_CPAN_MIRROR="http://cpan.metacpan.org"
|
||||
BR2_JLEVEL=0
|
||||
BR2_CCACHE=y
|
||||
BR2_CCACHE_DIR="$(HOME)/.buildroot-ccache"
|
||||
BR2_CCACHE_INITIAL_SETUP=""
|
||||
BR2_CCACHE_USE_BASEDIR=y
|
||||
# BR2_CCACHE is not set
|
||||
# BR2_DEPRECATED is not set
|
||||
# BR2_ENABLE_DEBUG is not set
|
||||
BR2_STRIP_strip=y
|
||||
@@ -158,13 +151,8 @@ BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
|
||||
BR2_TOOLCHAIN_BUILDROOT_LIBC="glibc"
|
||||
BR2_PACKAGE_LINUX_HEADERS=y
|
||||
BR2_PACKAGE_GLIBC=y
|
||||
<<<<<<< HEAD:configs/fsx64.config
|
||||
BR2_GLIBC_VERSION_2_22=y
|
||||
# BR2_GLIBC_VERSION_2_23 is not set
|
||||
=======
|
||||
# BR2_GLIBC_VERSION_2_21 is not set
|
||||
BR2_GLIBC_VERSION_2_22=y
|
||||
>>>>>>> origin/master:buildroot/.config
|
||||
BR2_GLIBC_VERSION_STRING="2.22"
|
||||
|
||||
#
|
||||
@@ -173,10 +161,7 @@ BR2_GLIBC_VERSION_STRING="2.22"
|
||||
# BR2_BINUTILS_VERSION_2_23_X is not set
|
||||
# BR2_BINUTILS_VERSION_2_24_X is not set
|
||||
BR2_BINUTILS_VERSION_2_25_X=y
|
||||
<<<<<<< HEAD:configs/fsx64.config
|
||||
# BR2_BINUTILS_VERSION_2_26_X is not set
|
||||
=======
|
||||
>>>>>>> origin/master:buildroot/.config
|
||||
BR2_BINUTILS_VERSION="2.25.1"
|
||||
BR2_BINUTILS_EXTRA_CONFIG_OPTIONS=""
|
||||
|
||||
@@ -186,16 +171,11 @@ BR2_BINUTILS_EXTRA_CONFIG_OPTIONS=""
|
||||
BR2_GCC_NEEDS_MPC=y
|
||||
BR2_GCC_SUPPORTS_GRAPHITE=y
|
||||
# BR2_GCC_VERSION_4_8_X is not set
|
||||
<<<<<<< HEAD:configs/fsx64.config
|
||||
BR2_GCC_VERSION_4_9_X=y
|
||||
# BR2_GCC_VERSION_5_X is not set
|
||||
# BR2_GCC_VERSION_6_X is not set
|
||||
=======
|
||||
# BR2_GCC_VERSION_4_9_X is not set
|
||||
BR2_GCC_VERSION_5_X=y
|
||||
>>>>>>> origin/master:buildroot/.config
|
||||
BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
|
||||
BR2_GCC_VERSION="5.3.0"
|
||||
BR2_GCC_VERSION="4.9.3"
|
||||
BR2_EXTRA_GCC_CONFIG_OPTIONS=""
|
||||
BR2_TOOLCHAIN_BUILDROOT_CXX=y
|
||||
# BR2_TOOLCHAIN_BUILDROOT_FORTRAN is not set
|
||||
@@ -213,16 +193,11 @@ BR2_TOOLCHAIN_HAS_THREADS_DEBUG=y
|
||||
BR2_TOOLCHAIN_HAS_THREADS_NPTL=y
|
||||
BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS=y
|
||||
BR2_TOOLCHAIN_HAS_SSP=y
|
||||
<<<<<<< HEAD:configs/fsx64.config
|
||||
# BR2_ENABLE_LOCALE_PURGE is not set
|
||||
=======
|
||||
BR2_ENABLE_LOCALE_PURGE=y
|
||||
BR2_ENABLE_LOCALE_WHITELIST="en_US"
|
||||
>>>>>>> origin/master:buildroot/.config
|
||||
BR2_GENERATE_LOCALE=""
|
||||
# BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY is not set
|
||||
BR2_USE_MMU=y
|
||||
BR2_TARGET_OPTIMIZATION="-Os -pipe"
|
||||
BR2_TARGET_OPTIMIZATION=""
|
||||
BR2_TARGET_LDFLAGS=""
|
||||
# BR2_ECLIPSE_REGISTER is not set
|
||||
BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0=y
|
||||
@@ -259,8 +234,7 @@ BR2_TOOLCHAIN_GCC_AT_LEAST_4_6=y
|
||||
BR2_TOOLCHAIN_GCC_AT_LEAST_4_7=y
|
||||
BR2_TOOLCHAIN_GCC_AT_LEAST_4_8=y
|
||||
BR2_TOOLCHAIN_GCC_AT_LEAST_4_9=y
|
||||
BR2_TOOLCHAIN_GCC_AT_LEAST_5=y
|
||||
BR2_TOOLCHAIN_GCC_AT_LEAST="5"
|
||||
BR2_TOOLCHAIN_GCC_AT_LEAST="4.9"
|
||||
BR2_TOOLCHAIN_HAS_SYNC_1=y
|
||||
BR2_TOOLCHAIN_HAS_SYNC_2=y
|
||||
BR2_TOOLCHAIN_HAS_SYNC_4=y
|
||||
@@ -309,62 +283,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT=""
|
||||
#
|
||||
# Kernel
|
||||
#
|
||||
<<<<<<< HEAD:configs/fsx64.config
|
||||
# BR2_LINUX_KERNEL is not set
|
||||
=======
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_LATEST_VERSION=y
|
||||
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
|
||||
# BR2_LINUX_KERNEL_CUSTOM_TARBALL is not set
|
||||
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
|
||||
# BR2_LINUX_KERNEL_CUSTOM_HG is not set
|
||||
# BR2_LINUX_KERNEL_CUSTOM_LOCAL is not set
|
||||
BR2_LINUX_KERNEL_VERSION="4.4.3"
|
||||
BR2_LINUX_KERNEL_PATCH=""
|
||||
BR2_LINUX_KERNEL_USE_DEFCONFIG=y
|
||||
# BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG is not set
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="x86_64"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES=""
|
||||
BR2_LINUX_KERNEL_BZIMAGE=y
|
||||
# BR2_LINUX_KERNEL_VMLINUX is not set
|
||||
# BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM is not set
|
||||
BR2_LINUX_KERNEL_GZIP=y
|
||||
# BR2_LINUX_KERNEL_LZ4 is not set
|
||||
# BR2_LINUX_KERNEL_LZMA is not set
|
||||
# BR2_LINUX_KERNEL_LZO is not set
|
||||
# BR2_LINUX_KERNEL_XZ is not set
|
||||
# BR2_LINUX_KERNEL_DTS_SUPPORT is not set
|
||||
|
||||
#
|
||||
# Linux Kernel Extensions
|
||||
#
|
||||
# BR2_LINUX_KERNEL_EXT_XENOMAI is not set
|
||||
# BR2_LINUX_KERNEL_EXT_RTAI is not set
|
||||
# BR2_LINUX_KERNEL_EXT_FBTFT is not set
|
||||
|
||||
#
|
||||
# Linux Kernel Tools
|
||||
#
|
||||
BR2_LINUX_KERNEL_TOOL_CPUPOWER=y
|
||||
# BR2_LINUX_KERNEL_TOOL_PERF is not set
|
||||
|
||||
#
|
||||
# Packages for FOG
|
||||
#
|
||||
BR2_PACKAGE_CHNTPW=y
|
||||
# BR2_PACKAGE_EFIBOOTMGR is not set
|
||||
BR2_PACKAGE_FOG=y
|
||||
BR2_PACKAGE_PARTCLONE=y
|
||||
|
||||
#
|
||||
# partclone requires a toolchain with LARGEFILE+WCHAR support
|
||||
#
|
||||
BR2_PACKAGE_PIGZ=y
|
||||
BR2_PACKAGE_TESTDISK=y
|
||||
BR2_PACKAGE_CABEXTRACT=y
|
||||
BR2_PACKAGE_LIBMSPACK=y
|
||||
BR2_PACKAGE_FOGSPLASH=y
|
||||
>>>>>>> origin/master:buildroot/.config
|
||||
|
||||
#
|
||||
# Target packages
|
||||
@@ -2287,52 +2206,10 @@ BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS=y
|
||||
# BR2_PACKAGE_UNSCD is not set
|
||||
BR2_PACKAGE_UTIL_LINUX=y
|
||||
BR2_PACKAGE_UTIL_LINUX_LIBBLKID=y
|
||||
BR2_PACKAGE_UTIL_LINUX_LIBMOUNT=y
|
||||
BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS=y
|
||||
# BR2_PACKAGE_UTIL_LINUX_LIBMOUNT is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS is not set
|
||||
BR2_PACKAGE_UTIL_LINUX_LIBUUID=y
|
||||
BR2_PACKAGE_UTIL_LINUX_BINARIES=y
|
||||
# BR2_PACKAGE_UTIL_LINUX_AGETTY is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_BFS is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_CHFN_CHSH is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_CRAMFS is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_EJECT is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_FALLOCATE is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_FDFORMAT is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_FINDFS is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_FSCK is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_HWCLOCK is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_KILL is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_LAST is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_LINE is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_LOSETUP is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_MESG is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_MINIX is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_MORE is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_MOUNT is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_NEWGRP is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_NOLOGIN is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_NSENTER is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_PARTX is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_RAW is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_RENAME is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_RESET is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_SETPRIV is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_SETTERM is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_TUNELP is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_UL is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_UNSHARE is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_UTMPDUMP is not set
|
||||
BR2_PACKAGE_UTIL_LINUX_UUIDD=y
|
||||
# BR2_PACKAGE_UTIL_LINUX_VIPW is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_WALL is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_WDCTL is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_WRITE is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_ZRAMCTL is not set
|
||||
# BR2_PACKAGE_UTIL_LINUX_BINARIES is not set
|
||||
|
||||
#
|
||||
# Text editors and viewers
|
||||
@@ -2395,7 +2272,6 @@ BR2_TARGET_ROOTFS_EXT2_RESBLKS=0
|
||||
# BR2_TARGET_ROOTFS_EXT2_LZMA is not set
|
||||
# BR2_TARGET_ROOTFS_EXT2_LZO is not set
|
||||
BR2_TARGET_ROOTFS_EXT2_XZ=y
|
||||
<<<<<<< HEAD:configs/fsx64.config
|
||||
|
||||
#
|
||||
# initramfs needs a Linux kernel to be built
|
||||
@@ -2408,24 +2284,6 @@ BR2_TARGET_ROOTFS_EXT2_XZ=y
|
||||
# BR2_TARGET_ROOTFS_ROMFS is not set
|
||||
# BR2_TARGET_ROOTFS_SQUASHFS is not set
|
||||
# BR2_TARGET_ROOTFS_TAR is not set
|
||||
=======
|
||||
BR2_TARGET_ROOTFS_INITRAMFS=y
|
||||
BR2_TARGET_ROOTFS_ISO9660=y
|
||||
BR2_TARGET_ROOTFS_ISO9660_GRUB=y
|
||||
BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="fs/iso9660/menu.lst"
|
||||
# BR2_TARGET_ROOTFS_ISO9660_INITRD is not set
|
||||
# BR2_TARGET_ROOTFS_JFFS2 is not set
|
||||
# BR2_TARGET_ROOTFS_ROMFS is not set
|
||||
# BR2_TARGET_ROOTFS_SQUASHFS is not set
|
||||
BR2_TARGET_ROOTFS_TAR=y
|
||||
# BR2_TARGET_ROOTFS_TAR_NONE is not set
|
||||
# BR2_TARGET_ROOTFS_TAR_GZIP is not set
|
||||
# BR2_TARGET_ROOTFS_TAR_BZIP2 is not set
|
||||
# BR2_TARGET_ROOTFS_TAR_LZMA is not set
|
||||
# BR2_TARGET_ROOTFS_TAR_LZO is not set
|
||||
BR2_TARGET_ROOTFS_TAR_XZ=y
|
||||
BR2_TARGET_ROOTFS_TAR_OPTIONS=""
|
||||
>>>>>>> origin/master:buildroot/.config
|
||||
# BR2_TARGET_ROOTFS_UBIFS is not set
|
||||
# BR2_TARGET_ROOTFS_YAFFS2 is not set
|
||||
|
||||
@@ -2471,7 +2329,7 @@ BR2_PACKAGE_HOST_MKE2IMG=y
|
||||
# BR2_PACKAGE_HOST_SAM_BA is not set
|
||||
# BR2_PACKAGE_HOST_SQUASHFS is not set
|
||||
# BR2_PACKAGE_HOST_UBOOT_TOOLS is not set
|
||||
BR2_PACKAGE_HOST_UTIL_LINUX=y
|
||||
# BR2_PACKAGE_HOST_UTIL_LINUX is not set
|
||||
# BR2_PACKAGE_HOST_VBOOT_UTILS is not set
|
||||
# BR2_PACKAGE_HOST_XORRISO is not set
|
||||
# BR2_PACKAGE_HOST_ZIP is not set
|
||||
|
||||
1971
configs/fsx86.config
1971
configs/fsx86.config
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user