diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-02-13 16:44:48 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-13 09:43:21 +0000 |
| commit | 65581c68d130fa74d703f6c3c92560e053857ac7 (patch) | |
| tree | da27597ea5989f84e42554f5aeee9b4007c0e420 /meta/classes | |
| parent | 45b97161915ce7872ef7161451a5c83507072a72 (diff) | |
| download | openembedded-core-65581c68d130fa74d703f6c3c92560e053857ac7.tar.gz openembedded-core-65581c68d130fa74d703f6c3c92560e053857ac7.tar.bz2 openembedded-core-65581c68d130fa74d703f6c3c92560e053857ac7.zip | |
rootfs_rpm.bbclass: migrate image creation to dnf
To properly look at this patch, you probably need a side-by-side diff viewing tool.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/rootfs_rpm.bbclass | 21 |
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 @@ # Creates a root filesystem out of rpm packages # -ROOTFS_PKGMANAGE = "rpm smartpm" +ROOTFS_PKGMANAGE = "rpm dnf" ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts" -# Add 100Meg of extra space for Smart -IMAGE_ROOTFS_EXTRA_SPACE_append = "${@bb.utils.contains("PACKAGE_INSTALL", "smartpm", " + 102400", "" ,d)}" +# dnf is using our custom distutils, and so will fail without these +export STAGING_INCDIR +export STAGING_LIBDIR -# Smart is python based, so be sure python-native is available to us. +# Add 100Meg of extra space for dnf +IMAGE_ROOTFS_EXTRA_SPACE_append = "${@bb.utils.contains("PACKAGE_INSTALL", "dnf", " + 102400", "" ,d)}" + +# Dnf is python based, so be sure python-native is available to us. EXTRANATIVEPATH += "python-native" # opkg is needed for update-alternatives RPMROOTFSDEPENDS = "rpm-native:do_populate_sysroot \ - rpmresolve-native:do_populate_sysroot \ - python-smartpm-native:do_populate_sysroot \ - createrepo-native:do_populate_sysroot \ + dnf-native:do_populate_sysroot \ + createrepo-c-native:do_populate_sysroot \ opkg-native:do_populate_sysroot" do_rootfs[depends] += "${RPMROOTFSDEPENDS}" @@ -35,7 +38,3 @@ python () { d.setVar('RPM_POSTPROCESS_COMMANDS', '') } -# Smart is python based, so be sure python-native is available to us. -EXTRANATIVEPATH += "python-native" - -rpmlibdir = "/var/lib/rpm" |