From 9d66d166419add1c59f48139a2f001867c2a8494 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sun, 6 Mar 2016 16:36:01 +0200 Subject: [PATCH] buildroot post-merge fixes --- board/bananapi/postscript.sh | 3 --- board/common/cleanups.sh | 17 ++++++++++++++--- board/common/overlay/etc/sshd_config | 1 - board/common/skeleton/etc/ld.so.conf.d/.empty | 0 board/cubietruck/postscript.sh | 3 --- board/odroidc1/postscript.sh | 3 --- board/odroidxu4/postscript.sh | 3 --- board/raspberrypi/postscript.sh | 3 --- board/raspberrypi3/postscript.sh | 3 --- configs/bananapi_defconfig | 5 ++--- configs/cubietruck_defconfig | 5 ++--- configs/odroidc1_defconfig | 3 --- configs/odroidxu4_defconfig | 1 - configs/raspberrypi2_defconfig | 5 +---- configs/raspberrypi_defconfig | 5 +---- 15 files changed, 20 insertions(+), 40 deletions(-) delete mode 100644 board/common/skeleton/etc/ld.so.conf.d/.empty diff --git a/board/bananapi/postscript.sh b/board/bananapi/postscript.sh index 74ae72aef5..7eecf8486a 100755 --- a/board/bananapi/postscript.sh +++ b/board/bananapi/postscript.sh @@ -2,9 +2,6 @@ UBOOT_HOST_DIR=$TARGET/../build/host-uboot-tools-* -# copy System.map -cp $TARGET/../build/linux-*/System.map $TARGET/System.map - cp $IMG_DIR/uImage $BOOT_DIR cp $IMG_DIR/sun7i-a20-bananapi.dtb $BOOT_DIR diff --git a/board/common/cleanups.sh b/board/common/cleanups.sh index 5eefaf0f2f..4a07abbb65 100755 --- a/board/common/cleanups.sh +++ b/board/common/cleanups.sh @@ -15,8 +15,9 @@ rm -rf $TARGET/etc/rc_keymaps/ rm -rf $TARGET/etc/default/ rm -rf $TARGET/etc/ctdb/ rm -rf $TARGET/etc/sudoers.d/ - -rm -rf $TARGET/data/* +rm -rf $TARGET/etc/ssl/man +rm -rf $TARGET/etc/ssl/misc +rm -rf $TARGET/etc/ssl/private rm -f $TARGET/etc/rc_maps.cfg rm -f $TARGET/etc/udev/hwdb.d/20-pci-vendor-model.hwdb @@ -31,7 +32,7 @@ rm -rf $TARGET/usr/share/ffmpeg/ rm -rf $TARGET/usr/share/perl5/ rm -rf $TARGET/usr/share/common-lisp/ -find $TARGET -name '*libmount*' | xargs rm -f +find $TARGET -name '*libmount*' | xargs rm -rf # various binaries rm -f $TARGET/bin/more @@ -40,6 +41,9 @@ rm -f $TARGET/usr/sbin/readprofile rm -f $TARGET/sbin/nologin rm -f $TARGET/bin/mountpoint rm -f $TARGET/sbin/ldattach +rm -f $TARGET/usr/sbin/ldattach +rm -f $TARGET/sbin/slattach +rm -f $TARGET/sbin/plipconfig rm -f $TARGET/sbin/fstrim rm -f $TARGET/usr/sbin/rtcwake rm -f $TARGET/bin/lsblk @@ -100,6 +104,9 @@ rm -f $TARGET/usr/bin/uuidgen rm -f $TARGET/usr/bin/getopt rm -f $TARGET/bin/isosize rm -f $TARGET/usr/sbin/fdformat +rm -f $TARGET/usr/bin/linux32 +rm -f $TARGET/usr/bin/linux64 +rm -f $TARGET/usr/bin/uname26 rm -f $TARGET/usr/bin/slogin rm -f $TARGET/usr/bin/ssh-keyscan @@ -109,6 +116,7 @@ rm -f $TARGET/usr/bin/ssh-agent rm -f $TARGET/usr/libexec/ssh-keysign rm -f $TARGET/usr/libexec/ssh-pkcs11-helper rm -f $TARGET/usr/libexec/rmt +rm -rf $TARGET/libexec # samba4 unneeded stuff rm -f $TARGET/usr/bin/cifsdd @@ -168,3 +176,6 @@ rm -f $TARGET/etc/init.d/S80dhcp-relay rm -f $TARGET/etc/init.d/S80dhcp-server rm -f $TARGET/etc/init.d/S91smb +# other unwanted dirs +rm -rf $TARGET/data/* + diff --git a/board/common/overlay/etc/sshd_config b/board/common/overlay/etc/sshd_config index b5657711d1..1cad32550a 100644 --- a/board/common/overlay/etc/sshd_config +++ b/board/common/overlay/etc/sshd_config @@ -1,7 +1,6 @@ Port 22 ListenAddress 0.0.0.0 -HostKey /data/etc/ssh_host_key HostKey /data/etc/ssh_host_rsa_key HostKey /data/etc/ssh_host_dsa_key HostKey /data/etc/ssh_host_ecdsa_key diff --git a/board/common/skeleton/etc/ld.so.conf.d/.empty b/board/common/skeleton/etc/ld.so.conf.d/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/board/cubietruck/postscript.sh b/board/cubietruck/postscript.sh index 0b19924fa1..cdea46c940 100755 --- a/board/cubietruck/postscript.sh +++ b/board/cubietruck/postscript.sh @@ -2,9 +2,6 @@ UBOOT_HOST_DIR=$TARGET/../build/host-uboot-tools-* -# copy System.map -cp $TARGET/../build/linux-*/System.map $TARGET/System.map - cp $IMG_DIR/uImage $BOOT_DIR cp $IMG_DIR/sun7i-a20-cubietruck.dtb $BOOT_DIR diff --git a/board/odroidc1/postscript.sh b/board/odroidc1/postscript.sh index 584b456363..bbea68cf37 100755 --- a/board/odroidc1/postscript.sh +++ b/board/odroidc1/postscript.sh @@ -1,8 +1,5 @@ #!/bin/sh -# copy System.map -cp $TARGET/../build/linux-*/System.map $TARGET/System.map - # boot directory mkdir -p $BOOT_DIR diff --git a/board/odroidxu4/postscript.sh b/board/odroidxu4/postscript.sh index 0a909ff13a..e1636023a3 100755 --- a/board/odroidxu4/postscript.sh +++ b/board/odroidxu4/postscript.sh @@ -1,8 +1,5 @@ #!/bin/sh -# copy System.map -cp $TARGET/../build/linux-*/System.map $TARGET/System.map - # boot directory mkdir -p $BOOT_DIR diff --git a/board/raspberrypi/postscript.sh b/board/raspberrypi/postscript.sh index b0678b4515..e1630585dd 100755 --- a/board/raspberrypi/postscript.sh +++ b/board/raspberrypi/postscript.sh @@ -2,9 +2,6 @@ RPI_FW_DIR=$TARGET/../images/rpi-firmware -# copy System.map -cp $TARGET/../build/linux-*/System.map $TARGET/System.map - cp $BOARD_DIR/config.txt $BOOT_DIR cp $BOARD_DIR/cmdline.txt $BOOT_DIR cp $BOARD_DIR/fwupdater.gz $BOOT_DIR diff --git a/board/raspberrypi3/postscript.sh b/board/raspberrypi3/postscript.sh index 44bc28289c..c76bfb264c 100755 --- a/board/raspberrypi3/postscript.sh +++ b/board/raspberrypi3/postscript.sh @@ -2,9 +2,6 @@ RPI_FW_DIR=$TARGET/../images/rpi-firmware -# copy System.map -cp $TARGET/../build/linux-*/System.map $TARGET/System.map - cp $BOARD_DIR/config.txt $BOOT_DIR cp $BOARD_DIR/cmdline.txt $BOOT_DIR cp $BOARD_DIR/fwupdater.gz $BOOT_DIR diff --git a/configs/bananapi_defconfig b/configs/bananapi_defconfig index 034f1f6e1d..334465e5c7 100644 --- a/configs/bananapi_defconfig +++ b/configs/bananapi_defconfig @@ -9,10 +9,10 @@ BR2_KERNEL_HEADERS_VERSION=y BR2_DEFAULT_KERNEL_VERSION="4.1.18" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y +BR2_GLIBC_VERSION_2_22=y BR2_BINUTILS_VERSION_2_25_X=y -BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-float=hard" BR2_TOOLCHAIN_BUILDROOT_CXX=y -BR2_TARGET_OPTIMIZATION="-pipe -mhard-float" +BR2_TARGET_OPTIMIZATION="-pipe" BR2_TARGET_GENERIC_HOSTNAME="" BR2_TARGET_GENERIC_ISSUE="" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y @@ -43,7 +43,6 @@ BR2_PACKAGE_GZIP=y BR2_PACKAGE_CIFS_UTILS=y # BR2_PACKAGE_E2FSPROGS_BADBLOCKS is not set # BR2_PACKAGE_E2FSPROGS_CHATTR is not set -BR2_PACKAGE_E2FSPROGS_DEBUGFS=y # BR2_PACKAGE_E2FSPROGS_DUMPE2FS is not set # BR2_PACKAGE_E2FSPROGS_E2FREEFRAG is not set # BR2_PACKAGE_E2FSPROGS_E2LABEL is not set diff --git a/configs/cubietruck_defconfig b/configs/cubietruck_defconfig index feb313e06b..3fa6259f4d 100644 --- a/configs/cubietruck_defconfig +++ b/configs/cubietruck_defconfig @@ -9,10 +9,10 @@ BR2_KERNEL_HEADERS_VERSION=y BR2_DEFAULT_KERNEL_VERSION="4.1.18" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y +BR2_GLIBC_VERSION_2_22=y BR2_BINUTILS_VERSION_2_25_X=y -BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-float=hard" BR2_TOOLCHAIN_BUILDROOT_CXX=y -BR2_TARGET_OPTIMIZATION="-pipe -mhard-float" +BR2_TARGET_OPTIMIZATION="-pipe" BR2_TARGET_GENERIC_HOSTNAME="" BR2_TARGET_GENERIC_ISSUE="" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y @@ -43,7 +43,6 @@ BR2_PACKAGE_GZIP=y BR2_PACKAGE_CIFS_UTILS=y # BR2_PACKAGE_E2FSPROGS_BADBLOCKS is not set # BR2_PACKAGE_E2FSPROGS_CHATTR is not set -BR2_PACKAGE_E2FSPROGS_DEBUGFS=y # BR2_PACKAGE_E2FSPROGS_DUMPE2FS is not set # BR2_PACKAGE_E2FSPROGS_E2FREEFRAG is not set # BR2_PACKAGE_E2FSPROGS_E2LABEL is not set diff --git a/configs/odroidc1_defconfig b/configs/odroidc1_defconfig index a71d82f44b..1910179b04 100644 --- a/configs/odroidc1_defconfig +++ b/configs/odroidc1_defconfig @@ -1,8 +1,6 @@ BR2_arm=y BR2_cortex_a5=y -BR2_ARM_EABIHF=y BR2_ARM_ENABLE_NEON=y -BR2_ARM_FPU_NEON_VFPV4=y BR2_DL_DIR="$(TOPDIR)/.download" BR2_CCACHE=y BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-odroidc1" @@ -37,7 +35,6 @@ BR2_PACKAGE_GZIP=y BR2_PACKAGE_CIFS_UTILS=y # BR2_PACKAGE_E2FSPROGS_BADBLOCKS is not set # BR2_PACKAGE_E2FSPROGS_CHATTR is not set -BR2_PACKAGE_E2FSPROGS_DEBUGFS=y # BR2_PACKAGE_E2FSPROGS_DUMPE2FS is not set # BR2_PACKAGE_E2FSPROGS_E2FREEFRAG is not set # BR2_PACKAGE_E2FSPROGS_E2LABEL is not set diff --git a/configs/odroidxu4_defconfig b/configs/odroidxu4_defconfig index 37cf3acbdd..f587ebea94 100644 --- a/configs/odroidxu4_defconfig +++ b/configs/odroidxu4_defconfig @@ -36,7 +36,6 @@ BR2_PACKAGE_GZIP=y BR2_PACKAGE_CIFS_UTILS=y # BR2_PACKAGE_E2FSPROGS_BADBLOCKS is not set # BR2_PACKAGE_E2FSPROGS_CHATTR is not set -BR2_PACKAGE_E2FSPROGS_DEBUGFS=y # BR2_PACKAGE_E2FSPROGS_DUMPE2FS is not set # BR2_PACKAGE_E2FSPROGS_E2FREEFRAG is not set # BR2_PACKAGE_E2FSPROGS_E2LABEL is not set diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig index b95120f8bf..354472db80 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -1,6 +1,5 @@ BR2_arm=y BR2_cortex_a7=y -BR2_ARM_EABIHF=y BR2_ARM_FPU_NEON_VFPV4=y BR2_DL_DIR="$(TOPDIR)/.download" BR2_CCACHE=y @@ -11,9 +10,8 @@ BR2_DEFAULT_KERNEL_VERSION="4.1.18" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_BINUTILS_VERSION_2_25_X=y -BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-float=hard" BR2_TOOLCHAIN_BUILDROOT_CXX=y -BR2_TARGET_OPTIMIZATION="-pipe -mhard-float" +BR2_TARGET_OPTIMIZATION="-pipe" BR2_TARGET_GENERIC_HOSTNAME="" BR2_TARGET_GENERIC_ISSUE="" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y @@ -43,7 +41,6 @@ BR2_PACKAGE_GZIP=y BR2_PACKAGE_CIFS_UTILS=y # BR2_PACKAGE_E2FSPROGS_BADBLOCKS is not set # BR2_PACKAGE_E2FSPROGS_CHATTR is not set -BR2_PACKAGE_E2FSPROGS_DEBUGFS=y # BR2_PACKAGE_E2FSPROGS_DUMPE2FS is not set # BR2_PACKAGE_E2FSPROGS_E2FREEFRAG is not set # BR2_PACKAGE_E2FSPROGS_E2LABEL is not set diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig index 5291ba1017..5ec6f8dc4b 100644 --- a/configs/raspberrypi_defconfig +++ b/configs/raspberrypi_defconfig @@ -1,6 +1,5 @@ BR2_arm=y BR2_arm1176jzf_s=y -BR2_ARM_EABIHF=y BR2_DL_DIR="$(TOPDIR)/.download" BR2_CCACHE=y BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-raspberrypi" @@ -10,9 +9,8 @@ BR2_DEFAULT_KERNEL_VERSION="4.1.18" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_BINUTILS_VERSION_2_25_X=y -BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-float=hard" BR2_TOOLCHAIN_BUILDROOT_CXX=y -BR2_TARGET_OPTIMIZATION="-pipe -mhard-float" +BR2_TARGET_OPTIMIZATION="-pipe" BR2_TARGET_GENERIC_HOSTNAME="" BR2_TARGET_GENERIC_ISSUE="" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y @@ -42,7 +40,6 @@ BR2_PACKAGE_GZIP=y BR2_PACKAGE_CIFS_UTILS=y # BR2_PACKAGE_E2FSPROGS_BADBLOCKS is not set # BR2_PACKAGE_E2FSPROGS_CHATTR is not set -BR2_PACKAGE_E2FSPROGS_DEBUGFS=y # BR2_PACKAGE_E2FSPROGS_DUMPE2FS is not set # BR2_PACKAGE_E2FSPROGS_E2FREEFRAG is not set # BR2_PACKAGE_E2FSPROGS_E2LABEL is not set