diff -Nru armhf-cross-toolchain-base-1.103/debian/changelog armhf-cross-toolchain-base-1.104/debian/changelog --- armhf-cross-toolchain-base-1.103/debian/changelog 2013-12-18 09:15:51.000000000 +0000 +++ armhf-cross-toolchain-base-1.104/debian/changelog 2014-02-25 16:20:27.000000000 +0000 @@ -1,3 +1,14 @@ +armhf-cross-toolchain-base (1.104) trusty; urgency=medium + + * Bump eglibc to 2.19. + * Bump kernel to 3.13. + * Bump binutils to 2.24 (belated). + * Refresh eglibc patches. + * Regeneration debian/control. + * Add rsync, xmlto build-dep. + + -- Dimitri John Ledkov Tue, 25 Feb 2014 16:01:56 +0000 + armhf-cross-toolchain-base (1.103) trusty; urgency=low * Bump eglibc to 2.18. diff -Nru armhf-cross-toolchain-base-1.103/debian/control armhf-cross-toolchain-base-1.104/debian/control --- armhf-cross-toolchain-base-1.103/debian/control 2013-12-18 08:44:49.000000000 +0000 +++ armhf-cross-toolchain-base-1.104/debian/control 2014-02-25 16:20:19.000000000 +0000 @@ -3,18 +3,18 @@ Priority: extra Maintainer: Ubuntu Core developers Standards-Version: 3.9.3 -Build-Depends: dpkg-cross (>= 2.6.6), binutils-multiarch (>= 2.23.2-0~), +Build-Depends: dpkg-cross (>= 2.6.6), binutils-multiarch (>= 2.24-0~), dpkg (>= 1.16.0~ubuntu6), fdupes, lsb-release, - binutils-source (>= 2.23.2-0~), - eglibc-source (>= 2.18-0~), + binutils-source (>= 2.24-0~), + eglibc-source (>= 2.19-0~), gcc-4.8-source (>= 4.8.2-10), - linux-source (>= 3.12.0-0~), + linux-source (>= 3.13.0-0~), autoconf (>= 2.64), autoconf2.64, autogen, bison (>= 1:2.3), chrpath, debhelper (>= 5.0.62), dpkg-dev (>= 1.15.3.1), fakeroot, file, flex, gawk, gettext, gperf (>= 3.0.1), kernel-wedge (>= 2.24), libcloog-ppl-dev (>= 0.15.8-1~), libmpc-dev, - libmpfr-dev (>= 2.3.0), libtool, lsb-release, lzma, m4, + libmpfr-dev (>= 2.3.0), rsync, xmlto, libtool, lsb-release, lzma, m4, make (>= 3.81), module-init-tools, symlinks, patchutils, procps, quilt, rdfind, realpath (>= 1.9.12), sed (>= 4.0.5-4), sharutils, tar (>= 1.22), xz-utils, diff -Nru armhf-cross-toolchain-base-1.103/debian/control.in armhf-cross-toolchain-base-1.104/debian/control.in --- armhf-cross-toolchain-base-1.103/debian/control.in 2013-12-18 08:43:46.000000000 +0000 +++ armhf-cross-toolchain-base-1.104/debian/control.in 2014-02-25 16:20:08.000000000 +0000 @@ -14,7 +14,7 @@ dpkg-dev (>= 1.15.3.1), fakeroot, file, flex, gawk, gettext, gperf (>= 3.0.1), kernel-wedge (>= 2.24), libcloog-ppl-dev (>= 0.15.8-1~), libmpc-dev, - libmpfr-dev (>= 2.3.0), libtool, lsb-release, lzma, m4, + libmpfr-dev (>= 2.3.0), rsync, xmlto, libtool, lsb-release, lzma, m4, make (>= 3.81), module-init-tools, symlinks, patchutils, procps, quilt, rdfind, realpath (>= 1.9.12), sed (>= 4.0.5-4), sharutils, tar (>= 1.22), xz-utils, diff -Nru armhf-cross-toolchain-base-1.103/debian/patches/eglibc/ubuntu/disable-selinux.patch armhf-cross-toolchain-base-1.104/debian/patches/eglibc/ubuntu/disable-selinux.patch --- armhf-cross-toolchain-base-1.103/debian/patches/eglibc/ubuntu/disable-selinux.patch 2013-12-18 05:27:31.000000000 +0000 +++ armhf-cross-toolchain-base-1.104/debian/patches/eglibc/ubuntu/disable-selinux.patch 2014-02-25 16:08:31.000000000 +0000 @@ -8,16 +8,16 @@ sysdeps/linux.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: eglibc-2.18/debian/sysdeps/linux.mk +Index: eglibc-2.19/debian/sysdeps/linux.mk =================================================================== ---- eglibc-2.18.orig/debian/sysdeps/linux.mk 2013-12-18 05:24:58.096877814 +0000 -+++ eglibc-2.18/debian/sysdeps/linux.mk 2013-12-18 05:27:22.232881386 +0000 -@@ -13,7 +13,7 @@ +--- eglibc-2.19.orig/debian/sysdeps/linux.mk 2014-02-25 16:07:52.489500514 +0000 ++++ eglibc-2.19/debian/sysdeps/linux.mk 2014-02-25 16:08:18.841273959 +0000 +@@ -16,7 +16,7 @@ ifeq ($(DEB_BUILD_PROFILE),bootstrap) - libc_extra_config_options = --enable-pt_chown $(extra_config_options) + libc_extra_config_options = $(extra_config_options) else -- libc_extra_config_options = --enable-pt_chown --with-selinux $(extra_config_options) -+ libc_extra_config_options = --enable-pt_chown $(extra_config_options) +- libc_extra_config_options = --with-selinux $(extra_config_options) ++ libc_extra_config_options = $(extra_config_options) endif ifndef LINUX_SOURCE diff -Nru armhf-cross-toolchain-base-1.103/debian/patches/eglibc/ubuntu/dpkg-shlibs.patch armhf-cross-toolchain-base-1.104/debian/patches/eglibc/ubuntu/dpkg-shlibs.patch --- armhf-cross-toolchain-base-1.103/debian/patches/eglibc/ubuntu/dpkg-shlibs.patch 2013-12-18 03:07:00.000000000 +0000 +++ armhf-cross-toolchain-base-1.104/debian/patches/eglibc/ubuntu/dpkg-shlibs.patch 2014-02-25 16:09:02.000000000 +0000 @@ -2,11 +2,11 @@ debian/rules.d/debhelper.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: eglibc-2.17/debian/rules.d/debhelper.mk +Index: eglibc-2.19/debian/rules.d/debhelper.mk =================================================================== ---- eglibc-2.17.orig/debian/rules.d/debhelper.mk -+++ eglibc-2.17/debian/rules.d/debhelper.mk -@@ -111,7 +111,7 @@ +--- eglibc-2.19.orig/debian/rules.d/debhelper.mk 2014-02-25 16:05:47.490575164 +0000 ++++ eglibc-2.19/debian/rules.d/debhelper.mk 2014-02-25 16:08:54.000000000 +0000 +@@ -105,7 +105,7 @@ ./debian/shlibs-add-udebs $(curpass) dh_installdeb -p$(curpass) diff -Nru armhf-cross-toolchain-base-1.103/debian/patches/eglibc/ubuntu/local-kill-locales.patch armhf-cross-toolchain-base-1.104/debian/patches/eglibc/ubuntu/local-kill-locales.patch --- armhf-cross-toolchain-base-1.103/debian/patches/eglibc/ubuntu/local-kill-locales.patch 2013-12-18 03:07:00.000000000 +0000 +++ armhf-cross-toolchain-base-1.104/debian/patches/eglibc/ubuntu/local-kill-locales.patch 2014-02-25 16:07:40.000000000 +0000 @@ -2,11 +2,11 @@ localedata/SUPPORTED | 439 --------------------------------------------------- 1 file changed, 439 deletions(-) -Index: eglibc-2.17/localedata/SUPPORTED +Index: eglibc-2.19/localedata/SUPPORTED =================================================================== ---- eglibc-2.17.orig/localedata/SUPPORTED -+++ eglibc-2.17/localedata/SUPPORTED -@@ -2,462 +2,3 @@ +--- eglibc-2.19.orig/localedata/SUPPORTED 2014-02-25 16:06:11.010372959 +0000 ++++ eglibc-2.19/localedata/SUPPORTED 2014-02-25 16:07:31.345682293 +0000 +@@ -2,473 +2,3 @@ # If you have any additions please file a glibc bug report. SUPPORTED-LOCALES=\ aa_DJ.UTF-8/UTF-8 \ @@ -16,9 +16,11 @@ -aa_ET/UTF-8 \ -af_ZA.UTF-8/UTF-8 \ -af_ZA/ISO-8859-1 \ +-ak_GH/UTF-8 \ -am_ET/UTF-8 \ -an_ES.UTF-8/UTF-8 \ -an_ES/ISO-8859-15 \ +-anp_IN/UTF-8 \ -ar_AE.UTF-8/UTF-8 \ -ar_AE/ISO-8859-6 \ -ar_BH.UTF-8/UTF-8 \ @@ -48,6 +50,7 @@ -ar_SA/ISO-8859-6 \ -ar_SD.UTF-8/UTF-8 \ -ar_SD/ISO-8859-6 \ +-ar_SS/UTF-8 \ -ar_SY.UTF-8/UTF-8 \ -ar_SY/ISO-8859-6 \ -ar_TN.UTF-8/UTF-8 \ @@ -90,6 +93,7 @@ -ca_FR/ISO-8859-15 \ -ca_IT.UTF-8/UTF-8 \ -ca_IT/ISO-8859-15 \ +-cmn_TW/UTF-8 \ -crh_UA/UTF-8 \ -cs_CZ.UTF-8/UTF-8 \ -cs_CZ/ISO-8859-2 \ @@ -248,6 +252,7 @@ -gv_GB.UTF-8/UTF-8 \ -gv_GB/ISO-8859-1 \ -ha_NG/UTF-8 \ +-hak_TW/UTF-8 \ -he_IL.UTF-8/UTF-8 \ -he_IL/ISO-8859-8 \ -hi_IN/UTF-8 \ @@ -308,6 +313,7 @@ -lt_LT/ISO-8859-13 \ -lv_LV.UTF-8/UTF-8 \ -lv_LV/ISO-8859-13 \ +-lzh_TW/UTF-8 \ -mag_IN/UTF-8 \ -mai_IN/UTF-8 \ -mg_MG.UTF-8/UTF-8 \ @@ -326,6 +332,7 @@ -mt_MT.UTF-8/UTF-8 \ -mt_MT/ISO-8859-3 \ -my_MM/UTF-8 \ +-nan_TW/UTF-8 \ -nan_TW@latin/UTF-8 \ -nb_NO.UTF-8/UTF-8 \ -nb_NO/ISO-8859-1 \ @@ -356,6 +363,8 @@ -pa_IN/UTF-8 \ -pa_PK/UTF-8 \ -pap_AN/UTF-8 \ +-pap_AW/UTF-8 \ +-pap_CW/UTF-8 \ -pl_PL.UTF-8/UTF-8 \ -pl_PL/ISO-8859-2 \ -ps_AF/UTF-8 \ @@ -364,6 +373,7 @@ -pt_PT.UTF-8/UTF-8 \ -pt_PT/ISO-8859-1 \ -pt_PT@euro/ISO-8859-15 \ +-quz_PE/UTF-8 \ -ro_RO.UTF-8/UTF-8 \ -ro_RO/ISO-8859-2 \ -ru_RU.UTF-8/UTF-8 \ @@ -418,6 +428,7 @@ -tg_TJ/KOI8-T \ -th_TH.UTF-8/UTF-8 \ -th_TH/TIS-620 \ +-the_NP/UTF-8 \ -ti_ER/UTF-8 \ -ti_ET/UTF-8 \ -tig_ER/UTF-8 \ diff -Nru armhf-cross-toolchain-base-1.103/debian/patches/eglibc/ubuntu/no-stack-protector.diff armhf-cross-toolchain-base-1.104/debian/patches/eglibc/ubuntu/no-stack-protector.diff --- armhf-cross-toolchain-base-1.103/debian/patches/eglibc/ubuntu/no-stack-protector.diff 2013-12-18 05:28:03.000000000 +0000 +++ armhf-cross-toolchain-base-1.104/debian/patches/eglibc/ubuntu/no-stack-protector.diff 2014-02-25 16:08:48.000000000 +0000 @@ -1,7 +1,7 @@ -Index: eglibc-2.17/debian/rules.d/build.mk +Index: eglibc-2.19/debian/rules.d/build.mk =================================================================== ---- eglibc-2.17.orig/debian/rules.d/build.mk -+++ eglibc-2.17/debian/rules.d/build.mk +--- eglibc-2.19.orig/debian/rules.d/build.mk 2014-02-25 16:08:38.981100812 +0000 ++++ eglibc-2.19/debian/rules.d/build.mk 2014-02-25 16:08:38.977100846 +0000 @@ -56,6 +56,8 @@ echo "libdir = $(call xx,libdir)" >> $(DEB_BUILDDIR)/configparms echo "slibdir = $(call xx,slibdir)" >> $(DEB_BUILDDIR)/configparms @@ -9,5 +9,5 @@ + echo "have-ssp = no" >> $(DEB_BUILDDIR)/configparms + echo "config-extra-cflags = -fno-stack-protector" >> $(DEB_BUILDDIR)/configparms - # Prevent autoconf from running unexpectedly by setting it to false. - # Also explicitly pass CC down - this is needed to get -m64 on + # Define the installation directory for all calls to make. This avoid + # broken glibc makefiles to spuriously trigger install rules trying to diff -Nru armhf-cross-toolchain-base-1.103/debian/patches/eglibc/ubuntu/no-symlinks-for-no-multiarch.patch armhf-cross-toolchain-base-1.104/debian/patches/eglibc/ubuntu/no-symlinks-for-no-multiarch.patch --- armhf-cross-toolchain-base-1.103/debian/patches/eglibc/ubuntu/no-symlinks-for-no-multiarch.patch 2013-12-18 03:07:00.000000000 +0000 +++ armhf-cross-toolchain-base-1.104/debian/patches/eglibc/ubuntu/no-symlinks-for-no-multiarch.patch 2014-02-25 16:08:58.000000000 +0000 @@ -2,11 +2,11 @@ debian/rules.d/build.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -Index: eglibc-2.17/debian/rules.d/build.mk +Index: eglibc-2.19/debian/rules.d/build.mk =================================================================== ---- eglibc-2.17.orig/debian/rules.d/build.mk -+++ eglibc-2.17/debian/rules.d/build.mk -@@ -265,6 +265,7 @@ +--- eglibc-2.19.orig/debian/rules.d/build.mk 2014-02-25 16:07:47.233545700 +0000 ++++ eglibc-2.19/debian/rules.d/build.mk 2014-02-25 16:08:54.000000000 +0000 +@@ -261,6 +261,7 @@ esac; \ fi @@ -14,7 +14,7 @@ # Create the ld.so symlink to the multiarch directory if [ $(curpass) = libc ]; then \ rtld_so="$$(LANG=C LC_ALL=C readelf -l debian/tmp-$(curpass)/usr/bin/iconv | grep 'interpreter' | sed -e 's/.*interpreter: \(.*\)]/\1/g')" ; \ -@@ -273,7 +274,8 @@ +@@ -269,7 +270,8 @@ target="$(call xx,slibdir)/$$(readlink debian/tmp-$(curpass)/$(call xx,slibdir)/$$rtld_so)" ; \ ln -s $$target $$link_name ; \ fi diff -Nru armhf-cross-toolchain-base-1.103/debian/patches/eglibc/ubuntu/stage1-passes.diff armhf-cross-toolchain-base-1.104/debian/patches/eglibc/ubuntu/stage1-passes.diff --- armhf-cross-toolchain-base-1.103/debian/patches/eglibc/ubuntu/stage1-passes.diff 2013-12-18 03:07:00.000000000 +0000 +++ armhf-cross-toolchain-base-1.104/debian/patches/eglibc/ubuntu/stage1-passes.diff 2014-02-25 16:08:53.000000000 +0000 @@ -1,9 +1,9 @@ Only in eglibc-2.16/debian/rules.d: .build.mk.swp -Index: eglibc-2.17/debian/rules.d/build.mk +Index: eglibc-2.19/debian/rules.d/build.mk =================================================================== ---- eglibc-2.17.orig/debian/rules.d/build.mk -+++ eglibc-2.17/debian/rules.d/build.mk -@@ -93,6 +93,7 @@ +--- eglibc-2.19.orig/debian/rules.d/build.mk 2014-02-25 16:08:38.957101018 +0000 ++++ eglibc-2.19/debian/rules.d/build.mk 2014-02-25 16:08:52.000000000 +0000 +@@ -99,6 +99,7 @@ $(stamp)build_%: $(stamp)configure_% @echo Building $(curpass) @@ -11,8 +11,8 @@ ifeq ($(DEB_BUILD_PROFILE),bootstrap) $(MAKE) cross-compiling=yes -C $(DEB_BUILDDIR) $(NJOBS) csu/subdir_lib else -@@ -120,10 +121,19 @@ - done ; \ +@@ -116,10 +117,19 @@ + symlinks -r -s -c $(CURDIR)/build-tree/locales-all/usr/lib/locale ; \ fi endif +else # stage1 @@ -31,7 +31,7 @@ @set -e ; \ if [ -n "$(findstring nocheck,$(DEB_BUILD_OPTIONS))" ]; then \ echo "Tests have been disabled via DEB_BUILD_OPTIONS." | tee $(log_results) ; \ -@@ -156,11 +166,15 @@ +@@ -152,11 +162,15 @@ echo "TEST SUMMARY $(log_test) ($$n matching lines)"; \ grep '^make.* Error' $(log_test) || true; \ echo "END TEST SUMMARY $(log_test)" @@ -47,7 +47,7 @@ rm -rf $(CURDIR)/debian/tmp-$(curpass) ifeq ($(DEB_BUILD_PROFILE),bootstrap) $(call logme, -a $(log_build), $(MAKE) -C $(DEB_BUILDDIR) $(NJOBS) \ -@@ -278,6 +292,40 @@ +@@ -274,6 +288,40 @@ $(call xx,extra_install) endif @@ -87,12 +87,12 @@ +endif # stage1 touch $@ - $(stamp)doc: $(stamp)patch -Index: eglibc-2.17/debian/rules.d/debhelper.mk + $(stamp)source: $(stamp)patch +Index: eglibc-2.19/debian/rules.d/debhelper.mk =================================================================== ---- eglibc-2.17.orig/debian/rules.d/debhelper.mk -+++ eglibc-2.17/debian/rules.d/debhelper.mk -@@ -199,6 +199,14 @@ +--- eglibc-2.19.orig/debian/rules.d/debhelper.mk 2014-02-25 16:08:38.957101018 +0000 ++++ eglibc-2.19/debian/rules.d/debhelper.mk 2014-02-25 16:08:38.953101053 +0000 +@@ -194,6 +194,14 @@ templates="libc-dev" ;\ pass="" ; \ suffix="" ;\ @@ -107,7 +107,7 @@ for t in $$templates ; do \ for s in debian/$$t$$pass.* ; do \ t=`echo $$s | sed -e "s#libc\(.*\)$$pass#$(libc)\1$$suffix#"` ; \ -@@ -208,12 +216,12 @@ +@@ -203,12 +211,12 @@ sed -e "s#TMPDIR#debian/tmp-$$curpass#g" -i $$t; \ sed -e "s#RTLDDIR#$$rtlddir#g" -i $$t; \ sed -e "s#SLIBDIR#$$slibdir#g" -i $$t; \ @@ -121,10 +121,10 @@ else $(patsubst %,debhelper_%,$(EGLIBC_PASSES)) :: debhelper_% : $(stamp)debhelper_% $(stamp)debhelper_%: $(stamp)debhelper-common $(stamp)install_% -Index: eglibc-2.17/debian/rules.d/stage1.mk +Index: eglibc-2.19/debian/rules.d/stage1.mk =================================================================== ---- eglibc-2.17.orig/debian/rules.d/stage1.mk -+++ eglibc-2.17/debian/rules.d/stage1.mk +--- eglibc-2.19.orig/debian/rules.d/stage1.mk 2014-02-25 16:08:38.957101018 +0000 ++++ eglibc-2.19/debian/rules.d/stage1.mk 2014-02-25 16:08:38.953101053 +0000 @@ -2,8 +2,8 @@ ifeq ($(DEB_STAGE),stage1) @@ -136,7 +136,7 @@ override DEB_INDEP_REGULAR_PACKAGES = override DEB_UDEB_PACKAGES = -@@ -31,43 +31,4 @@ +@@ -30,43 +30,4 @@ librt.a \ libutil.a \ diff -Nru armhf-cross-toolchain-base-1.103/debian/rules armhf-cross-toolchain-base-1.104/debian/rules --- armhf-cross-toolchain-base-1.103/debian/rules 2013-12-18 08:12:08.000000000 +0000 +++ armhf-cross-toolchain-base-1.104/debian/rules 2014-02-25 16:16:00.000000000 +0000 @@ -46,11 +46,11 @@ # default version of gcc which will be used VER_GCC_BASE := 4.7 else - MIN_VER_EGLIBC := 2.18-0~ - MIN_VER_LINUX := 3.12.0-0~ + MIN_VER_EGLIBC := 2.19-0~ + MIN_VER_LINUX := 3.13.0-0~ MIN_VER_GCC := 4.8.2-10 - MIN_VER_BINUTILS:= 2.23.2-0~ - VER_LINUX := 3.12.0 + MIN_VER_BINUTILS:= 2.24-0~ + VER_LINUX := 3.13.0 # default version of gcc which will be used VER_GCC_BASE := 4.8 endif @@ -120,7 +120,7 @@ info: @echo "Binutils version: ${VER_BINUTILS} ${DEB_VER_BINUTILS} ${PKG_VER_BINUTILS}" - @echo "GCC 4.7 version: ${VER_GCC} ${DEB_VER_GCC} ${VER_GCC_BASE}" + @echo "GCC version: ${VER_GCC} ${DEB_VER_GCC} ${VER_GCC_BASE}" @echo "Eglibc version: ${VER_EGLIBC} ${DEB_VER_EGLIBC}" @echo "Linux version: ${VER_LINUX} ${DEB_VER_LINUX}" @echo