diff options
| -rw-r--r-- | meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 3 | ||||
| -rw-r--r-- | meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 59f1703f4d..cb4be4a8a1 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | |||
| @@ -241,7 +241,7 @@ RDEPENDS_packagegroup-meta-oe-support ="\ | |||
| 241 | libgpiod libiio libjs-jquery libjs-sizzle liblinebreak libmicrohttpd \ | 241 | libgpiod libiio libjs-jquery libjs-sizzle liblinebreak libmicrohttpd \ |
| 242 | libmxml liboauth libol liboop libp11 libraw1394 libsmi libsoc libssh2 \ | 242 | libmxml liboauth libol liboop libp11 libraw1394 libsmi libsoc libssh2 \ |
| 243 | libssh libtar libteam libtinyxml2 libtinyxml libusbg libusb-compat libutempter \ | 243 | libssh libtar libteam libtinyxml2 libtinyxml libusbg libusb-compat libutempter \ |
| 244 | links lio-utils lockdev log4c log4cpp logwarn libdevmapper lvm2 \ | 244 | links lockdev log4c log4cpp logwarn libdevmapper lvm2 \ |
| 245 | mailcap mbuffer mg minini \ | 245 | mailcap mbuffer mg minini \ |
| 246 | multipath-tools nano neon nmon numactl onig openct openldap \ | 246 | multipath-tools nano neon nmon numactl onig openct openldap \ |
| 247 | opensc wbxml2 p910nd pcsc-lite picocom libotr pidgin \ | 247 | opensc wbxml2 p910nd pcsc-lite picocom libotr pidgin \ |
| @@ -260,6 +260,7 @@ RDEPENDS_packagegroup-meta-oe-support ="\ | |||
| 260 | procmail \ | 260 | procmail \ |
| 261 | ${@bb.utils.contains("DISTRO_FEATURES", "polkit", "udisks2 upower", "", d)} \ | 261 | ${@bb.utils.contains("DISTRO_FEATURES", "polkit", "udisks2 upower", "", d)} \ |
| 262 | ${NE10} \ | 262 | ${NE10} \ |
| 263 | ${@bb.utils.contains("BBPATH", "meta-python2", "lio-utils", "", d)} \ | ||
| 263 | " | 264 | " |
| 264 | 265 | ||
| 265 | RDEPENDS_packagegroup-meta-oe-support_remove_arm ="numactl" | 266 | RDEPENDS_packagegroup-meta-oe-support_remove_arm ="numactl" |
diff --git a/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb b/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb index 058117ed83..8e5986bd9e 100644 --- a/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb +++ b/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb | |||
| @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/Datera/lio-utils.git \ | |||
| 12 | SRCREV = "0ac9091c1ff7a52d5435a4f4449e82637142e06e" | 12 | SRCREV = "0ac9091c1ff7a52d5435a4f4449e82637142e06e" |
| 13 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
| 14 | 14 | ||
| 15 | inherit distutils3 | 15 | inherit distutils |
| 16 | 16 | ||
| 17 | EXTRA_OEMAKE += "DESTDIR=${D}" | 17 | EXTRA_OEMAKE += "DESTDIR=${D}" |
| 18 | 18 | ||
| @@ -64,3 +64,9 @@ FILES_${PN} += "${sbindir}/* /etc/init.d/* /etc/target/*" | |||
| 64 | # http://errors.yoctoproject.org/Errors/Details/184712/ | 64 | # http://errors.yoctoproject.org/Errors/Details/184712/ |
| 65 | # python-native/python: can't open file 'setup.py': [Errno 2] No such file or directory | 65 | # python-native/python: can't open file 'setup.py': [Errno 2] No such file or directory |
| 66 | CLEANBROKEN = "1" | 66 | CLEANBROKEN = "1" |
| 67 | |||
| 68 | python() { | ||
| 69 | if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): | ||
| 70 | raise bb.parse.SkipRecipe('Requires meta-python2 to be present.') | ||
| 71 | } | ||
| 72 | |||
