summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2019-12-02 07:21:39 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2019-12-03 18:11:17 +0300
commit4c74a25bed2494be60986f6b1da8ded5ff877af8 (patch)
treed7f3f20a9972397aea97659b608c04bbda99242f
parent6b2354efe7cbf133664dfabaae230bb427eb116a (diff)
downloadopenbmc-4c74a25bed2494be60986f6b1da8ded5ff877af8.tar.xz
Drop STAGING_KERNEL_DIR
The Linux kernel userspace headers must be installed, not included directly from the kernel source tree: The correct way to package the header files for a distribution is to run 'make headers_install' from the kernel source directory to install the headers into /usr/include and then rebuild the C library package, with a dependency on the specific version of the just installed kernel headers. Luckily the header used by these two applications is shipped in the kernel used to build the userspace headers, so the hack of including the source tree has not been required for some time. (From meta-phosphor rev: fb23d65060279037444616b83c3dd62b407d21e6) Signed-off-by: Joel Stanley <joel@jms.id.au> Change-Id: I17ac7d9cc5c5e2c54871b045a42025790e819506 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
-rw-r--r--meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb4
-rw-r--r--meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb4
2 files changed, 0 insertions, 8 deletions
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb
index a3180402d..e702d2481 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb
@@ -20,7 +20,3 @@ DEPENDS += "systemd"
S = "${WORKDIR}/git"
SRC_URI += "git://github.com/openbmc/btbridge"
SRCREV="aa5511d28ff9acee4a404c6397d09f5187812ed8"
-
-# This is how linux-libc-headers says to include custom uapi headers
-CFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi"
-do_configure[depends] += "virtual/kernel:do_shared_workdir"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb
index eb39439b1..3cb163077 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb
@@ -31,7 +31,3 @@ DEPENDS += " \
S = "${WORKDIR}/git"
SRC_URI = "git://github.com/openbmc/kcsbridge.git"
SRCREV = "46525ae48db23333493ac927c12ed13a0e663de5"
-
-# This is how linux-libc-headers says to include custom uapi headers
-CFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi"
-do_configure[depends] += "virtual/kernel:do_shared_workdir"