Skip to contentSkip to conversation

Backport a few dependency clean ups from master

PATCH In review Guðni Már Gilbert 1 participant 6 messages Dec 8, 2024

lore
Share & tools
lore
#0 lore raw

cover Backport a few dependency clean ups from master

Guðni Már Gilbert (4):
systemd: drop intltool-native from DEPENDS
systemd-boot: drop intltool-native from DEPENDS
python3-poetry-core: drop python3-six from RDEPENDS
dnf: drop python3-iniparse from DEPENDS and RDEPENDS

 meta/recipes-core/systemd/systemd-boot_255.13.bb          | 2 +-
 meta/recipes-core/systemd/systemd_255.13.bb               | 2 +-
 meta/recipes-devtools/dnf/dnf_4.19.0.bb                   | 3 +--
 meta/recipes-devtools/python/python3-poetry-core_1.9.0.bb | 1 -
 4 files changed, 3 insertions(+), 5 deletions(-)
Signature · 1 line
2.43.0
#1 lore raw

PATCH 1/4 systemd: drop intltool-native from DEPENDS

intltool was dropped as a dependency in v236
See commit for reference:
https://github.com/systemd/systemd/pull/7313/commits/c81217920effddc93fb780cf8f9eb699d6fe1319

---
 meta/recipes-core/systemd/systemd_255.13.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/systemd/systemd_255.13.bb +1 -1
index 0ccca8a567..fa3ad1d2cd 100644
@@ -4,7 +4,7 @@ PROVIDES = "udev"
 
 PE = "1"
 
-DEPENDS = "intltool-native gperf-native libcap util-linux python3-jinja2-native"
+DEPENDS = "gperf-native libcap util-linux python3-jinja2-native"
 
 SECTION = "base/shell"
 
Signature · 1 line
2.43.0
#2 lore raw

PATCH 2/4 systemd-boot: drop intltool-native from DEPENDS

In reply to Guðni Már Gilbert

intltool was dropped as a dependency in v236
See commit for reference:
https://github.com/systemd/systemd/pull/7313/commits/c81217920effddc93fb780cf8f9eb699d6fe1319

---
 meta/recipes-core/systemd/systemd-boot_255.13.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/systemd/systemd-boot_255.13.bb +1 -1
index 4ee25ee72f..397316fe9b 100644
@@ -3,7 +3,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemd:"
 
 require conf/image-uefi.conf
 
-DEPENDS = "intltool-native libcap util-linux gperf-native python3-jinja2-native python3-pyelftools-native"
+DEPENDS = "libcap util-linux gperf-native python3-jinja2-native python3-pyelftools-native"
 
 inherit meson pkgconfig gettext
 inherit deploy
Signature · 1 line
2.43.0
#3 lore raw

PATCH 3/4 python3-poetry-core: drop python3-six from RDEPENDS

In reply to Guðni Már Gilbert

Looking at the history, python3-six was removed as a dependency in the poetry.lock file in v1.5.2

Even before v1.5.2 and until now (v1.9.1) there is no code in the package which imports the six module. So it can be safely dropped from the recipe.

---
 meta/recipes-devtools/python/python3-poetry-core_1.9.0.bb | 1 -
 1 file changed, 1 deletion(-)
meta/recipes-devtools/python/python3-poetry-core_1.9.0.bb +0 -1
index 540fdffaed..d1a8b939c0 100644
@@ -36,7 +36,6 @@ RDEPENDS:${PN}:append:class-target = "\
 
 RDEPENDS:${PN} += "\
     python3-pip \
-    python3-six \
 "
 
 BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.43.0
#4 lore raw

PATCH 4/4 dnf: drop python3-iniparse from DEPENDS and RDEPENDS

In reply to Guðni Már Gilbert

python3-iniparse dependency was dropped 2019, see the following commit as reference:
https://github.com/rpm-software-management/dnf/pull/1329/commits/d7d0e0e2f9d8c7d021c794821ad0b56a39ebc01f

When looking at the Git history, this happened around tag 4.2.1

---
 meta/recipes-devtools/dnf/dnf_4.19.0.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
meta/recipes-devtools/dnf/dnf_4.19.0.bb +1 -2
index 37a2cc7de2..9c7c59818e 100644
@@ -27,7 +27,7 @@ S = "${WORKDIR}/git"
 
 inherit cmake gettext bash-completion setuptools3-base systemd
 
-DEPENDS += "libdnf librepo libcomps python3-iniparse"
+DEPENDS += "libdnf librepo libcomps"
 
 # manpages generation requires http://www.sphinx-doc.org/
 EXTRA_OECMAKE = " -DWITH_MAN=0 -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3"
@@ -49,7 +49,6 @@ RDEPENDS:${PN} += " \
   python3-sqlite3 \
   python3-compression \
   python3-rpm \
-  python3-iniparse \
   python3-json \
   python3-curses \
   python3-misc \
Signature · 1 line
2.43.0