From e5cd8b0c37481cc60eb302a47e628bbd8eb8bb18 Mon Sep 17 00:00:00 2001 From: Gyorgy Sarvari Date: Thu, 5 Feb 2026 18:07:25 +0100 Subject: media-types: fix RPROVIDES Instead of PROVIDING mime-support, it should RPROVIDE the same package. It allows adding "mime-support" to IMAGE_INSTALL to get a similar behavior than before mime-support recipe was split into two differently named recipes. Also, rename the recipe's folder to match the recipe name. Signed-off-by: Gyorgy Sarvari Signed-off-by: Khem Raj --- .../media-types/media-types_14.0.0.bb | 41 ++++++++++++++++++++++ .../mime-support/media-types_14.0.0.bb | 39 -------------------- 2 files changed, 41 insertions(+), 39 deletions(-) create mode 100644 meta-oe/recipes-support/media-types/media-types_14.0.0.bb delete mode 100644 meta-oe/recipes-support/mime-support/media-types_14.0.0.bb diff --git a/meta-oe/recipes-support/media-types/media-types_14.0.0.bb b/meta-oe/recipes-support/media-types/media-types_14.0.0.bb new file mode 100644 index 0000000000..af91a584bd --- /dev/null +++ b/meta-oe/recipes-support/media-types/media-types_14.0.0.bb @@ -0,0 +1,41 @@ +SECTION = "base" +SUMMARY = "MIME files 'mime.types'" +LICENSE = "PD" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=f3ace4a4ff8aa9e374be6080e41a822e" +DEPENDS = "file" +RDEPENDS:${PN} = "perl" +RRECOMMENDS:${PN} = "file" + +SRC_URI = "${DEBIAN_MIRROR}/main/m/${BPN}/${BPN}_${PV}.tar.xz" +SRC_URI[sha256sum] = "d5877ac8c1fa3661b3c9ace293ae154c844fad686786f085e954c014f7e73f4d" +S = "${UNPACKDIR}/work" + +inherit update-alternatives + +FILES:${PN} += " ${datadir}/bug/media-types" + +docdir:append = "/${BPN}" + +do_install () { + install -d ${D}${sysconfdir} + install -d ${D}${datadir}/bug/media-types + install -d ${D}${docdir} + install -m 644 mime.types ${D}${sysconfdir}/ + install -m 644 debian/bug-presubj ${D}${datadir}/bug/media-types/presubj + install -m 644 debian/changelog ${D}${docdir}/changelog + install -m 644 debian/copyright ${D}${docdir}/copyright + cd ${D}${docdir}; gzip -9v changelog +} + +ALTERNATIVE_PRIORITY = "90" +ALTERNATIVE:${PN} = "mime.types" +ALTERNATIVE_LINK_NAME[mime.types] = "${sysconfdir}/mime.types" + +INHIBIT_DEFAULT_DEPS = "1" + +# Debian used to have mime-support package which was media-types and +# mailcap recipes in one. +PACKAGES += "mime-support" +RPROVIDES:${PN} += "mime-support" +RDEPENDS:mime-support += "${PN} mailcap" +ALLOW_EMPTY:mime-support = "1" diff --git a/meta-oe/recipes-support/mime-support/media-types_14.0.0.bb b/meta-oe/recipes-support/mime-support/media-types_14.0.0.bb deleted file mode 100644 index 137d508ebe..0000000000 --- a/meta-oe/recipes-support/mime-support/media-types_14.0.0.bb +++ /dev/null @@ -1,39 +0,0 @@ -SECTION = "base" -SUMMARY = "MIME files 'mime.types'" -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://debian/copyright;md5=f3ace4a4ff8aa9e374be6080e41a822e" -DEPENDS = "file" -RDEPENDS:${PN} = "perl" -RRECOMMENDS:${PN} = "file" - -SRC_URI = "${DEBIAN_MIRROR}/main/m/${BPN}/${BPN}_${PV}.tar.xz" -SRC_URI[sha256sum] = "d5877ac8c1fa3661b3c9ace293ae154c844fad686786f085e954c014f7e73f4d" -S = "${UNPACKDIR}/work" - -inherit update-alternatives - -FILES:${PN} += " ${datadir}/bug/media-types" - -docdir:append = "/${BPN}" - -do_install () { - install -d ${D}${sysconfdir} - install -d ${D}${datadir}/bug/media-types - install -d ${D}${docdir} - install -m 644 mime.types ${D}${sysconfdir}/ - install -m 644 debian/bug-presubj ${D}${datadir}/bug/media-types/presubj - install -m 644 debian/changelog ${D}${docdir}/changelog - install -m 644 debian/copyright ${D}${docdir}/copyright - cd ${D}${docdir}; gzip -9v changelog -} - -ALTERNATIVE_PRIORITY = "90" -ALTERNATIVE:${PN} = "mime.types" -ALTERNATIVE_LINK_NAME[mime.types] = "${sysconfdir}/mime.types" - -INHIBIT_DEFAULT_DEPS = "1" - -# Debian used to have mime-support package which was media-types and -# mailcap recipes in one. -PROVIDES += "mime-support" -RDEPENDS:mime-support = "mailcap" -- cgit v1.2.3-54-g00ecf