Skip to content
Snippets Groups Projects
Commit 8bc777fc authored by Dylan Aïssi's avatar Dylan Aïssi
Browse files

apertis-push-upstream-kernel: use pristine-lfs instead of its wrapper import-tarballs


Signed-off-by: default avatarDylan Aïssi <dylan.aissi@collabora.com>
parent 725f51bf
No related branches found
No related tags found
2 merge requests!89Draft: Backport v2024 <- v2025pre: Release apertis-dev-tools version 0.2024.10,!80apertis-push-upstream-kernel: use pristine-lfs instead of its wrapper import-tarballs
This commit is part of merge request !80. Comments created here will be created in the context of that merge request.
......@@ -14,7 +14,6 @@
set -xe
BUILD_DIR=$(mktemp -d)
PACKAGING_TOOLS_DIR=$(mktemp -d)
# Print script usage
print_usage() {
......@@ -79,15 +78,11 @@ update_pristine_lfs() {
--git-export-dir="${BUILD_DIR}" \
--no-sign -us -S
git clone \
https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.apertis.org/infrastructure/packaging-tools.git \
${PACKAGING_TOOLS_DIR}
# Update pristine-lfs branch
git fetch --depth=1 origin pristine-lfs
git branch pristine-lfs origin/pristine-lfs
${PACKAGING_TOOLS_DIR}/import-tarballs "${BUILD_DIR}/linux_${APERTIS_VERSION}.dsc"
pristine-lfs -v import-dsc "${BUILD_DIR}/linux_${APERTIS_VERSION}.dsc"
}
# Push new local branch and create the merge request for the -security branches
......@@ -129,7 +124,7 @@ create_merge_requests() {
cleanup() {
# Remove temporary folders
rm -fr "${PACKAGING_TOOLS_DIR}" "${BUILD_DIR}"
rm -fr "${BUILD_DIR}"
# Go back to the previous folder
popd
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment