3 files changed, 22 insertions, 14 deletions

diff --git a/meta-python/recipes-devtools/python/python-django.inc b/meta-python/recipes-devtools/python/python-django.inc
index e030ff4087..7021eb842d 100644
--- a/meta-python/recipes-devtools/python/python-django.inc
+++ b/meta-python/recipes-devtools/python/python-django.inc
@@ -3,7 +3,11 @@ HOMEPAGE = "http://www.djangoproject.com/"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f09eb47206614a4954c51db8a94840fa"
 
-PYPI_PACKAGE = "Django"
+# From 4.2.21 onwards package name changed to "django". This common include file
+# is used across 2.x, 3.x and 4.x variants hence making this as a weak variable 
+# which can be overwritten in 4.x recipe
+PYPI_PACKAGE ?= "Django"
+
 inherit pypi
 
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/"
diff --git a/meta-python/recipes-devtools/python/python3-django_4.2.17.bb b/meta-python/recipes-devtools/python/python3-django_4.2.17.bb
deleted file mode 100644
index dfce4b85c2..0000000000
--- a/meta-python/recipes-devtools/python/python3-django_4.2.17.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require python-django.inc
-inherit setuptools3
-
-SRC_URI[sha256sum] = "6b56d834cc94c8b21a8f4e775064896be3b4a4ca387f2612d4406a5927cd2fdc"
-
-RDEPENDS:${PN} += "\
-    ${PYTHON_PN}-sqlparse \
-"
-
-# Set DEFAULT_PREFERENCE so that the LTS version of django is built by
-# default. To build the 4.x branch, 
-# PREFERRED_VERSION_python3-django = "4.2.17" can be added to local.conf
-DEFAULT_PREFERENCE = "-1"
diff --git a/meta-python/recipes-devtools/python/python3-django_4.2.26.bb b/meta-python/recipes-devtools/python/python3-django_4.2.26.bb
new file mode 100644
index 0000000000..7f0b1c9239
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-django_4.2.26.bb
@@ -0,0 +1,17 @@
+require python-django.inc
+#From 4.2.22 onwards setuptools configuration migrated to pyproject.toml
+inherit pypi python_setuptools_build_meta
+
+SRC_URI[sha256sum] = "9398e487bcb55e3f142cb56d19fbd9a83e15bb03a97edc31f408361ee76d9d7a"
+
+RDEPENDS:${PN} += "\
+    ${PYTHON_PN}-sqlparse \
+"
+
+# PYPI package name changed from Django -> django
+PYPI_PACKAGE = "django"
+
+# Set DEFAULT_PREFERENCE so that the LTS version of django is built by
+# default. To build the 4.x branch, 
+# PREFERRED_VERSION_python3-django = "4.2.26" can be added to local.conf
+DEFAULT_PREFERENCE = "-1"