Bump buildroot to version 2017-02
TG-3 #closed
This commit is contained in:
@@ -11,25 +11,21 @@ for example).
|
||||
|
||||
Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
|
||||
[Maxime: refresh the patch]
|
||||
[Vincent:
|
||||
refresh the patch, move-to-rootlibdir removed by:
|
||||
https://github.com/systemd/systemd/commit/082210c7a837063fd8b520b18c221b42059d7eff
|
||||
]
|
||||
Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
|
||||
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
||||
---
|
||||
Makefile.am | 15 +++------------
|
||||
Makefile.am | 11 ++---------
|
||||
configure.ac | 2 --
|
||||
2 files changed, 3 insertions(+), 14 deletions(-)
|
||||
2 files changed, 2 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 0c27f81..4de1595 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -255,7 +255,7 @@ define move-to-rootlibdir
|
||||
$(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
|
||||
so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
|
||||
rm -f $(DESTDIR)$(libdir)/$$libname && \
|
||||
- $(LN_S) --relative -f $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
|
||||
+ $(LN_S) -f $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
|
||||
mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
|
||||
fi
|
||||
endef
|
||||
@@ -312,9 +312,9 @@ install-aliases-hook:
|
||||
set -- $(SYSTEM_UNIT_ALIASES) && \
|
||||
dir=$(systemunitdir) && $(install-aliases)
|
||||
|
||||
@@ -10,7 +10,6 @@ config BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS
|
||||
menuconfig BR2_PACKAGE_SYSTEMD
|
||||
bool "systemd"
|
||||
depends on BR2_INIT_SYSTEMD
|
||||
depends on BR2_USE_WCHAR # util-linux
|
||||
depends on !BR2_STATIC_LIBS # kmod
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
|
||||
depends on BR2_USE_MMU # dbus
|
||||
@@ -106,7 +105,6 @@ config BR2_PACKAGE_SYSTEMD_COREDUMP
|
||||
|
||||
config BR2_PACKAGE_SYSTEMD_FIRSTBOOT
|
||||
bool "enable firstboot support"
|
||||
default y
|
||||
help
|
||||
systemd-firstboot initializes the most basic system settings
|
||||
interactively on the first boot.
|
||||
|
||||
4
bsp/buildroot/package/systemd/dhcp.network
Normal file
4
bsp/buildroot/package/systemd/dhcp.network
Normal file
@@ -0,0 +1,4 @@
|
||||
[Match]
|
||||
Name=SYSTEMD_NETWORKD_DHCP_IFACE
|
||||
[Network]
|
||||
DHCP=ipv4
|
||||
@@ -1,2 +1,2 @@
|
||||
# sha256 locally computed
|
||||
sha256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 systemd-231.tar.gz
|
||||
sha256 1172c7c7d5d72fbded53186e7599d5272231f04cc8b72f9a0fb2c5c20dfc4880 systemd-232.tar.gz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
SYSTEMD_VERSION = 231
|
||||
SYSTEMD_VERSION = 232
|
||||
SYSTEMD_SITE = $(call github,systemd,systemd,v$(SYSTEMD_VERSION))
|
||||
SYSTEMD_LICENSE = LGPLv2.1+, GPLv2+ (udev), Public Domain (few source files, see README)
|
||||
SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README
|
||||
@@ -30,7 +30,6 @@ SYSTEMD_CONF_OPTS += \
|
||||
--enable-blkid \
|
||||
--enable-static=no \
|
||||
--disable-manpages \
|
||||
--disable-selinux \
|
||||
--disable-pam \
|
||||
--disable-ima \
|
||||
--disable-libcryptsetup \
|
||||
@@ -153,6 +152,13 @@ else
|
||||
SYSTEMD_CONF_OPTS += --disable-microhttpd --disable-qrencode
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
|
||||
SYSTEMD_DEPENDENCIES += libselinux
|
||||
SYSTEMD_CONF_OPTS += --enable-selinux
|
||||
else
|
||||
SYSTEMD_CONF_OPTS += --disable-selinux
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SYSTEMD_HWDB),y)
|
||||
SYSTEMD_CONF_OPTS += --enable-hwdb
|
||||
else
|
||||
@@ -275,6 +281,14 @@ define SYSTEMD_INSTALL_RESOLVCONF_HOOK
|
||||
ln -sf ../run/systemd/resolve/resolv.conf \
|
||||
$(TARGET_DIR)/etc/resolv.conf
|
||||
endef
|
||||
SYSTEMD_NETWORKD_DHCP_IFACE = $(call qstrip,$(BR2_SYSTEM_DHCP))
|
||||
ifneq ($(SYSTEMD_NETWORKD_DHCP_IFACE),)
|
||||
define SYSTEMD_INSTALL_NETWORK_CONFS
|
||||
sed s/SYSTEMD_NETWORKD_DHCP_IFACE/$(SYSTEMD_NETWORKD_DHCP_IFACE)/ \
|
||||
package/systemd/dhcp.network > \
|
||||
$(TARGET_DIR)/etc/systemd/network/dhcp.network
|
||||
endef
|
||||
endif
|
||||
else
|
||||
SYSTEMD_CONF_OPTS += --disable-networkd
|
||||
define SYSTEMD_INSTALL_SERVICE_NETWORK
|
||||
@@ -377,6 +391,7 @@ define SYSTEMD_INSTALL_INIT_SYSTEMD
|
||||
$(SYSTEMD_INSTALL_SERVICE_TTY)
|
||||
$(SYSTEMD_INSTALL_SERVICE_NETWORK)
|
||||
$(SYSTEMD_INSTALL_SERVICE_TIMESYNC)
|
||||
$(SYSTEMD_INSTALL_NETWORK_CONFS)
|
||||
endef
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
Reference in New Issue
Block a user