summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-extended/libzypp/libzypp_git.bb8
-rw-r--r--meta/recipes-extended/sat-solver/sat-solver_git.bb4
-rw-r--r--meta/recipes-extended/zypper/zypper_git.bb6
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
9DEPENDS = "rpm boost curl libxml2 zlib sat-solver expat openssl udev" 9DEPENDS = "rpm boost curl libxml2 zlib sat-solver expat openssl udev"
10 10
11# rpmdb2solv from sat-solver is run from libzypp
12RDEPENDS_${PN} = "sat-solver"
13
14S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
15SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433" 12SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433"
16PV = "0.0-git${SRCPV}" 13PV = "0.0-git${SRCPV}"
17PR = "r14" 14PR = "r15"
18 15
19SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \ 16SRC_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
33SRC_URI_append_arm = " file://arm-workaround-global-constructor.patch" 30SRC_URI_append_arm = " file://arm-workaround-global-constructor.patch"
34 31
32# rpmdb2solv from sat-solver is run from libzypp
33RDEPENDS_${PN} = "sat-solver rpm-libs"
34
35PACKAGES =+ "${PN}-pkgmgt" 35PACKAGES =+ "${PN}-pkgmgt"
36 36
37FILES_${PN} += "${libdir}/zypp ${datadir}/zypp ${datadir}/icons" 37FILES_${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
9SRCREV = "0a7378d5f482f477a01cf1690d76871ab8bdcc32" 9SRCREV = "0a7378d5f482f477a01cf1690d76871ab8bdcc32"
10PV = "0.0-git${SRCPV}" 10PV = "0.0-git${SRCPV}"
11PR = "r11" 11PR = "r12"
12 12
13PARALLEL_MAKE="" 13PARALLEL_MAKE=""
14 14
@@ -29,6 +29,8 @@ EXTRA_OECMAKE += " -DLIB=${@os.path.basename('${libdir}')}"
29 29
30inherit cmake pkgconfig 30inherit cmake pkgconfig
31 31
32RDEPENDS_${PN} = "rpm-libs"
33
32PACKAGE_ARCH = "${MACHINE_ARCH}" 34PACKAGE_ARCH = "${MACHINE_ARCH}"
33 35
34do_archgen () { 36do_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+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=3201406e350b39e05a82e28b5020f413" 5LIC_FILES_CHKSUM = "file://COPYING;md5=3201406e350b39e05a82e28b5020f413"
6 6
7DEPENDS = "libzypp augeas" 7DEPENDS = "libzypp augeas"
8RRECOMMENDS_${PN} = "procps util-linux-uuidgen" 8PR = "r6"
9PR = "r5"
10SRCREV = "2c5bb6ceb99ecd950ef993e43d77bf0569ea0582" 9SRCREV = "2c5bb6ceb99ecd950ef993e43d77bf0569ea0582"
11 10
12inherit cmake 11inherit cmake
@@ -20,4 +19,7 @@ S = "${WORKDIR}/git"
20 19
21PV = "1.5.3-git${SRCPV}" 20PV = "1.5.3-git${SRCPV}"
22 21
22RDEPENDS_${PN} = "rpm-libs"
23RRECOMMENDS_${PN} = "procps util-linux-uuidgen"
24
23PACKAGE_ARCH = "${MACHINE_ARCH}" 25PACKAGE_ARCH = "${MACHINE_ARCH}"