diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2021-02-13 00:55:30 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-02-25 23:15:06 +0300 |
commit | 706d5aacd7ab7b37c00df1a1b210e4ced06119e1 (patch) | |
tree | ed0bec373424d01accfb2e9c895c177a3e2d7abe /poky/meta/recipes-connectivity/iproute2/iproute2.inc | |
parent | ac970dd705934286df062e0f1501f776dc2ef01d (diff) | |
download | openbmc-706d5aacd7ab7b37c00df1a1b210e4ced06119e1.tar.xz |
Reset poky to before our libpam hacks
Things got a bit out of synch with openbmc-config due to the libpam
issues and the migration from the meta-* layers.
Revert the two previous commits and then put the latest poky in with the
libpam revert and get openbmc-config right again.
Revert "Revert "libpam: update 1.3.1 -> 1.5.1""
This reverts commit 87ddd3eab4df68e624b5350ccaab28b3b97547c0.
Revert "poky: subtree update:796be0593a..10c69538c0"
This reverts commit c723b72979bfac6362509cf1fe086900f6641f28.
Change-Id: I3a1f405193aee6a21fe0cd24be9927c143a23d9a
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta/recipes-connectivity/iproute2/iproute2.inc')
-rw-r--r-- | poky/meta/recipes-connectivity/iproute2/iproute2.inc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/poky/meta/recipes-connectivity/iproute2/iproute2.inc b/poky/meta/recipes-connectivity/iproute2/iproute2.inc index 7a22fe925..403d26430 100644 --- a/poky/meta/recipes-connectivity/iproute2/iproute2.inc +++ b/poky/meta/recipes-connectivity/iproute2/iproute2.inc @@ -20,13 +20,11 @@ PACKAGECONFIG[tipc] = ",,libmnl," PACKAGECONFIG[elf] = ",,elfutils," PACKAGECONFIG[devlink] = ",,libmnl," -IPROUTE2_MAKE_SUBDIRS = "lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc', d)}" - EXTRA_OEMAKE = "\ CC='${CC}' \ KERNEL_INCLUDE=${STAGING_INCDIR} \ DOCDIR=${docdir}/iproute2 \ - SUBDIRS='${IPROUTE2_MAKE_SUBDIRS}' \ + SUBDIRS='lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc', d)}' \ SBINDIR='${base_sbindir}' \ LIBDIR='${libdir}' \ " |