diff --git a/tools/apertis-push-upstream-kernel b/tools/apertis-push-upstream-kernel index 152f9828e3296019c1b3b0ad7bb9692c7e6fbb76..16b674197a292ad64a33711b097218f763e9658c 100755 --- a/tools/apertis-push-upstream-kernel +++ b/tools/apertis-push-upstream-kernel @@ -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