Merge "debian: Add and patch python3-setuptools package"

This commit is contained in:
Zuul 2022-02-24 17:42:24 +00:00 committed by Gerrit Code Review
commit dce85a57fa
4 changed files with 40 additions and 0 deletions

View File

@ -55,6 +55,7 @@ ostree/initramfs-ostree
ostree/mttyexec
ostree/ostree
ostree/ostree-upgrade-mgr
python/python3-setuptools
security/keyrings.alt
security/python-keyring
security/shim-unsigned

View File

@ -0,0 +1,7 @@
---
debname: setuptools
debver: 52.0.0-4
archive: https://snapshot.debian.org/archive/debian/20210629T151153Z/pool/main/s/setuptools/
revision:
dist: $STX_DIST
PKG_GITREVCOUNT: true

View File

@ -0,0 +1,31 @@
From 70f8bcd677d9973193bba33b4ec45e3d09b57aab Mon Sep 17 00:00:00 2001
From: Dan Voiculeasa <dan.voiculeasa@windriver.com>
Date: Mon, 20 Dec 2021 14:24:46 +0200
Subject: [PATCH] Revert no-SOURCES.txt-in-egg-ingo.diff
Typo in upstream patchname aside, revert the upstream patch that
removes SOURCES.txt from egg.
Partial-Bug: https://bugs.launchpad.net/starlingx/+bug/1955648
Signed-off-by: Dan Voiculeasa <dan.voiculeasa@windriver.com>
---
setuptools/command/install_egg_info.py | 3 ---
1 file changed, 3 deletions(-)
diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py
index 5f405bc..76fb20e 100644
--- a/setuptools/command/install_egg_info.py
+++ b/setuptools/command/install_egg_info.py
@@ -72,9 +72,6 @@ class install_egg_info(namespaces.Installer, Command):
for skip in '.svn/', 'CVS/':
if src.startswith(skip) or '/' + skip in src:
return None
- if self.install_layout and self.install_layout in ['deb'] and src.startswith('SOURCES.txt'):
- log.info("Skipping SOURCES.txt")
- return None
self.outputs.append(dst)
log.debug("Copying %s to %s", src, dst)
return dst
--
2.30.0

View File

@ -0,0 +1 @@
0001-Revert-no-SOURCES.txt-in-egg-ingo.diff.patch