From 111030f748d8e92ee0a9d9d1d990cf533697dfa9 Mon Sep 17 00:00:00 2001 From: sharang bhardwaj Date: Wed, 3 Dec 2025 03:59:52 -0500 Subject: [PATCH] Update distributedcloud-client for bullseye/Trixie Aligned the package layout with the concurrent Debian packaging conventions. Moved package files under 'debian/all/' to avoid duplication across OS builds and removed legacy paths under 'debian/'. Updated related build references to ensure compatibility across all supported OS codenames. Test-Plan: PASS: master bullseye build PASS: AIO-SX deploy Story: 2011360 Task: 53415 Change-Id: If31027bef00fbb12cfd101064e7fc1d8fc5f8d40 Signed-off-by: sharang bhardwaj --- debian_iso_image.inc => debian_bullseye_iso_image_std.inc | 0 debian_pkg_dirs => debian_bullseye_pkg_dirs_std | 0 debian_trixie_iso_image_std.inc | 4 ++++ debian_trixie_pkg_dirs_std | 1 + distributedcloud-client/debian/{ => all}/deb_folder/changelog | 0 distributedcloud-client/debian/{ => all}/deb_folder/control | 0 distributedcloud-client/debian/{ => all}/deb_folder/copyright | 0 .../distributedcloud-client-dcmanagerclient.install | 0 .../deb_folder/distributedcloud-client-wheels.install | 0 distributedcloud-client/debian/{ => all}/deb_folder/rules | 0 .../debian/{ => all}/deb_folder/source/format | 0 distributedcloud-client/debian/{ => all}/meta_data.yaml | 0 12 files changed, 5 insertions(+) rename debian_iso_image.inc => debian_bullseye_iso_image_std.inc (100%) rename debian_pkg_dirs => debian_bullseye_pkg_dirs_std (100%) create mode 100644 debian_trixie_iso_image_std.inc create mode 100644 debian_trixie_pkg_dirs_std rename distributedcloud-client/debian/{ => all}/deb_folder/changelog (100%) rename distributedcloud-client/debian/{ => all}/deb_folder/control (100%) rename distributedcloud-client/debian/{ => all}/deb_folder/copyright (100%) rename distributedcloud-client/debian/{ => all}/deb_folder/distributedcloud-client-dcmanagerclient.install (100%) rename distributedcloud-client/debian/{ => all}/deb_folder/distributedcloud-client-wheels.install (100%) rename distributedcloud-client/debian/{ => all}/deb_folder/rules (100%) rename distributedcloud-client/debian/{ => all}/deb_folder/source/format (100%) rename distributedcloud-client/debian/{ => all}/meta_data.yaml (100%) diff --git a/debian_iso_image.inc b/debian_bullseye_iso_image_std.inc similarity index 100% rename from debian_iso_image.inc rename to debian_bullseye_iso_image_std.inc diff --git a/debian_pkg_dirs b/debian_bullseye_pkg_dirs_std similarity index 100% rename from debian_pkg_dirs rename to debian_bullseye_pkg_dirs_std diff --git a/debian_trixie_iso_image_std.inc b/debian_trixie_iso_image_std.inc new file mode 100644 index 00000000..cbda5493 --- /dev/null +++ b/debian_trixie_iso_image_std.inc @@ -0,0 +1,4 @@ +# List of packages to be included/installed in ISO + +#distributedcloud-client +distributedcloud-client-dcmanagerclient diff --git a/debian_trixie_pkg_dirs_std b/debian_trixie_pkg_dirs_std new file mode 100644 index 00000000..b6de7442 --- /dev/null +++ b/debian_trixie_pkg_dirs_std @@ -0,0 +1 @@ +distributedcloud-client diff --git a/distributedcloud-client/debian/deb_folder/changelog b/distributedcloud-client/debian/all/deb_folder/changelog similarity index 100% rename from distributedcloud-client/debian/deb_folder/changelog rename to distributedcloud-client/debian/all/deb_folder/changelog diff --git a/distributedcloud-client/debian/deb_folder/control b/distributedcloud-client/debian/all/deb_folder/control similarity index 100% rename from distributedcloud-client/debian/deb_folder/control rename to distributedcloud-client/debian/all/deb_folder/control diff --git a/distributedcloud-client/debian/deb_folder/copyright b/distributedcloud-client/debian/all/deb_folder/copyright similarity index 100% rename from distributedcloud-client/debian/deb_folder/copyright rename to distributedcloud-client/debian/all/deb_folder/copyright diff --git a/distributedcloud-client/debian/deb_folder/distributedcloud-client-dcmanagerclient.install b/distributedcloud-client/debian/all/deb_folder/distributedcloud-client-dcmanagerclient.install similarity index 100% rename from distributedcloud-client/debian/deb_folder/distributedcloud-client-dcmanagerclient.install rename to distributedcloud-client/debian/all/deb_folder/distributedcloud-client-dcmanagerclient.install diff --git a/distributedcloud-client/debian/deb_folder/distributedcloud-client-wheels.install b/distributedcloud-client/debian/all/deb_folder/distributedcloud-client-wheels.install similarity index 100% rename from distributedcloud-client/debian/deb_folder/distributedcloud-client-wheels.install rename to distributedcloud-client/debian/all/deb_folder/distributedcloud-client-wheels.install diff --git a/distributedcloud-client/debian/deb_folder/rules b/distributedcloud-client/debian/all/deb_folder/rules similarity index 100% rename from distributedcloud-client/debian/deb_folder/rules rename to distributedcloud-client/debian/all/deb_folder/rules diff --git a/distributedcloud-client/debian/deb_folder/source/format b/distributedcloud-client/debian/all/deb_folder/source/format similarity index 100% rename from distributedcloud-client/debian/deb_folder/source/format rename to distributedcloud-client/debian/all/deb_folder/source/format diff --git a/distributedcloud-client/debian/meta_data.yaml b/distributedcloud-client/debian/all/meta_data.yaml similarity index 100% rename from distributedcloud-client/debian/meta_data.yaml rename to distributedcloud-client/debian/all/meta_data.yaml