From 421f8b35b1b61b5f5d4bffe641b3878d2306ec2f Mon Sep 17 00:00:00 2001 From: Yue Tao Date: Mon, 26 Feb 2024 07:21:25 +0000 Subject: [PATCH] integ: update some source packages due to Bookworm uprev lsb: move to 11.6 puppet: keep the original version, but need to download it via curl rather than apt download After applying this patch, the downloader can be executed succesfully. TestPlan: PASS: ./stx-init-env --rebuild --cache PASS: stx shell PASS: downloader Story: 2011048 Task: 49685 Depends-on: https://review.opendev.org/c/starlingx/tools/+/911693 Signed-off-by: Yue Tao Signed-off-by: Zhixiong Chi Change-Id: Icd20782dbb901c3bd0e321889af1a4ba2d3e2c65 --- base/lsb/debian/meta_data.yaml | 4 ++-- config/puppet-5.5.22/debian/dl_hook | 26 ++++++++++++++++++++++ config/puppet-5.5.22/debian/meta_data.yaml | 17 ++++++++++++++ 3 files changed, 45 insertions(+), 2 deletions(-) create mode 100755 config/puppet-5.5.22/debian/dl_hook diff --git a/base/lsb/debian/meta_data.yaml b/base/lsb/debian/meta_data.yaml index 48242fc7c..6618ee1cb 100644 --- a/base/lsb/debian/meta_data.yaml +++ b/base/lsb/debian/meta_data.yaml @@ -1,7 +1,7 @@ --- debname: lsb -debver: 11.1.0 -achive: https://snapshot.debian.org/archive/debian/20210103T144403Z/pool/main/l/lsb/ +debver: 11.6 +achive: https://snapshot.debian.org/archive/debian/20231001T025741Z/pool/main/l/lsb/ revision: dist: $STX_DIST PKG_GITREVCOUNT: true diff --git a/config/puppet-5.5.22/debian/dl_hook b/config/puppet-5.5.22/debian/dl_hook new file mode 100755 index 000000000..66e82d28b --- /dev/null +++ b/config/puppet-5.5.22/debian/dl_hook @@ -0,0 +1,26 @@ +#!/bin/bash +# +# Copyright (c) 2022 Wind River Systems, Inc. +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. The ASF licenses this +# file to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +# The only parameter is the name of the folder where the source code +# is extracted to. Pay attention to that the extracted package should +# be put at the same path where this script is located. +# Tools needed: tar + +dpkg-source -x puppet_5.5.22-2.dsc diff --git a/config/puppet-5.5.22/debian/meta_data.yaml b/config/puppet-5.5.22/debian/meta_data.yaml index 54bb1976f..edc727c8b 100644 --- a/config/puppet-5.5.22/debian/meta_data.yaml +++ b/config/puppet-5.5.22/debian/meta_data.yaml @@ -1,6 +1,23 @@ --- debname: puppet debver: 5.5.22-2 +dl_hook: dl_hook +dl_files: + puppet_5.5.22-2.dsc: + topdir: null + url: + https://snapshot.debian.org/archive/debian/20221007T085526Z/pool/main/p/puppet/puppet_5.5.22-2.dsc + sha256sum: a04db8d58d677042177f5b4ada6dca5008589f03b861c716833593a34a3301c5 + puppet_5.5.22.orig.tar.gz: + topdir: null + url: + https://snapshot.debian.org/archive/debian/20221007T085526Z/pool/main/p/puppet/puppet_5.5.22.orig.tar.gz + sha256sum: 2f7c68887f823a4b1f25c810702faf730779d5347d16bb604666f3c445ccc0ed + puppet_5.5.22-2.debian.tar.xz: + topdir: null + url: + https://snapshot.debian.org/archive/debian/20221007T085526Z/pool/main/p/puppet/puppet_5.5.22-2.debian.tar.xz + sha256sum: 0a8dd4333db310e86436d5afb0a15b4f219236c0ebb5cddb3d39d0558647ef7e revision: dist: $STX_DIST PKG_GITREVCOUNT: true