Merge pull request #1708 from flatcar-linux/krnowak/pkg-updates-2019

Profile cleanups for updated packages from 2019

sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/afterburn-9999.ebuild

@@ -1,7 +1,7 @@
 # Copyright (c) 2017 CoreOS, Inc.. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 CROS_WORKON_PROJECT="flatcar-linux/afterburn"
 CROS_WORKON_LOCALNAME="afterburn"
@@ -14,14 +14,6 @@ else
 	KEYWORDS="amd64 arm64"
 fi
 
-inherit coreos-cargo cros-workon systemd
-
-DESCRIPTION="A tool for collecting instance metadata from various providers"
-HOMEPAGE="https://github.com/flatcar-linux/afterburn"
-LICENSE="Apache-2.0"
-SLOT="0"
-RDEPEND="!coreos-base/coreos-metadata"
-
 # sed -n 's/^"checksum \([^ ]*\) \([^ ]*\) .*/\1-\2/p' Cargo.lock
 CRATES="
 adler32-1.0.3
@@ -234,8 +226,22 @@ ws2_32-sys-0.2.1
 xml-rs-0.3.6
 "
 
+inherit coreos-cargo cros-workon systemd
+
+DESCRIPTION="A tool for collecting instance metadata from various providers"
+HOMEPAGE="https://github.com/flatcar-linux/afterburn"
 SRC_URI="$(cargo_crate_uris ${CRATES})"
 
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-libs/openssl:0="
+
+RDEPEND="
+	${DEPEND}
+	!coreos-base/coreos-metadata
+"
+
 src_unpack() {
 	cros-workon_src_unpack "$@"
 	coreos-cargo_src_unpack "$@"

sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-9999.ebuild

@@ -1,7 +1,7 @@
 # Copyright (c) 2017 CoreOS, Inc.. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 CROS_WORKON_PROJECT="flatcar-linux/update-ssh-keys"
 CROS_WORKON_LOCALNAME="update-ssh-keys"
@@ -14,17 +14,6 @@ else
 	KEYWORDS="amd64 arm64"
 fi
 
-inherit coreos-cargo cros-workon
-
-DESCRIPTION="Utility for managing OpenSSH authorized public keys"
-HOMEPAGE="https://github.com/flatcar-linux/update-ssh-keys"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-# make sure we have a new enough coreos-init that we won't conflict with the
-# old bash script
-RDEPEND="!<coreos-base/coreos-init-0.0.1-r152"
-
 # sed -n 's/^"checksum \([^ ]*\) \([^ ]*\) .*/\1-\2/p' Cargo.lock
 CRATES="
 ansi_term-0.11.0
@@ -60,8 +49,19 @@ winapi-i686-pc-windows-gnu-0.4.0
 winapi-x86_64-pc-windows-gnu-0.4.0
 "
 
+inherit coreos-cargo cros-workon
+
+DESCRIPTION="Utility for managing OpenSSH authorized public keys"
+HOMEPAGE="https://github.com/flatcar-linux/update-ssh-keys"
 SRC_URI="$(cargo_crate_uris ${CRATES})"
 
+LICENSE="Apache-2.0"
+SLOT="0"
+
+# make sure we have a new enough coreos-init that we won't conflict with the
+# old bash script
+RDEPEND="!<coreos-base/coreos-init-0.0.1-r152"
+
 src_unpack() {
 	cros-workon_src_unpack "$@"
 	coreos-cargo_src_unpack "$@"

sdk_container/src/third_party/coreos-overlay/eclass/coreos-cargo.eclass

@@ -76,15 +76,36 @@ coreos-cargo_src_unpack() {
 
 	# Compile for the built-in target, using the SDK cross-tools.
 	export RUST_TARGET=$(rust_builtin_target "${CHOST}")
-	cat <<- EOF >> "${ECARGO_HOME}/config"
-
-	[build]
-	target = "${RUST_TARGET}"
-
-	[target.${RUST_TARGET}]
-	ar = "${TARGET_AR}"
-	linker = "${TARGET_CC}"
-	EOF
+	local -a config_lines
+	local build_amended=0
+	local target_rust_target_amended=0
+	local REPLY
+	readonly b_header='[build]'
+	readonly t_header="[target.${RUST_TARGET}]"
+	readonly target_line="target = \"${RUST_TARGET}\""
+	readonly ar_line="ar = \"${TARGET_AR}\""
+	readonly linker_line="linker = \"${TARGET_CC}\""
+	while read -r; do
+		config_lines+=("${REPLY}")
+		case "${REPLY}" in
+			"${b_header}")
+				config_lines+=("${target_line}")
+				build_amended=1
+				;;
+			"${t_header}")
+				config_lines+=("${ar_line}")
+				config_lines+=("${linker_line}")
+				target_rust_target_amended=1
+				;;
+		esac
+	done <"${ECARGO_HOME}/config"
+	if [[ "${build_amended}" -eq 0 ]]; then
+	    config_lines+=('' "${b_header}" "${target_line}")
+	fi
+	if [[ "${target_rust_target_amended}" -eq 0 ]]; then
+	    config_lines+=('' "${t_header}" "${ar_line}" "${linker_line}")
+	fi
+	printf '%s\n' "${config_lines[@]}" >"${ECARGO_HOME}/config"
 }
 
 fi

sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords

@@ -5,11 +5,10 @@
 =app-emulation/open-vmdk-1.0 *
 =app-crypt/rhash-1.4.2 ~arm64
 
-=app-misc/jq-1.6-r3 ~arm64
 =dev-embedded/u-boot-tools-2021.04_rc2 ~arm64
 
 # needed by arm64-native SDK
-=dev-lang/nasm-2.14.02 *
+=dev-lang/nasm-2.15.05 ~arm64
 
 =dev-lang/yasm-1.3.0-r1 ~arm64