summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-02-13 16:44:48 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-14 14:42:17 +0000
commit67615e01751bdba4e2186c86c44bebd9ded5233b (patch)
treea0472e225aaa55eaadb10f419867fae3fcb31d0e /meta/classes
parentd4efcded26706f50f8ca98d76df2b349ed1f1792 (diff)
downloadpoky-67615e01751bdba4e2186c86c44bebd9ded5233b.tar.gz
rootfs_rpm.bbclass: migrate image creation to dnf
To properly look at this patch, you probably need a side-by-side diff viewing tool. (From OE-Core rev: 65581c68d130fa74d703f6c3c92560e053857ac7) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/rootfs_rpm.bbclass21
1 files changed, 10 insertions, 11 deletions
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index b8ff4cb7b6..65881a60a7 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -2,20 +2,23 @@
2# Creates a root filesystem out of rpm packages 2# Creates a root filesystem out of rpm packages
3# 3#
4 4
5ROOTFS_PKGMANAGE = "rpm smartpm" 5ROOTFS_PKGMANAGE = "rpm dnf"
6ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts" 6ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts"
7 7
8# Add 100Meg of extra space for Smart 8# dnf is using our custom distutils, and so will fail without these
9IMAGE_ROOTFS_EXTRA_SPACE_append = "${@bb.utils.contains("PACKAGE_INSTALL", "smartpm", " + 102400", "" ,d)}" 9export STAGING_INCDIR
10export STAGING_LIBDIR
10 11
11# Smart is python based, so be sure python-native is available to us. 12# Add 100Meg of extra space for dnf
13IMAGE_ROOTFS_EXTRA_SPACE_append = "${@bb.utils.contains("PACKAGE_INSTALL", "dnf", " + 102400", "" ,d)}"
14
15# Dnf is python based, so be sure python-native is available to us.
12EXTRANATIVEPATH += "python-native" 16EXTRANATIVEPATH += "python-native"
13 17
14# opkg is needed for update-alternatives 18# opkg is needed for update-alternatives
15RPMROOTFSDEPENDS = "rpm-native:do_populate_sysroot \ 19RPMROOTFSDEPENDS = "rpm-native:do_populate_sysroot \
16 rpmresolve-native:do_populate_sysroot \ 20 dnf-native:do_populate_sysroot \
17 python-smartpm-native:do_populate_sysroot \ 21 createrepo-c-native:do_populate_sysroot \
18 createrepo-native:do_populate_sysroot \
19 opkg-native:do_populate_sysroot" 22 opkg-native:do_populate_sysroot"
20 23
21do_rootfs[depends] += "${RPMROOTFSDEPENDS}" 24do_rootfs[depends] += "${RPMROOTFSDEPENDS}"
@@ -35,7 +38,3 @@ python () {
35 d.setVar('RPM_POSTPROCESS_COMMANDS', '') 38 d.setVar('RPM_POSTPROCESS_COMMANDS', '')
36 39
37} 40}
38# Smart is python based, so be sure python-native is available to us.
39EXTRANATIVEPATH += "python-native"
40
41rpmlibdir = "/var/lib/rpm"