diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 62f1c7759..5fcf9899b 100644 --- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -136,8 +136,7 @@ RDEPENDS_packagegroup-meta-oe-extended ="\ libpwquality libqb libuio \ lockfile-progs logwatch lprng mailx md5deep \ mozjs mraa nana nicstat \ - p7zip p8platform libfile-fnmatch-perl polkit \ - polkit-group-rule-datetime polkit-group-rule-network \ + p7zip p8platform libfile-fnmatch-perl \ rarpd redis rrdtool libfastjson librelp rsyslog sanlock \ sblim-cmpi-devel sblim-sfc-common sblim-sfcc \ scsirastools sgpio smartmontools snappy can-isotp \ @@ -148,6 +147,8 @@ RDEPENDS_packagegroup-meta-oe-extended ="\ ${@bb.utils.contains("DISTRO_FEATURES", "bluez", "collectd", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "pam-plugin-ccreds pam-plugin-ldapdb", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "pam-ssh-agent-auth openwsman sblim-sfcb ", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "polkit", "polkit polkit-group-rule-datetime ", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "polkit", "polkit-group-rule-network ", "", d)} \ ${@bb.utils.contains("BBPATH", "meta-python", "openlmi-tools", "", d)} \ " RDEPENDS_packagegroup-meta-oe-extended_remove_mipsarch = "upm mraa tiptop" @@ -225,7 +226,7 @@ RDEPENDS_packagegroup-meta-oe-support ="\ anthy asio atop augeas avro-c bdwgc frame grail \ ccid ceres-solver ckermit cpprest ctapi-common daemonize \ daemontools debsums devmem2 dfu-util dfu-util-native digitemp \ - dstat eject enca epeg espeak espeak-data fbset fbset-modes \ + dstat eject enca epeg espeak fbset fbset-modes \ fftw fltk-native gd gflags glog gnulib gperftools \ gpm gradm gsl gsoap hddtemp hidapi htop hunspell hwdata iksemel \ libinih inotify-tools joe lcms lcov libatasmart libbytesize \ @@ -242,7 +243,7 @@ RDEPENDS_packagegroup-meta-oe-support ="\ sjf2410-linux-native satyr sdparm pty-forward-native serial-forward \ sg3-utils sharutils smem spitools srecord ssiapi start-stop-daemon stm32flash \ syslog-ng system-config-keyboard tbb thin-provisioning-tools tokyocabinet \ - tree udisks udisks2 uhubctl unixodbc upower uriparser usb-modeswitch \ + tree uhubctl unixodbc uriparser usb-modeswitch \ usb-modeswitch-data usbpath uthash utouch-evemu utouch-frame \ vim vim-tiny websocketpp wmiconfig xdelta3 xdg-user-dirs xmlstarlet \ zbar zile \ @@ -250,6 +251,7 @@ RDEPENDS_packagegroup-meta-oe-support ="\ ${@bb.utils.contains("DISTRO_FEATURES", "pulseadio bluez4", "libcanberra", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "x11 pam", "xorgxrdp xrdp", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "bluez4", "procmail", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "polkit", "udisks udisks2 upower", "", d)} \ ${NE10} \ " |