From: Peter Korsgaard Date: Sun, 2 Dec 2018 07:15:26 +0000 (+0100) Subject: Merge branch 'next' X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=13c43455a05b036002e79808ca1c8e0d91d7871b;p=buildroot.git Merge branch 'next' Signed-off-by: Peter Korsgaard --- 13c43455a05b036002e79808ca1c8e0d91d7871b diff --cc fs/common.mk index e4a6a4897b,d49e615447..1625b65d0e --- a/fs/common.mk +++ b/fs/common.mk @@@ -104,29 -143,16 +106,30 @@@ ROOTFS_$(2)_COMPRESS_EXT = .x ROOTFS_$(2)_COMPRESS_CMD = xz -9 -C crc32 -c endif - $$(BINARIES_DIR)/rootfs.$(1): ROOTFS=$(2) - $$(BINARIES_DIR)/rootfs.$(1): FAKEROOT_SCRIPT=$$(ROOTFS_$(2)_DIR)/fakeroot - $$(BINARIES_DIR)/rootfs.$(1): $$(ROOTFS_$(2)_DEPENDENCIES) - @$$(call MESSAGE,"Generating root filesystem image rootfs.$(1)") + $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): ROOTFS=$(2) + $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): FAKEROOT_SCRIPT=$$(ROOTFS_$(2)_DIR)/fakeroot + $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME): $$(ROOTFS_$(2)_DEPENDENCIES) + @$$(call MESSAGE,"Generating filesystem image $$(ROOTFS_$(2)_FINAL_IMAGE_NAME)") + mkdir -p $$(@D) rm -rf $$(ROOTFS_$(2)_DIR) mkdir -p $$(ROOTFS_$(2)_DIR) + rsync -auH \ + --exclude=/$$(notdir $$(TARGET_DIR_WARNING_FILE)) \ + $$(BASE_TARGET_DIR)/ \ + $$(TARGET_DIR) + echo '#!/bin/sh' > $$(FAKEROOT_SCRIPT) echo "set -e" >> $$(FAKEROOT_SCRIPT) - $$(call PRINTF,$$(ROOTFS_COMMON_UNTAR_CMD)) >> $$(FAKEROOT_SCRIPT) + + echo "chown -h -R 0:0 $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT) + PATH=$$(BR_PATH) $$(TOPDIR)/support/scripts/mkusers $$(USERS_TABLE) $$(TARGET_DIR) >> $$(FAKEROOT_SCRIPT) + echo "$$(HOST_DIR)/bin/makedevs -d $$(FULL_DEVICE_TABLE) $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT) + $$(foreach s,$$(call qstrip,$$(BR2_ROOTFS_POST_FAKEROOT_SCRIPT)),\ + echo "echo '$$(TERM_BOLD)>>> Executing fakeroot script $$(s)$$(TERM_RESET)'" >> $$(FAKEROOT_SCRIPT); \ + echo $$(EXTRA_ENV) $$(s) $$(TARGET_DIR) $$(BR2_ROOTFS_POST_SCRIPT_ARGS) >> $$(FAKEROOT_SCRIPT)$$(sep)) + $$(foreach hook,$$(ROOTFS_PRE_CMD_HOOKS),\ + $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) + $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),\ $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) $$(call PRINTF,$$(ROOTFS_REPRODUCIBLE)) >> $$(FAKEROOT_SCRIPT) diff --cc linux/Config.in index efce31c7e1,c75e149a37..74f4321e43 --- a/linux/Config.in +++ b/linux/Config.in @@@ -30,10 -30,10 +30,10 @@@ choic prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (4.18)" + bool "Latest version (4.19)" config BR2_LINUX_KERNEL_LATEST_CIP_VERSION - bool "Latest CIP SLTS version (v4.4.138-cip25)" + bool "Latest CIP SLTS version (v4.4.154-cip28)" help CIP launched in the spring of 2016 to address the needs of organizations in industries such as power generation and @@@ -120,8 -120,8 +120,8 @@@ endi config BR2_LINUX_KERNEL_VERSION string - default "4.18.20" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.19.2" if BR2_LINUX_KERNEL_LATEST_VERSION - default "v4.4.138-cip25" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION + default "v4.4.154-cip28" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL diff --cc linux/linux.hash index 12da19e043,d708b87ad1..8148315c06 --- a/linux/linux.hash +++ b/linux/linux.hash @@@ -1,9 -1,10 +1,10 @@@ # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc +sha256 68ac319e0fb7edd6b6051541d9cf112cd4f77a29e16a69ae1e133ff51117f653 linux-4.18.20.tar.xz + sha256 c10c7f81019bd782ea77a25725f6d53e9affa4a0cfd3985c161f3a2a22f2df73 linux-4.19.2.tar.xz -sha256 36c6d1360db9eab40270db6d292c259dd34d3dc06049d64afe3e4cfafb8562d3 linux-4.18.14.tar.xz sha256 41026d713ba4f7a5e9d514b876ce4ed28a1d993c0c58b42b2a2597d6a0e83021 linux-4.16.18.tar.xz -sha256 ee3f19a4ff8a42793c193e361e1d34fcc821a5ca9b58db41befb2b4df0e482be linux-4.14.76.tar.xz -sha256 53730fc025ba330a6f4908a6a1e4cb86d821000c84167721680ccf1b37b26563 linux-4.9.133.tar.xz -sha256 be0383d57c52a7ac6b1ca4d989a16a581f52ec9704ccf4ddf066b1b5b1313f87 linux-4.4.161.tar.xz +sha256 701728de924e0ec4a6b7cf59252011f8268a1b70aaf02b8487c1b2190feb3f20 linux-4.14.83.tar.xz +sha256 f888aef58c2c4d82c81511ad6a4528ee9a8241bb96c05c65e71224988782f943 linux-4.9.140.tar.xz +sha256 9bb4a1757e67dbd0923dbdf7e7e0baa9baa53ac942471d8fbb8d35dd5b313c10 linux-4.4.164.tar.xz sha256 6ad9389e55e0ea57768eae173747058a4487fa3630e10a7999cfec9f945e559c linux-4.1.52.tar.xz # From https://www.kernel.org/pub/linux/kernel/v3.x/sha256sums.asc sha256 ad96d797571496c969aa71bf5d08e9d2a8c84458090d29a120f1b2981185a99e linux-3.2.102.tar.xz diff --cc package/dante/dante.mk index 9471acc692,9666ec54fd..0bd036d37e --- a/package/dante/dante.mk +++ b/package/dante/dante.mk @@@ -9,11 -9,18 +9,18 @@@ DANTE_SITE = http://www.inet.no/dante/f DANTE_LICENSE = BSD-3-Clause DANTE_LICENSE_FILES = LICENSE -# Dante uses a *VERY* old configure.ac -DANTE_LIBTOOL_PATCH = NO +# 0002-compiler.m4-do-not-remove-g-flag.patch touches a m4 file +DANTE_AUTORECONF = YES -DANTE_CONF_OPTS += --disable-client --disable-preload +DANTE_CONF_OPTS += --disable-client --disable-preload --without-pam + ifeq ($(BR2_PACKAGE_LINUX_PAM),y) + DANTE_DEPENDENCIES += linux-pam + DANTE_CONF_OPTS += --with-pam + else + DANTE_CONF_OPTS += --without-pam + endif + define DANTE_INSTALL_CONFIG_FILE $(INSTALL) -D -m 644 $(@D)/example/sockd.conf \ $(TARGET_DIR)/etc/sockd.conf diff --cc package/libid3tag/libid3tag.mk index 402e154ae1,24342186cc..3ec145725f --- a/package/libid3tag/libid3tag.mk +++ b/package/libid3tag/libid3tag.mk @@@ -10,9 -10,13 +10,16 @@@ LIBID3TAG_LICENSE = GPL-2.0 LIBID3TAG_LICENSE_FILES = COPYING COPYRIGHT LIBID3TAG_INSTALL_STAGING = YES LIBID3TAG_DEPENDENCIES = zlib -LIBID3TAG_LIBTOOL_PATCH = NO + +# Force autoreconf to be able to use a more recent libtool script, that +# is able to properly behave in the face of a missing C++ compiler. +LIBID3TAG_AUTORECONF = YES + define LIBID3TAG_INSTALL_STAGING_PC + $(INSTALL) -D package/libid3tag/id3tag.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/id3tag.pc + endef + + LIBID3TAG_POST_INSTALL_STAGING_HOOKS += LIBID3TAG_INSTALL_STAGING_PC + $(eval $(autotools-package)) diff --cc package/linux-headers/Config.in.host index 756fe81a57,7b4babe96d..1b2a585280 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@@ -290,11 -298,12 +298,12 @@@ config BR2_DEFAULT_KERNEL_HEADER string default "3.2.102" if BR2_KERNEL_HEADERS_3_2 default "4.1.52" if BR2_KERNEL_HEADERS_4_1 - default "4.4.161" if BR2_KERNEL_HEADERS_4_4 - default "4.9.133" if BR2_KERNEL_HEADERS_4_9 - default "4.14.76" if BR2_KERNEL_HEADERS_4_14 + default "4.4.164" if BR2_KERNEL_HEADERS_4_4 + default "4.9.140" if BR2_KERNEL_HEADERS_4_9 + default "4.14.83" if BR2_KERNEL_HEADERS_4_14 default "4.16.18" if BR2_KERNEL_HEADERS_4_16 - default "4.18.14" if BR2_KERNEL_HEADERS_4_18 + default "4.18.20" if BR2_KERNEL_HEADERS_4_18 + default "4.19.2" if BR2_KERNEL_HEADERS_4_19 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \