Regenerate configure.patch, which hardcoded version 3.25.8 and had stale context, so it applies without fuzz.
Signed-off-by: Khem Raj <[email protected]> --- meta-oe/recipes-extended/hplip/hplip/configure.patch | 8 ++++---- .../hplip/{hplip_3.25.8.bb => hplip_3.26.4.bb} | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) rename meta-oe/recipes-extended/hplip/{hplip_3.25.8.bb => hplip_3.26.4.bb} (97%) diff --git a/meta-oe/recipes-extended/hplip/hplip/configure.patch b/meta-oe/recipes-extended/hplip/hplip/configure.patch index 9dad089ff1..85df6aad60 100644 --- a/meta-oe/recipes-extended/hplip/hplip/configure.patch +++ b/meta-oe/recipes-extended/hplip/hplip/configure.patch @@ -2,12 +2,12 @@ Upstream-Status: Pending --- a/configure.in +++ b/configure.in -@@ -30,7 +30,7 @@ - AC_INIT([HP Linux Imaging and Printing], [3.25.8], [3.25.8], [hplip]) - +@@ -32,7 +32,7 @@ AC_INIT([HP Linux Imaging and Printing], [3.26.4], [3.26.4], [hplip]) + + #AM_INIT_AUTOMAKE([1.9 foreign]) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([foreign]) AC_DISABLE_STATIC - + # Checks for programs. diff --git a/meta-oe/recipes-extended/hplip/hplip_3.25.8.bb b/meta-oe/recipes-extended/hplip/hplip_3.26.4.bb similarity index 97% rename from meta-oe/recipes-extended/hplip/hplip_3.25.8.bb rename to meta-oe/recipes-extended/hplip/hplip_3.26.4.bb index 3b5f58f320..f383a3f062 100644 --- a/meta-oe/recipes-extended/hplip/hplip_3.25.8.bb +++ b/meta-oe/recipes-extended/hplip/hplip_3.26.4.bb @@ -16,7 +16,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \ file://0001-Fix-installing-ipp-usb-quirk.patch \ file://0001-Drop-using-register-storage-classifier.patch \ file://0001-Fix-upstream-CFLAGS-override.patch" -SRC_URI[sha256sum] = "1cf6d6c28735435c8eb6646e83bcfb721e51c4b1f0e8cf9105a6faf96dc9ad25" +SRC_URI[sha256sum] = "b9c61252754f35b4a237396ca8961e7b3e0c56db76d66a6712b7bf3e30e69463" CVE_PRODUCT = "hplip linux_imaging_and_printing"
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#127859): https://lists.openembedded.org/g/openembedded-devel/message/127859 Mute This Topic: https://lists.openembedded.org/mt/120013656/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
