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>
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 a318040..e702d24 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 @@
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 eb39439..3cb1630 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 @@
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"