Code Review
/
packages
/
trusty
/
cirros-testvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix for file injection is broken on centos computes with Cirros images LP #1587960
[packages/trusty/cirros-testvm.git]
/
cirros-testvm
/
src-cirros
/
conf
/
buildroot-x86_64.config
diff --git
a/cirros-testvm/src-cirros/conf/buildroot-x86_64.config
b/cirros-testvm/src-cirros/conf/buildroot-x86_64.config
index 69a6418e478d78bd98cd9eb1ba6bc5de481cfa06..b53b0437287cda925001890afbf85ff5372ec7d6 100644
(file)
--- a/
cirros-testvm/src-cirros/conf/buildroot-x86_64.config
+++ b/
cirros-testvm/src-cirros/conf/buildroot-x86_64.config
@@
-1,6
+1,6
@@
#
# Automatically generated file; DO NOT EDIT.
#
# Automatically generated file; DO NOT EDIT.
-# Buildroot 2015.05 Configuration
+# Buildroot 2015.05 Configuration
Mirantis-modified
#
BR2_HAVE_DOT_CONFIG=y
#
BR2_HAVE_DOT_CONFIG=y
@@
-170,11
+170,11
@@
BR2_UCLIBC_TARGET_ARCH="x86_64"
#
# Binutils Options
#
#
# Binutils Options
#
-BR2_BINUTILS_VERSION_2_22=y
+# BR2_BINUTILS_VERSION_2_22 is not set
# BR2_BINUTILS_VERSION_2_23_2 is not set
# BR2_BINUTILS_VERSION_2_23_2 is not set
-# BR2_BINUTILS_VERSION_2_24 is not set
+BR2_BINUTILS_VERSION_2_24=y
# BR2_BINUTILS_VERSION_2_25 is not set
# BR2_BINUTILS_VERSION_2_25 is not set
-BR2_BINUTILS_VERSION="2.2
2
"
+BR2_BINUTILS_VERSION="2.2
4
"
BR2_BINUTILS_EXTRA_CONFIG_OPTIONS=""
#
BR2_BINUTILS_EXTRA_CONFIG_OPTIONS=""
#
@@
-252,12
+252,11
@@
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
BR2_ROOTFS_DEVICE_TABLE="system/device_table.txt"
BR2_ROOTFS_SKELETON_DEFAULT=y
# BR2_ROOTFS_SKELETON_CUSTOM is not set
BR2_ROOTFS_DEVICE_TABLE="system/device_table.txt"
BR2_ROOTFS_SKELETON_DEFAULT=y
# BR2_ROOTFS_SKELETON_CUSTOM is not set
-BR2_TARGET_GENERIC_ROOT_PASSWD=""
+BR2_TARGET_GENERIC_ROOT_PASSWD="
r00tme
"
BR2_SYSTEM_BIN_SH_BUSYBOX=y
BR2_SYSTEM_BIN_SH_BUSYBOX=y
-
-#
-# bash, dash, zsh need BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-#
+# BR2_SYSTEM_BIN_SH_BASH is not set
+# BR2_SYSTEM_BIN_SH_DASH is not set
+# BR2_SYSTEM_BIN_SH_ZSH is not set
# BR2_SYSTEM_BIN_SH_NONE is not set
BR2_SYSTEM_BIN_SH="/bin/busybox"
BR2_TARGET_GENERIC_GETTY=y
# BR2_SYSTEM_BIN_SH_NONE is not set
BR2_SYSTEM_BIN_SH="/bin/busybox"
BR2_TARGET_GENERIC_GETTY=y
@@
-293,7
+292,7
@@
BR2_ROOTFS_POST_IMAGE_SCRIPT=""
#
BR2_PACKAGE_BUSYBOX=y
BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-cirros.config"
#
BR2_PACKAGE_BUSYBOX=y
BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-cirros.config"
-# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
# BR2_PACKAGE_BUSYBOX_WATCHDOG is not set
#
# BR2_PACKAGE_BUSYBOX_WATCHDOG is not set
#
@@
-384,6
+383,7
@@
BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS=y
# Compressors and decompressors
#
# BR2_PACKAGE_BZIP2 is not set
# Compressors and decompressors
#
# BR2_PACKAGE_BZIP2 is not set
+# BR2_PACKAGE_GZIP is not set
# BR2_PACKAGE_INFOZIP is not set
# BR2_PACKAGE_LZ4 is not set
# BR2_PACKAGE_INFOZIP is not set
# BR2_PACKAGE_LZ4 is not set
@@
-431,6
+431,7
@@
BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS=y
#
# BR2_PACKAGE_LATENCYTOP is not set
# BR2_PACKAGE_LMBENCH is not set
#
# BR2_PACKAGE_LATENCYTOP is not set
# BR2_PACKAGE_LMBENCH is not set
+# BR2_PACKAGE_LSOF is not set
# BR2_PACKAGE_LTP_TESTSUITE is not set
# BR2_PACKAGE_LTRACE is not set
# BR2_PACKAGE_LTP_TESTSUITE is not set
# BR2_PACKAGE_LTRACE is not set
@@
-487,19
+488,26
@@
BR2_PACKAGE_CMAKE_ARCH_SUPPORTS=y
# cppunit needs a toolchain w/ C++, dynamic library
#
# BR2_PACKAGE_CVS is not set
# cppunit needs a toolchain w/ C++, dynamic library
#
# BR2_PACKAGE_CVS is not set
+# BR2_PACKAGE_DIFFUTILS is not set
+# BR2_PACKAGE_FINDUTILS is not set
# BR2_PACKAGE_FLEX is not set
# BR2_PACKAGE_FLEX is not set
+# BR2_PACKAGE_GAWK is not set
# BR2_PACKAGE_GETTEXT is not set
# BR2_PACKAGE_GIT is not set
#
# gperf needs a toolchain w/ C++
#
# BR2_PACKAGE_GETTEXT is not set
# BR2_PACKAGE_GIT is not set
#
# gperf needs a toolchain w/ C++
#
+# BR2_PACKAGE_GREP is not set
# BR2_PACKAGE_JQ is not set
# BR2_PACKAGE_LIBTOOL is not set
# BR2_PACKAGE_MAKE is not set
# BR2_PACKAGE_JQ is not set
# BR2_PACKAGE_LIBTOOL is not set
# BR2_PACKAGE_MAKE is not set
+# BR2_PACKAGE_PATCH is not set
# BR2_PACKAGE_PKGCONF is not set
# BR2_PACKAGE_PKGCONF is not set
+# BR2_PACKAGE_SED is not set
# BR2_PACKAGE_SSTRIP is not set
# BR2_PACKAGE_SUBVERSION is not set
# BR2_PACKAGE_SSTRIP is not set
# BR2_PACKAGE_SUBVERSION is not set
+# BR2_PACKAGE_TAR is not set
# BR2_PACKAGE_TREE is not set
# BR2_PACKAGE_YASM is not set
# BR2_PACKAGE_TREE is not set
# BR2_PACKAGE_YASM is not set
@@
-633,6
+641,7
@@
BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
#
# BR2_PACKAGE_FBDUMP is not set
# BR2_PACKAGE_FBGRAB is not set
#
# BR2_PACKAGE_FBDUMP is not set
# BR2_PACKAGE_FBGRAB is not set
+# BR2_PACKAGE_FBSET is not set
# BR2_PACKAGE_FB_TEST_APP is not set
#
# BR2_PACKAGE_FB_TEST_APP is not set
#
@@
-717,6
+726,7
@@
BR2_PACKAGE_QT5_JSCORE_AVAILABLE=y
# BR2_PACKAGE_CRYPTSETUP is not set
# BR2_PACKAGE_CWIID is not set
# BR2_PACKAGE_DBUS is not set
# BR2_PACKAGE_CRYPTSETUP is not set
# BR2_PACKAGE_CWIID is not set
# BR2_PACKAGE_DBUS is not set
+# BR2_PACKAGE_DEVMEM2 is not set
# BR2_PACKAGE_DMIDECODE is not set
# BR2_PACKAGE_DMRAID is not set
# BR2_PACKAGE_DTV_SCAN_TABLES is not set
# BR2_PACKAGE_DMIDECODE is not set
# BR2_PACKAGE_DMRAID is not set
# BR2_PACKAGE_DTV_SCAN_TABLES is not set
@@
-743,6
+753,7
@@
BR2_PACKAGE_QT5_JSCORE_AVAILABLE=y
# gptfdisk needs a toolchain w/ wchar, C++
#
# BR2_PACKAGE_GVFS is not set
# gptfdisk needs a toolchain w/ wchar, C++
#
# BR2_PACKAGE_GVFS is not set
+# BR2_PACKAGE_HDPARM is not set
# BR2_PACKAGE_HWDATA is not set
# BR2_PACKAGE_HWLOC is not set
# BR2_PACKAGE_I2C_TOOLS is not set
# BR2_PACKAGE_HWDATA is not set
# BR2_PACKAGE_HWLOC is not set
# BR2_PACKAGE_I2C_TOOLS is not set
@@
-1322,7
+1333,7
@@
BR2_PACKAGE_CURL=y
# libmemcached needs a toolchain w/ C++, threads
#
# BR2_PACKAGE_LIBMICROHTTPD is not set
# libmemcached needs a toolchain w/ C++, threads
#
# BR2_PACKAGE_LIBMICROHTTPD is not set
-# BR2_PACKAGE_LIBMNL is not set
+BR2_PACKAGE_LIBMNL=y
# BR2_PACKAGE_LIBMODBUS is not set
# BR2_PACKAGE_LIBNDP is not set
# BR2_PACKAGE_LIBNICE is not set
# BR2_PACKAGE_LIBMODBUS is not set
# BR2_PACKAGE_LIBNDP is not set
# BR2_PACKAGE_LIBNICE is not set
@@
-1338,7
+1349,7
@@
BR2_PACKAGE_CURL=y
# BR2_PACKAGE_LIBOAUTH is not set
# BR2_PACKAGE_LIBOPING is not set
# BR2_PACKAGE_LIBOSIP2 is not set
# BR2_PACKAGE_LIBOAUTH is not set
# BR2_PACKAGE_LIBOPING is not set
# BR2_PACKAGE_LIBOSIP2 is not set
-# BR2_PACKAGE_LIBPCAP is not set
+BR2_PACKAGE_LIBPCAP=y
# BR2_PACKAGE_LIBRSYNC is not set
# BR2_PACKAGE_LIBSHAIRPLAY is not set
# BR2_PACKAGE_LIBSHOUT is not set
# BR2_PACKAGE_LIBRSYNC is not set
# BR2_PACKAGE_LIBSHAIRPLAY is not set
# BR2_PACKAGE_LIBSHOUT is not set
@@
-1560,7
+1571,7
@@
BR2_PACKAGE_NCURSES=y
# BR2_PACKAGE_NEWT is not set
# BR2_PACKAGE_PCRE is not set
# BR2_PACKAGE_POPT is not set
# BR2_PACKAGE_NEWT is not set
# BR2_PACKAGE_PCRE is not set
# BR2_PACKAGE_POPT is not set
-# BR2_PACKAGE_READLINE is not set
+BR2_PACKAGE_READLINE=y
# BR2_PACKAGE_SLANG is not set
#
# BR2_PACKAGE_SLANG is not set
#
@@
-1627,7
+1638,7
@@
BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET=y
# BR2_PACKAGE_BLUEZ5_UTILS is not set
# BR2_PACKAGE_BMON is not set
# BR2_PACKAGE_BOA is not set
# BR2_PACKAGE_BLUEZ5_UTILS is not set
# BR2_PACKAGE_BMON is not set
# BR2_PACKAGE_BOA is not set
-# BR2_PACKAGE_BRIDGE_UTILS is not set
+BR2_PACKAGE_BRIDGE_UTILS=y
# BR2_PACKAGE_BWM_NG is not set
# BR2_PACKAGE_CAN_UTILS is not set
# BR2_PACKAGE_CHRONY is not set
# BR2_PACKAGE_BWM_NG is not set
# BR2_PACKAGE_CAN_UTILS is not set
# BR2_PACKAGE_CHRONY is not set
@@
-1639,6
+1650,10
@@
BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET=y
#
# ctorrent needs a toolchain w/ C++
#
#
# ctorrent needs a toolchain w/ C++
#
+BR2_PACKAGE_DHCP=y
+# BR2_PACKAGE_DHCP_SERVER is not set
+# BR2_PACKAGE_DHCP_RELAY is not set
+BR2_PACKAGE_DHCP_CLIENT=y
# BR2_PACKAGE_DHCPCD is not set
# BR2_PACKAGE_DHCPDUMP is not set
# BR2_PACKAGE_DNSMASQ is not set
# BR2_PACKAGE_DHCPCD is not set
# BR2_PACKAGE_DHCPDUMP is not set
# BR2_PACKAGE_DNSMASQ is not set
@@
-1665,8
+1680,13
@@
BR2_PACKAGE_DROPBEAR_SMALL=y
# BR2_PACKAGE_HIAWATHA is not set
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_HTTPING is not set
# BR2_PACKAGE_HIAWATHA is not set
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_HTTPING is not set
+# BR2_PACKAGE_IFPLUGD is not set
# BR2_PACKAGE_IFTOP is not set
# BR2_PACKAGE_IFTOP is not set
+#
+# ifupdown needs an (e)glibc or musl toolchain
+#
+
#
# igh-ethercat needs a Linux kernel to be built
#
#
# igh-ethercat needs a Linux kernel to be built
#
@@
-1680,7
+1700,7
@@
BR2_PACKAGE_DROPBEAR_SMALL=y
# BR2_PACKAGE_IPERF3 is not set
# BR2_PACKAGE_IPROUTE2 is not set
# BR2_PACKAGE_IPSEC_TOOLS is not set
# BR2_PACKAGE_IPERF3 is not set
# BR2_PACKAGE_IPROUTE2 is not set
# BR2_PACKAGE_IPSEC_TOOLS is not set
-# BR2_PACKAGE_IPSET is not set
+BR2_PACKAGE_IPSET=y
# BR2_PACKAGE_IPTABLES is not set
# BR2_PACKAGE_IPTRAF_NG is not set
# BR2_PACKAGE_IPUTILS is not set
# BR2_PACKAGE_IPTABLES is not set
# BR2_PACKAGE_IPTRAF_NG is not set
# BR2_PACKAGE_IPUTILS is not set
@@
-1732,9
+1752,15
@@
BR2_PACKAGE_NDISC6_RDISC6=y
# BR2_PACKAGE_NDISC6_TCPTRACEROUTE6 is not set
# BR2_PACKAGE_NDISC6_TCPSPRAY is not set
# BR2_PACKAGE_NETATALK is not set
# BR2_PACKAGE_NDISC6_TCPTRACEROUTE6 is not set
# BR2_PACKAGE_NDISC6_TCPSPRAY is not set
# BR2_PACKAGE_NETATALK is not set
+# BR2_PACKAGE_NETCAT is not set
+
+#
+# netcat-openbsd needs an (e)glibc toolchain w/ threads
+#
# BR2_PACKAGE_NETPLUG is not set
# BR2_PACKAGE_NETSNMP is not set
# BR2_PACKAGE_NETSTAT_NAT is not set
# BR2_PACKAGE_NETPLUG is not set
# BR2_PACKAGE_NETSNMP is not set
# BR2_PACKAGE_NETSTAT_NAT is not set
+BR2_PACKAGE_NET_TOOLS=y
#
# NetworkManager needs udev /dev management and a (e)glibc toolchain w/ headers >= 3.7
#
# NetworkManager needs udev /dev management and a (e)glibc toolchain w/ headers >= 3.7
@@
-1757,7
+1783,7
@@
BR2_PACKAGE_ODHCP6C=y
# BR2_PACKAGE_OPEN_PLC_UTILS is not set
# BR2_PACKAGE_OPENNTPD is not set
# BR2_PACKAGE_OPENOBEX is not set
# BR2_PACKAGE_OPEN_PLC_UTILS is not set
# BR2_PACKAGE_OPENNTPD is not set
# BR2_PACKAGE_OPENOBEX is not set
-# BR2_PACKAGE_OPENSSH is not set
+BR2_PACKAGE_OPENSSH=y
# BR2_PACKAGE_OPENSWAN is not set
# BR2_PACKAGE_OPENVPN is not set
# BR2_PACKAGE_P910ND is not set
# BR2_PACKAGE_OPENSWAN is not set
# BR2_PACKAGE_OPENVPN is not set
# BR2_PACKAGE_P910ND is not set
@@
-1807,9
+1833,11
@@
BR2_PACKAGE_ODHCP6C=y
# BR2_PACKAGE_SSHPASS is not set
# BR2_PACKAGE_STRONGSWAN is not set
# BR2_PACKAGE_STUNNEL is not set
# BR2_PACKAGE_SSHPASS is not set
# BR2_PACKAGE_STRONGSWAN is not set
# BR2_PACKAGE_STUNNEL is not set
-# BR2_PACKAGE_TCPDUMP is not set
+BR2_PACKAGE_TCPDUMP=y
+# BR2_PACKAGE_TCPDUMP_SMB is not set
# BR2_PACKAGE_TCPING is not set
# BR2_PACKAGE_TCPREPLAY is not set
# BR2_PACKAGE_TCPING is not set
# BR2_PACKAGE_TCPREPLAY is not set
+# BR2_PACKAGE_TFTPD is not set
# BR2_PACKAGE_THTTPD is not set
# BR2_PACKAGE_TINC is not set
# BR2_PACKAGE_TINYHTTPD is not set
# BR2_PACKAGE_THTTPD is not set
# BR2_PACKAGE_TINC is not set
# BR2_PACKAGE_TINYHTTPD is not set
@@
-1825,6
+1853,8
@@
BR2_PACKAGE_ODHCP6C=y
# BR2_PACKAGE_VPNC is not set
# BR2_PACKAGE_VSFTPD is not set
# BR2_PACKAGE_VTUN is not set
# BR2_PACKAGE_VPNC is not set
# BR2_PACKAGE_VSFTPD is not set
# BR2_PACKAGE_VTUN is not set
+# BR2_PACKAGE_WGET is not set
+# BR2_PACKAGE_WHOIS is not set
# BR2_PACKAGE_WIRELESS_REGDB is not set
# BR2_PACKAGE_WIRELESS_TOOLS is not set
# BR2_PACKAGE_WIRESHARK is not set
# BR2_PACKAGE_WIRELESS_REGDB is not set
# BR2_PACKAGE_WIRELESS_TOOLS is not set
# BR2_PACKAGE_WIRESHARK is not set
@@
-1849,6
+1879,7
@@
BR2_PACKAGE_ODHCP6C=y
#
# BR2_PACKAGE_IPKG is not set
# BR2_PACKAGE_OPKG is not set
#
# BR2_PACKAGE_IPKG is not set
# BR2_PACKAGE_OPKG is not set
+# BR2_PACKAGE_RPM is not set
#
# Real-Time
#
# Real-Time
@@
-1862,6
+1893,9
@@
BR2_PACKAGE_ODHCP6C=y
#
# Shells
#
#
# Shells
#
+BR2_PACKAGE_BASH=y
+# BR2_PACKAGE_DASH is not set
+# BR2_PACKAGE_ZSH is not set
#
# Utilities
#
# Utilities
@@
-1880,7
+1914,9
@@
BR2_PACKAGE_ODHCP6C=y
# BR2_PACKAGE_PINENTRY is not set
BR2_PACKAGE_SCREEN=y
BR2_PACKAGE_SUDO=y
# BR2_PACKAGE_PINENTRY is not set
BR2_PACKAGE_SCREEN=y
BR2_PACKAGE_SUDO=y
+# BR2_PACKAGE_TIME is not set
# BR2_PACKAGE_TMUX is not set
# BR2_PACKAGE_TMUX is not set
+# BR2_PACKAGE_WHICH is not set
# BR2_PACKAGE_XMLSTARLET is not set
#
# BR2_PACKAGE_XMLSTARLET is not set
#
@@
-1888,7
+1924,11
@@
BR2_PACKAGE_SUDO=y
#
# BR2_PACKAGE_ACL is not set
# BR2_PACKAGE_ATTR is not set
#
# BR2_PACKAGE_ACL is not set
# BR2_PACKAGE_ATTR is not set
+# BR2_PACKAGE_BOOTUTILS is not set
+# BR2_PACKAGE_COREUTILS is not set
# BR2_PACKAGE_CPULOAD is not set
# BR2_PACKAGE_CPULOAD is not set
+# BR2_PACKAGE_DCRON is not set
+# BR2_PACKAGE_DEBIANUTILS is not set
# BR2_PACKAGE_FTOP is not set
# BR2_PACKAGE_GETENT is not set
# BR2_PACKAGE_HTOP is not set
# BR2_PACKAGE_FTOP is not set
# BR2_PACKAGE_GETENT is not set
# BR2_PACKAGE_HTOP is not set
@@
-1913,13
+1953,18
@@
BR2_PACKAGE_SUDO=y
# openvmtools needs a toolchain w/ wchar, threads, RPC, locale
#
# BR2_PACKAGE_POLKIT is not set
# openvmtools needs a toolchain w/ wchar, threads, RPC, locale
#
# BR2_PACKAGE_POLKIT is not set
+# BR2_PACKAGE_PROCPS_NG is not set
+# BR2_PACKAGE_PSMISC is not set
# BR2_PACKAGE_PWGEN is not set
# BR2_PACKAGE_QUOTA is not set
# BR2_PACKAGE_PWGEN is not set
# BR2_PACKAGE_QUOTA is not set
+# BR2_PACKAGE_RSYSLOG is not set
# BR2_PACKAGE_SMACK is not set
# BR2_PACKAGE_SMACK is not set
+# BR2_PACKAGE_START_STOP_DAEMON is not set
#
# supervisor needs the python interpreter
#
#
# supervisor needs the python interpreter
#
+# BR2_PACKAGE_SYSKLOGD is not set
BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS=y
BR2_PACKAGE_UTIL_LINUX=y
BR2_PACKAGE_UTIL_LINUX_LIBBLKID=y
BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS=y
BR2_PACKAGE_UTIL_LINUX=y
BR2_PACKAGE_UTIL_LINUX_LIBBLKID=y
@@
-1980,9
+2025,11
@@
BR2_PACKAGE_UTIL_LINUX_PARTX=y
#
# BR2_PACKAGE_ED is not set
# BR2_PACKAGE_JOE is not set
#
# BR2_PACKAGE_ED is not set
# BR2_PACKAGE_JOE is not set
+# BR2_PACKAGE_LESS is not set
# BR2_PACKAGE_MC is not set
# BR2_PACKAGE_NANO is not set
# BR2_PACKAGE_UEMACS is not set
# BR2_PACKAGE_MC is not set
# BR2_PACKAGE_NANO is not set
# BR2_PACKAGE_UEMACS is not set
+# BR2_PACKAGE_VIM is not set
#
# Filesystem images
#
# Filesystem images