bitbake.conf: Drop oldincludedir

Autoconf defines this as:

"The directory for installing C header files for non-GCC compilers."

Whilst this is something autoconf does allow changing, I find it hard
to believe it has much use in the wild now and that headers don't get
split like this in reality, it would probably only be useful on really
old unixes.. The values are the same in our configuration anyway.

Drop the value and just use includedir everywhere.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

diff --git a/meta/classes-recipe/autotools.bbclass b/meta/classes-recipe/autotools.bbclass
index 5ed21a3d6842d47df881e9d57ec6bbfed01cf7ed..1663307b061c251165a6df60d89a44312a6a48f3 100644 (file)
--- a/meta/classes-recipe/autotools.bbclass
+++ b/meta/classes-recipe/autotools.bbclass
@@ -76,7 +76,7 @@ CONFIGUREOPTS = " --build=${BUILD_SYS} \
                  --localstatedir=${localstatedir} \
                  --libdir=${libdir} \
                  --includedir=${includedir} \
-                 --oldincludedir=${oldincludedir} \
+                 --oldincludedir=${includedir} \
                  --infodir=${infodir} \
                  --mandir=${mandir} \
                  --disable-silent-rules \

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 67ff76904634ff45b62e0a3e5e6099e23dedb642..8d04b71de37be9829449795312c582d371a8d425 100644 (file)
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -46,7 +46,6 @@ export sbindir = "${exec_prefix}/sbin"
 export libdir = "${exec_prefix}/${baselib}"
 export libexecdir = "${exec_prefix}/libexec"
 export includedir = "${exec_prefix}/include"
-export oldincludedir = "${exec_prefix}/include"
 localedir = "${libdir}/locale"
 
 # Linkage between native/cross/nativesdk layouts

diff --git a/meta/files/fs-perms-persistent-log.txt b/meta/files/fs-perms-persistent-log.txt
index 518c1be3c93b7f6ba78ca0aab0f462466c4bd61d..61f0a6e26a1857e0bdd9edebf0e6b1366f20f207 100644 (file)
--- a/meta/files/fs-perms-persistent-log.txt
+++ b/meta/files/fs-perms-persistent-log.txt
@@ -38,7 +38,6 @@ ${datadir}/locale     0755    root    root    true    0644    root    root
 
 # Cleanup headers
 ${includedir}          0755    root    root    true    0644    root    root
-${oldincludedir}       0755    root    root    true    0644    root    root
 
 # Cleanup debug src
 /usr/src/debug         0755    root    root    true    0644    root    root

diff --git a/meta/files/fs-perms.txt b/meta/files/fs-perms.txt
index daa4aed840fe7929bba31e0f55605c71dc7b1ff4..48191f504ceabeee1d2140478736172522dc7a43 100644 (file)
--- a/meta/files/fs-perms.txt
+++ b/meta/files/fs-perms.txt
@@ -38,7 +38,6 @@ ${datadir}/locale     0755    root    root    true    0644    root    root
 
 # Cleanup headers
 ${includedir}          0755    root    root    true    0644    root    root
-${oldincludedir}       0755    root    root    true    0644    root    root
 
 # Cleanup debug src
 /usr/src/debug         0755    root    root    true    0644    root    root

diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py
index 1dd20f85ebd455a52753d8c8dd53634db4fbb035..f69bf9c353c2bb64c9f3d2c26bf1aab2f3355322 100644 (file)
--- a/meta/lib/oe/package.py
+++ b/meta/lib/oe/package.py
@@ -456,8 +456,7 @@ def fixup_perms(d):
                 'sbindir',
                 'libexecdir',
                 'libdir',
-                'includedir',
-                'oldincludedir' ]
+                'includedir' ]
 
     for path in target_path_vars:
         dir = d.getVar(path) or ""