Merge pull request #1570 from flatcar/krnowak/weekly-fixes-2

Fixes for weekly updates fallout

sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-apps/texinfo

@@ -0,0 +1,7 @@
+# texinfo checks if iconv converts EUC-CN encoding to UTF-8. It does
+# it by compiling and running a test program, which obviously won't
+# fly during cross-compilation. On SDK (for which a native compilation
+# is done) the conversion does not happen, so we parrot it for the
+# cross-compilation case too.
+
+export texinfo_cv_sys_iconv_converts_euc_cn='no'

sdk_container/src/third_party/coreos-overlay/coreos/user-patches/net-dialup/lrzsz/0001-no-nls-fix.patch

@@ -0,0 +1,15 @@
+diff -r -u lrzsz-0.12.20/configure.in lrzsz-0.12.20-patched/configure.in
+--- lrzsz-0.12.20/configure.in	2024-01-09 10:51:43.460543006 -0000
++++ lrzsz-0.12.20-patched/configure.in	2024-01-09 10:57:32.001193035 -0000
+@@ -263,6 +263,11 @@
+ AC_SUBST(LDFLAGS)
+ AC_SUBST(LIBS)
+ 
++# a workaround for not AC_SUBSTed USE_INCLUDED_LIBINTL when disable-nls is passed
++if test "x${USE_NLS}" = xno ; then
++	USE_INCLUDED_LIBINTL=no
++	AC_SUBST(USE_INCLUDED_LIBINTL)
++fi
+ 
+ AC_DEFINE_UNQUOTED(LOCALEDIR,"$prefix/$DATADIRNAME", [LOCALEDIR])
+ AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)

sdk_container/src/third_party/coreos-overlay/coreos/user-patches/net-dialup/lrzsz/README.md

@@ -0,0 +1,3 @@
+This patch should be upstreamed to Gentoo to fix build issues when nls
+USE flag is masked (nls is used for internationalization). I think it
+happens only when our SDK also has nls USE flag disabled.

sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults

@@ -130,3 +130,6 @@ BINPKG_COMPRESS=bzip2
 
 # Enable cgo by default. Required for the docker device-mapper driver to compile.
 CGO_ENABLED=1
+
+# Keep using old binary format for now.
+BINPKG_FORMAT=xpak