From 39b0830a661a691f9412a1a8b94798d96676e3c2 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Mon, 8 May 2023 15:36:24 +0200 Subject: [PATCH] Extract manifest from packaging image Also include manifest.txt with, for example, version info when extracting packages from the packagin image. Signed-off-by: Evan Lezar --- scripts/pull-packages.sh | 2 +- scripts/release-packages.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/pull-packages.sh b/scripts/pull-packages.sh index f62e0bb4..f13750ee 100755 --- a/scripts/pull-packages.sh +++ b/scripts/pull-packages.sh @@ -55,4 +55,4 @@ docker run --rm \ -u $(id -u):$(id -g) \ --entrypoint="bash" \ ${IMAGE} \ - -c "cp -R /artifacts/packages/* ${DIST_DIR}" + -c "cp --preserve=timestamps -R /artifacts/* ${DIST_DIR}" diff --git a/scripts/release-packages.sh b/scripts/release-packages.sh index c82e6a5f..ea0ebb23 100755 --- a/scripts/release-packages.sh +++ b/scripts/release-packages.sh @@ -189,7 +189,7 @@ git -C ${PACKAGE_REPO_ROOT} reset --hard ${UPSTREAM_REFERENCE} git -C ${PACKAGE_REPO_ROOT} clean -fdx ${REPO} for target in ${targets[@]}; do - sync ${target} ${PACKAGE_CACHE} ${PACKAGE_REPO_ROOT}/${REPO} + sync ${target} ${PACKAGE_CACHE}/packages ${PACKAGE_REPO_ROOT}/${REPO} done git -C ${PACKAGE_REPO_ROOT} add ${REPO}