diff options
| -rw-r--r-- | meta/recipes-extended/libzypp/libzypp_git.bb | 8 | ||||
| -rw-r--r-- | meta/recipes-extended/sat-solver/sat-solver_git.bb | 4 | ||||
| -rw-r--r-- | meta/recipes-extended/zypper/zypper_git.bb | 6 |
3 files changed, 11 insertions, 7 deletions
diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb index 4b1b8e4b36..7d9382a0bf 100644 --- a/meta/recipes-extended/libzypp/libzypp_git.bb +++ b/meta/recipes-extended/libzypp/libzypp_git.bb | |||
| @@ -8,13 +8,10 @@ inherit cmake gettext | |||
| 8 | 8 | ||
| 9 | DEPENDS = "rpm boost curl libxml2 zlib sat-solver expat openssl udev" | 9 | DEPENDS = "rpm boost curl libxml2 zlib sat-solver expat openssl udev" |
| 10 | 10 | ||
| 11 | # rpmdb2solv from sat-solver is run from libzypp | ||
| 12 | RDEPENDS_${PN} = "sat-solver" | ||
| 13 | |||
| 14 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
| 15 | SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433" | 12 | SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433" |
| 16 | PV = "0.0-git${SRCPV}" | 13 | PV = "0.0-git${SRCPV}" |
| 17 | PR = "r14" | 14 | PR = "r15" |
| 18 | 15 | ||
| 19 | SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \ | 16 | SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \ |
| 20 | file://no-doc.patch \ | 17 | file://no-doc.patch \ |
| @@ -32,6 +29,9 @@ SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch" | |||
| 32 | # ARM specific global constructor workaround | 29 | # ARM specific global constructor workaround |
| 33 | SRC_URI_append_arm = " file://arm-workaround-global-constructor.patch" | 30 | SRC_URI_append_arm = " file://arm-workaround-global-constructor.patch" |
| 34 | 31 | ||
| 32 | # rpmdb2solv from sat-solver is run from libzypp | ||
| 33 | RDEPENDS_${PN} = "sat-solver rpm-libs" | ||
| 34 | |||
| 35 | PACKAGES =+ "${PN}-pkgmgt" | 35 | PACKAGES =+ "${PN}-pkgmgt" |
| 36 | 36 | ||
| 37 | FILES_${PN} += "${libdir}/zypp ${datadir}/zypp ${datadir}/icons" | 37 | FILES_${PN} += "${libdir}/zypp ${datadir}/zypp ${datadir}/icons" |
diff --git a/meta/recipes-extended/sat-solver/sat-solver_git.bb b/meta/recipes-extended/sat-solver/sat-solver_git.bb index 0d9a439f91..b616c57552 100644 --- a/meta/recipes-extended/sat-solver/sat-solver_git.bb +++ b/meta/recipes-extended/sat-solver/sat-solver_git.bb | |||
| @@ -8,7 +8,7 @@ DEPENDS = "libcheck rpm zlib expat db" | |||
| 8 | 8 | ||
| 9 | SRCREV = "0a7378d5f482f477a01cf1690d76871ab8bdcc32" | 9 | SRCREV = "0a7378d5f482f477a01cf1690d76871ab8bdcc32" |
| 10 | PV = "0.0-git${SRCPV}" | 10 | PV = "0.0-git${SRCPV}" |
| 11 | PR = "r11" | 11 | PR = "r12" |
| 12 | 12 | ||
| 13 | PARALLEL_MAKE="" | 13 | PARALLEL_MAKE="" |
| 14 | 14 | ||
| @@ -29,6 +29,8 @@ EXTRA_OECMAKE += " -DLIB=${@os.path.basename('${libdir}')}" | |||
| 29 | 29 | ||
| 30 | inherit cmake pkgconfig | 30 | inherit cmake pkgconfig |
| 31 | 31 | ||
| 32 | RDEPENDS_${PN} = "rpm-libs" | ||
| 33 | |||
| 32 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 34 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
| 33 | 35 | ||
| 34 | do_archgen () { | 36 | do_archgen () { |
diff --git a/meta/recipes-extended/zypper/zypper_git.bb b/meta/recipes-extended/zypper/zypper_git.bb index 7f7ceb3024..4f4fc4dc8c 100644 --- a/meta/recipes-extended/zypper/zypper_git.bb +++ b/meta/recipes-extended/zypper/zypper_git.bb | |||
| @@ -5,8 +5,7 @@ LICENSE = "GPLv2+" | |||
| 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=3201406e350b39e05a82e28b5020f413" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=3201406e350b39e05a82e28b5020f413" |
| 6 | 6 | ||
| 7 | DEPENDS = "libzypp augeas" | 7 | DEPENDS = "libzypp augeas" |
| 8 | RRECOMMENDS_${PN} = "procps util-linux-uuidgen" | 8 | PR = "r6" |
| 9 | PR = "r5" | ||
| 10 | SRCREV = "2c5bb6ceb99ecd950ef993e43d77bf0569ea0582" | 9 | SRCREV = "2c5bb6ceb99ecd950ef993e43d77bf0569ea0582" |
| 11 | 10 | ||
| 12 | inherit cmake | 11 | inherit cmake |
| @@ -20,4 +19,7 @@ S = "${WORKDIR}/git" | |||
| 20 | 19 | ||
| 21 | PV = "1.5.3-git${SRCPV}" | 20 | PV = "1.5.3-git${SRCPV}" |
| 22 | 21 | ||
| 22 | RDEPENDS_${PN} = "rpm-libs" | ||
| 23 | RRECOMMENDS_${PN} = "procps util-linux-uuidgen" | ||
| 24 | |||
| 23 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 25 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
