diff options
-rw-r--r-- | recipes-extended/cloud-init/cloud-init/0001-setup.py-check-for-install-anywhere-in-args.patch | 4 | ||||
-rw-r--r-- | recipes-extended/cloud-init/cloud-init_git.bb | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/recipes-extended/cloud-init/cloud-init/0001-setup.py-check-for-install-anywhere-in-args.patch b/recipes-extended/cloud-init/cloud-init/0001-setup.py-check-for-install-anywhere-in-args.patch index cc2914c9..e5b214fe 100644 --- a/recipes-extended/cloud-init/cloud-init/0001-setup.py-check-for-install-anywhere-in-args.patch +++ b/recipes-extended/cloud-init/cloud-init/0001-setup.py-check-for-install-anywhere-in-args.patch | |||
@@ -22,11 +22,11 @@ Index: git/setup.py | |||
22 | =================================================================== | 22 | =================================================================== |
23 | --- git.orig/setup.py | 23 | --- git.orig/setup.py |
24 | +++ git/setup.py | 24 | +++ git/setup.py |
25 | @@ -98,7 +98,7 @@ | 25 | @@ -60,7 +60,7 @@ |
26 | that files are different outside of the debian directory.""" | 26 | that files are different outside of the debian directory.""" |
27 | 27 | ||
28 | # newer versions just use install. | 28 | # newer versions just use install. |
29 | - if not (sys.argv[1] == "install"): | 29 | - if "install" not in sys.argv: |
30 | + if not ('install' in sys.argv or sys.argv[1].startswith('bdist*')): | 30 | + if not ('install' in sys.argv or sys.argv[1].startswith('bdist*')): |
31 | return template | 31 | return template |
32 | 32 | ||
diff --git a/recipes-extended/cloud-init/cloud-init_git.bb b/recipes-extended/cloud-init/cloud-init_git.bb index edc6372f..390797b7 100644 --- a/recipes-extended/cloud-init/cloud-init_git.bb +++ b/recipes-extended/cloud-init/cloud-init_git.bb | |||
@@ -7,13 +7,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c6dd79b6ec2130a3364f6fa9d6380408 \ | |||
7 | file://LICENSE-Apache2.0;md5=3b83ef96387f14655fc854ddc3c6bd57 \ | 7 | file://LICENSE-Apache2.0;md5=3b83ef96387f14655fc854ddc3c6bd57 \ |
8 | " | 8 | " |
9 | 9 | ||
10 | SRCREV = "293c6546f038ef4da98910dfeb8d0ade65707952" | 10 | SRCREV = "2c452ebfb86d2007d81dcbd986adf1e4cdc6a7f3" |
11 | SRC_URI = "git://github.com/canonical/cloud-init;branch=23.2.x;protocol=https \ | 11 | SRC_URI = "git://github.com/canonical/cloud-init;branch=23.4.x;protocol=https \ |
12 | file://cloud-init-source-local-lsb-functions.patch \ | 12 | file://cloud-init-source-local-lsb-functions.patch \ |
13 | file://0001-setup.py-check-for-install-anywhere-in-args.patch \ | 13 | file://0001-setup.py-check-for-install-anywhere-in-args.patch \ |
14 | " | 14 | " |
15 | 15 | ||
16 | PV = "v23.2.2+git" | 16 | PV = "v23.4.1+git" |
17 | 17 | ||
18 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
19 | 19 | ||