From: Peter Korsgaard Date: Fri, 28 Feb 2014 13:30:23 +0000 (+0100) Subject: Merge branch 'next' X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b108fdcb83d457e5d43298fb93dbfd805d076f24;p=buildroot.git Merge branch 'next' Conflicts: Makefile package/dmraid/Config.in package/gdb/Config.in.host package/linux-headers/linux-headers.mk package/python/python.mk package/python3/python3.mk package/rt-tests/Config.in package/sdl/sdl.mk package/systemd/systemd-01-fix-getty-unit.patch package/systemd/systemd-02-fix-page-size.patch package/systemd/systemd-03-uclibc-fix.patch package/udev/Config.in package/udisks/Config.in package/vlc/vlc.mk system/Config.in Quite some merge conflicts, hopefully I didn't screw up anything. Signed-off-by: Peter Korsgaard --- b108fdcb83d457e5d43298fb93dbfd805d076f24 diff --cc package/dmraid/Config.in index 90aca296cc,028b46c3a2..fc370bd57d --- a/package/dmraid/Config.in +++ b/package/dmraid/Config.in @@@ -2,9 -2,6 +2,7 @@@ config BR2_PACKAGE_DMRAI bool "dmraid" depends on BR2_LARGEFILE depends on BR2_USE_MMU # lvm2 + depends on !BR2_PREFER_STATIC_LIB # lvm2 - # triggers gcc ice - depends on !BR2_arc select BR2_PACKAGE_LVM2 help dmraid discovers, activates, deactivates and displays properties @@@ -13,7 -10,6 +11,6 @@@ dmraid uses the Linux device-mapper to create devices with respective mappings for the ATARAID sets discovered. -comment "dmraid needs a toolchain w/ largefile" +comment "dmraid needs a toolchain w/ largefile, dynamic library" depends on BR2_USE_MMU - depends on !BR2_LARGEFILE + depends on !BR2_LARGEFILE || BR2_PREFER_STATIC_LIB - depends on !BR2_arc diff --cc package/gdb/Config.in.host index 7082d1cad5,420408a50f..cbcec18604 --- a/package/gdb/Config.in.host +++ b/package/gdb/Config.in.host @@@ -51,7 -51,7 +51,7 @@@ config BR2_GDB_VERSIO (!BR2_PACKAGE_HOST_GDB && BR2_bfin) default "6.7.1-avr32-2.1.5" if BR2_GDB_VERSION_6_7_1_AVR32_2_1_5 || \ (!BR2_PACKAGE_HOST_GDB && BR2_avr32) - default "f25a1952afd054205f9471e449c1f7ca5b271b7c" if BR2_arc - default "7.4.1" if BR2_GDB_VERSION_7_4 - default "7.5.1" if BR2_GDB_VERSION_7_5 || !BR2_PACKAGE_HOST_GDB + default "cb15acc5eecea46d041730e5c2c9fa1d4283ef25" if BR2_arc default "6be65fb56ea6694a9260733a536a023a1e2d4d57" if BR2_microblaze + default "7.4.1" if BR2_GDB_VERSION_7_4 + default "7.5.1" if BR2_GDB_VERSION_7_5 || !BR2_PACKAGE_HOST_GDB diff --cc package/libpng/libpng.mk index b489dd9fb8,0bfe7d1d1b..e8483b7b62 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@@ -4,10 -4,10 +4,10 @@@ # ################################################################################ - LIBPNG_VERSION = 1.6.8 + LIBPNG_VERSION = 1.6.9 LIBPNG_SERIES = 16 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz -LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng${LIBPNG_SERIES}/$(LIBPNG_VERSION) +LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng${LIBPNG_SERIES}/older-releases/$(LIBPNG_VERSION) LIBPNG_LICENSE = libpng license LIBPNG_LICENSE_FILES = LICENSE LIBPNG_INSTALL_STAGING = YES diff --cc package/linux-headers/linux-headers.mk index 086e5d5704,6dac9e36f1..49fd9ca6d4 --- a/package/linux-headers/linux-headers.mk +++ b/package/linux-headers/linux-headers.mk @@@ -17,12 -17,9 +17,15 @@@ LINUX_HEADERS_SOURCE = linux-$(LINUX_HE LINUX_HEADERS_INSTALL_STAGING = YES + # linux-headers is part of the toolchain so disable the toolchain dependency + LINUX_HEADERS_ADD_TOOLCHAIN_DEPENDENCY = NO + +# For some architectures (eg. Arc, Cris, Hexagon, ia64, parisc, +# score and xtensa), the Linux buildsystem tries to call the +# cross-compiler, although it is not needed at all. +# This results in seemingly errors like: +# [...]/scripts/gcc-version.sh: line 26: arc-linux-uclibc-gcc: command not found +# Those can be safely ignored. define LINUX_HEADERS_INSTALL_STAGING_CMDS (cd $(@D); \ $(TARGET_MAKE_ENV) $(MAKE) \ diff --cc package/rt-tests/Config.in index 89406688e2,461e6de6e8..28a4a11249 --- a/package/rt-tests/Config.in +++ b/package/rt-tests/Config.in @@@ -1,13 -1,6 +1,9 @@@ config BR2_PACKAGE_RT_TESTS bool "rt-tests" - depends on BR2_TOOLCHAIN_HAS_THREADS - # priority-inheritance mutex needs NPTL - depends on !BR2_PTHREADS && !BR2_PTHREADS_OLD - # no NPTL for these archs - depends on !BR2_avr32 && !BR2_xtensa && !BR2_arc && !BR2_bfin + # no _tid field in 'struct sigevent' + depends on !(BR2_TOOLCHAIN_USES_UCLIBC && (BR2_mips || BR2_mipsel || \ + BR2_mips64 || BR2_mips64el)) + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL help Set of utilities for testing the real-time behaviour of a Linux system. @@@ -26,11 -19,5 +22,10 @@@ http://rt.wiki.kernel.org - comment "rt-tests needs a toolchain w/ threads" - depends on !BR2_PTHREADS && !BR2_PTHREADS_OLD - depends on !BR2_avr32 && !BR2_xtensa && !BR2_arc && !BR2_bfin - depends on !BR2_TOOLCHAIN_HAS_THREADS + +comment "rt-tests needs an (e)glibc toolchain" + depends on BR2_TOOLCHAIN_USES_UCLIBC && (BR2_mips || BR2_mipsel || \ + BR2_mips64 || BR2_mips64el) ++ + comment "rt-tests needs a toolchain w/ NPTL" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL diff --cc package/systemd/systemd-01-fix-getty-unit.patch index 9008e434b4,0000000000..166a2e545c mode 100644,000000..100644 --- a/package/systemd/systemd-01-fix-getty-unit.patch +++ b/package/systemd/systemd-01-fix-getty-unit.patch @@@ -1,34 -1,0 +1,32 @@@ +Prefer getty to agetty in console setup systemd units + +Signed-off-by: Maxime Ripard ++Signed-off-by: Eric Le Bihan +--- - units/getty@.service.m4 | 2 +- - units/serial-getty@.service.m4 | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + - Index: b/units/getty@.service.m4 ++Index: systemd-206/units/getty@.service.m4 +=================================================================== - --- a/units/getty@.service.m4 - +++ b/units/getty@.service.m4 - @@ -35,7 +35,7 @@ - ++--- systemd-206.orig/units/getty@.service.m4 2013-07-22 00:43:28.000000000 +0200 +++++ systemd-206/units/getty@.service.m4 2013-09-18 10:20:17.000000000 +0200 ++@@ -27,7 +27,7 @@ ++ + [Service] - Environment=TERM=linux - -ExecStart=-/sbin/agetty %I 38400 ++ # the VT is cleared by TTYVTDisallocate ++-ExecStart=-/sbin/agetty --noclear %I ++ExecStart=-/sbin/getty -L %I 115200 vt100 ++ Type=idle + Restart=always + RestartSec=0 - UtmpIdentifier=%I - Index: b/units/serial-getty@.service.m4 ++Index: systemd-206/units/serial-getty@.service.m4 +=================================================================== - --- a/units/serial-getty@.service.m4 - +++ b/units/serial-getty@.service.m4 - @@ -35,7 +35,7 @@ - ++--- systemd-206.orig/units/serial-getty@.service.m4 2013-07-22 00:43:28.000000000 +0200 +++++ systemd-206/units/serial-getty@.service.m4 2013-09-18 10:21:31.000000000 +0200 ++@@ -22,7 +22,7 @@ ++ IgnoreOnIsolate=yes ++ + [Service] - Environment=TERM=vt100 - -ExecStart=-/sbin/agetty -s %I 115200,38400,9600 ++-ExecStart=-/sbin/agetty --keep-baud %I 115200,38400,9600 ++ExecStart=-/sbin/getty -L %I 115200 vt100 ++ Type=idle + Restart=always + RestartSec=0 - UtmpIdentifier=%I diff --cc package/systemd/systemd.mk index bd901019ac,36ef704c7b..bcdf95e152 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@@ -19,13 -20,15 +20,17 @@@ SYSTEMD_DEPENDENCIES = # Make sure that systemd will always be built after busybox so that we have # a consistent init setup between two builds ifeq ($(BR2_PACKAGE_BUSYBOX),y) - SYSTEMD_DEPENDENCIES += busybox + SYSTEMD_DEPENDENCIES += busybox endif +SYSTEMD_AUTORECONF = YES + SYSTEMD_CONF_OPT += \ - --with-distro=other \ + --with-rootprefix= \ + --with-rootlibdir=/lib \ + --localstatedir=/var \ + --enable-static=no \ + --disable-manpages \ --disable-selinux \ --disable-pam \ --disable-libcryptsetup \ diff --cc package/udisks/Config.in index b398260186,d560b6cf76..76505ff343 --- a/package/udisks/Config.in +++ b/package/udisks/Config.in @@@ -1,12 -1,9 +1,10 @@@ config BR2_PACKAGE_UDISKS bool "udisks" depends on !BR2_avr32 # udev - depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV + depends on BR2_PACKAGE_HAS_UDEV depends on BR2_TOOLCHAIN_HAS_THREADS # dbus-glib -> glib2 depends on BR2_USE_MMU # lvm2 + depends on !BR2_PREFER_STATIC_LIB # lvm2 - select BR2_PACKAGE_UDEV - select BR2_PACKAGE_UDEV_ALL_EXTRAS select BR2_PACKAGE_DBUS select BR2_PACKAGE_DBUS_GLIB depends on BR2_USE_WCHAR # dbus-glib -> glib2 @@@ -37,9 -34,12 +35,13 @@@ config BR2_PACKAGE_UDISKS_LVM endif - comment "udisks needs udev /dev management and a toolchain w/ wchar, threads, dynamic library" + comment "udisks needs udev /dev management" depends on !BR2_avr32 depends on BR2_USE_MMU - depends on !BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV || \ - !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + depends on !BR2_PACKAGE_HAS_UDEV + -comment "udisks needs a toolchain w/ wchar, threads" ++comment "udisks needs a toolchain w/ wchar, threads, dynamic library" + depends on !BR2_avr32 + depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS ++ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_PREFER_STATIC_LIB diff --cc package/vlc/vlc.mk index 94010c89f1,ad7d9ffd64..23905dfa85 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@@ -274,11 -266,11 +274,11 @@@ els VLC_CONF_OPT += --disable-tremor endif - ifeq ($(BR2_PACKAGE_UDEV),y) + ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -VLC_CONF_OPT += --enable-udev +VLC_CONF_OPT += --with-udev VLC_DEPENDENCIES += udev else -VLC_CONF_OPT += --disable-udev +VLC_CONF_OPT += --without-udev endif ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) diff --cc system/Config.in index f9623b97ab,30d8efeaba..89578c5828 --- a/system/Config.in +++ b/system/Config.in @@@ -121,22 -120,17 +120,19 @@@ config BR2_ROOTFS_DEVICE_CREATION_DYNAM bool "Dynamic using mdev" select BR2_PACKAGE_BUSYBOX - config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV - bool "Dynamic using udev" - depends on !BR2_avr32 # udev - depends on BR2_LARGEFILE # udev - depends on BR2_USE_WCHAR # udev - depends on !BR2_PREFER_STATIC_LIB # udev -> kmod - depends on BR2_USE_MMU # udev -> util-linux/libblkid - select BR2_PACKAGE_UDEV - - comment "udev needs a toolchain w/ largefile, wchar" - depends on !BR2_avr32 # udev - depends on !(BR2_LARGEFILE && BR2_USE_WCHAR) + config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV + bool "Dynamic using eudev" + depends on !BR2_avr32 # eudev + depends on BR2_LARGEFILE + depends on BR2_USE_WCHAR + depends on !BR2_PREFER_STATIC_LIB ++ depends on BR2_USE_MMU # eudev + select BR2_PACKAGE_EUDEV - comment "udev doesn't work with 'prefer static libraries'" - depends on !BR2_avr32 # udev - depends on BR2_PREFER_STATIC_LIB + comment "eudev needs a toolchain w/ largefile, wchar, dynamic library" + depends on !BR2_avr32 # eudev ++ depends on BR2_USE_MMU + depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || BR2_PREFER_STATIC_LIB endchoice