[oe] [PATCH 4/4] Renamed prefix_native, bindir_native, etc using hyphens

Douglas Royds Wed, 17 Mar 2010 21:58:42 -0700

   - Avoids clashing with the machine override when MACHINE=native
   - bindir_cross similarly renamed for consistency


Signed-off-by: Douglas Royds <douglas.ro...@taitradio.com>
---
 classes/cross-canadian.bbclass              |    2 +-
 classes/native.bbclass                      |    4 +-
 classes/packaged-staging.bbclass            |   16 ++++++------
 conf/bitbake.conf                           |   36 +++++++++++++-------------
 conf/distro/micro.conf                      |    4 +-
 recipes/gcc/gcc-cross-sdk_4.1.2.bb          |    2 +-
 recipes/gcc/gcc-cross-sdk_4.2.2.bb          |    2 +-
 recipes/gcc/gcc-cross-sdk_4.2.3.bb          |    2 +-
 recipes/gcc/gcc-cross-sdk_4.2.4.bb          |    2 +-
 recipes/gcc/gcc-cross-sdk_4.3.1.bb          |    2 +-
 recipes/gcc/gcc-cross-sdk_4.3.2.bb          |    2 +-
 recipes/gcc/gcc-cross-sdk_4.3.3.bb          |    2 +-
 recipes/gcc/gcc-cross-sdk_4.3.4.bb          |    2 +-
 recipes/gcc/gcc-cross-sdk_4.4.1.bb          |    2 +-
 recipes/gcc/gcc-cross-sdk_4.4.2.bb          |    2 +-
 recipes/gcc/gcc-cross-sdk_4.4.3.bb          |    2 +-
 recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb |    2 +-
 recipes/gcc/gcc-cross-sdk_svn.bb            |    2 +-
 recipes/gcc/gcc-cross_4.1.0.bb              |    2 +-
 recipes/gcc/gcc-cross_4.1.1.bb              |    2 +-
 recipes/gcc/gcc-cross_4.1.2.bb              |    2 +-
 recipes/gcc/gcc-cross_4.2.1.bb              |    2 +-
 recipes/gcc/gcc-cross_4.2.2.bb              |    2 +-
 recipes/gcc/gcc-cross_4.2.3.bb              |    2 +-
 recipes/gcc/gcc-cross_4.2.4.bb              |    2 +-
 recipes/gcc/gcc-cross_4.3.1.bb              |    2 +-
 recipes/gcc/gcc-cross_4.3.2.bb              |    2 +-
 recipes/gcc/gcc-cross_4.3.3.bb              |    2 +-
 recipes/gcc/gcc-cross_4.3.4.bb              |    2 +-
 recipes/gcc/gcc-cross_4.4.1.bb              |    2 +-
 recipes/gcc/gcc-cross_4.4.2.bb              |    2 +-
 recipes/gcc/gcc-cross_4.4.3.bb              |    2 +-
 recipes/gcc/gcc-cross_csl-arm-2007q3.bb     |    2 +-
 recipes/gcc/gcc-cross_csl-arm-2008q1.bb     |    2 +-
 recipes/gcc/gcc-cross_csl-arm-2008q3.bb     |    2 +-
 recipes/gcc/gcc-cross_svn.bb                |    2 +-
 recipes/libtool/libtool-cross_1.5.10.bb     |    4 +-
 recipes/libtool/libtool-cross_1.5.22.bb     |    4 +-
 recipes/libtool/libtool-cross_1.5.24.bb     |    4 +-
 recipes/libtool/libtool-cross_2.2.4.bb      |    4 +-
 recipes/libtool/libtool-cross_2.2.6a.bb     |    4 +-
 recipes/libtool/libtool-cross_2.2.6b.bb     |    4 +-
 42 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/classes/cross-canadian.bbclass b/classes/cross-canadian.bbclass
index bd738ec..04a7130 100644
--- a/classes/cross-canadian.bbclass
+++ b/classes/cross-canadian.bbclass
@@ -17,7 +17,7 @@ INHIBIT_DEFAULT_DEPS = "1"
 STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}-nativesdk"
 STAGING_DIR_TARGET = "${STAGING_DIR}/${BASEPKG_TARGET_SYS}"

-PATH_append = ":${TMPDIR}/cross/${HOST_ARCH}/${bindir_cross}"
+PATH_append = ":${TMPDIR}/cross/${HOST_ARCH}/${bindir-cross}"

PKGDATA_DIR ="${TMPDIR}/pkgdata/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}"


 HOST_ARCH = "${SDK_ARCH}"
diff --git a/classes/native.bbclass b/classes/native.bbclass
index 6698b61..dc57211 100644
--- a/classes/native.bbclass
+++ b/classes/native.bbclass
@@ -55,8 +55,8 @@ export STRIP = "${HOST_PREFIX}strip"

 # Path prefixes
 base_prefix = "${STAGING_DIR_NATIVE}"
-prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
-exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
+prefix = "${STAGING_DIR_NATIVE}${prefix-native}"
+exec_prefix = "${STAGING_DIR_NATIVE}${prefix-native}"

 # Since we actually install these into situ there is no staging prefix
 STAGING_DIR_HOST = ""
diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index 1ede25c..ae0aec4 100644
--- a/classes/packaged-staging.bbclass
+++ b/classes/packaged-staging.bbclass
@@ -149,11 +149,11 @@ staging_helper () {
                done
                echo "dest root /" >> $conffile
        fi
-       if [ ! -e ${TMPDIR}${libdir_native}/opkg/info/ ]; then
-               mkdir -p ${TMPDIR}${libdir_native}/opkg/info/
+       if [ ! -e ${TMPDIR}${libdir-native}/opkg/info/ ]; then
+               mkdir -p ${TMPDIR}${libdir-native}/opkg/info/
        fi
-       if [ ! -e ${TMPDIR}${libdir_native}/ipkg/ ]; then
-               ln -sf opkg/ ${TMPDIR}${libdir_native}/ipkg || true
+       if [ ! -e ${TMPDIR}${libdir-native}/ipkg/ ]; then
+               ln -sf opkg/ ${TMPDIR}${libdir-native}/ipkg || true
        fi
 }

@@ -182,7 +182,7 @@ python packagestage_scenefunc () {
         #

# Install the staging package somewhere temporarily so we canextract the stamp files

-bb.mkdirhier(bb.data.expand("${WORKDIR}/tstage/${libdir_native}/opkg/info/ ", d))+bb.mkdirhier(bb.data.expand("${WORKDIR}/tstage/${libdir-native}/opkg/info/ ", d))cmd = bb.data.expand("${PSTAGE_PKGMANAGER} -f ${PSTAGE_MACHCONFIG}-force-depends -o ${WORKDIR}/tstage install", d)

         ret = os.system("PATH=\"%s\" %s %s" % (path, cmd, stagepkg))
         if ret != 0:
@@ -329,20 +329,20 @@ staging_packager () {
 staging_package_installer () {
        #${PSTAGE_INSTALL_CMD} ${PSTAGE_PKG}

-       STATUSFILE=${TMPDIR}${libdir_native}/opkg/status
+       STATUSFILE=${TMPDIR}${libdir-native}/opkg/status
        echo "Package: ${PSTAGE_PKGPN}"        >> $STATUSFILE
        echo "Version: ${PSTAGE_PKGVERSION}"   >> $STATUSFILE
        echo "Status: install user installed"  >> $STATUSFILE
        echo "Architecture: ${PSTAGE_PKGARCH}" >> $STATUSFILE
        echo "" >> $STATUSFILE

-       CTRLFILE=${TMPDIR}${libdir_native}/opkg/info/${PSTAGE_PKGPN}.control
+       CTRLFILE=${TMPDIR}${libdir-native}/opkg/info/${PSTAGE_PKGPN}.control
        echo "Package: ${PSTAGE_PKGPN}"        > $CTRLFILE
        echo "Version: ${PSTAGE_PKGVERSION}"   >> $CTRLFILE
        echo "Architecture: ${PSTAGE_PKGARCH}" >> $CTRLFILE

        cd ${PSTAGE_TMPDIR_STAGE}

- find -type f | grep -v ./CONTROL | sed -e 's/^\.//' >${TMPDIR}${libdir_native}/opkg/info/${PSTAGE_PKGPN}.list+ find -type f | grep -v ./CONTROL | sed -e 's/^\.//' >${TMPDIR}${libdir-native}/opkg/info/${PSTAGE_PKGPN}.list

 }

 python do_package_stage () {
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 0886587..1627c51 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -69,16 +69,16 @@ export oldincludedir = "${exec_prefix}/include"
 #
 # These must match the various bbclass layout definitions
 #
-base_bindir_native = "/bin"
-base_sbindir_native = "/sbin"
-sysconfdir_native = "/etc"
-prefix_native = "/usr"
-bindir_native = "${prefix_native}/bin"
-sbindir_native = "${prefix_native}/sbin"
-includedir_native = "${prefix_native}/include"
-libdir_native = "${prefix_native}/lib"
-datadir_native = "${prefix_native}/share"
-bindir_cross = "/bin"
+base_bindir-native = "/bin"
+base_sbindir-native = "/sbin"
+sysconfdir-native = "/etc"
+prefix-native = "/usr"
+bindir-native = "${prefix-native}/bin"
+sbindir-native = "${prefix-native}/sbin"
+includedir-native = "${prefix-native}/include"
+libdir-native = "${prefix-native}/lib"
+datadir-native = "${prefix-native}/share"
+bindir-cross = "/bin"

 #
 # Cross recipes need to know about the target layout
@@ -299,13 +299,13 @@ STAGING_DIR = "${TMPDIR}/staging"

 STAGING_DIR_JAVA = "${STAGING_DIR}/java"
 STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}"
-STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}"

-STAGING_BINDIR_CROSS ="${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS}"-STAGING_BINDIR_CROSS_BASEPKG ="${STAGING_DIR_NATIVE}${bindir_native}/${BASEPKG_TARGET_SYS}"

-STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${libdir_native}"
-STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir_native}"
-STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir_native}"
-STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${datadir_native}"
+STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir-native}"

+STAGING_BINDIR_CROSS ="${STAGING_DIR_NATIVE}${bindir-native}/${MULTIMACH_HOST_SYS}"+STAGING_BINDIR_CROSS_BASEPKG ="${STAGING_DIR_NATIVE}${bindir-native}/${BASEPKG_TARGET_SYS}"

+STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${libdir-native}"
+STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir-native}"
+STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir-native}"
+STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${datadir-native}"

 # This should really be MULTIMACH_HOST_SYS but that breaks "all" and machine
 # specific packages - hack around it for now.
@@ -414,7 +414,7 @@ EXTRA_IMAGEDEPENDS = ""

 CROSS_DIR = "${TMPDIR}/cross/${BASE_PACKAGE_ARCH}"
 CROSS_DATADIR = "${CROSS_DIR}/share"

-PATH_prepend ="${STAGING_BINDIR_CROSS}:${STAGING_BINDIR_CROSS_BASEPKG}:${STAGING_DIR_NATIVE}${sbindir_native}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/${bindir_cross}:${STAGING_DIR_NATIVE}${base_sbindir_native}:${STAGING_DIR_NATIVE}${base_bindir_native}:"+PATH_prepend ="${STAGING_BINDIR_CROSS}:${STAGING_BINDIR_CROSS_BASEPKG}:${STAGING_DIR_NATIVE}${sbindir-native}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/${bindir-cross}:${STAGING_DIR_NATIVE}${base_sbindir-native}:${STAGING_DIR_NATIVE}${base_bindir-native}:"

 export PATH

 ##################################################################
diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf
index 9885425..01a5b00 100644
--- a/conf/distro/micro.conf
+++ b/conf/distro/micro.conf
@@ -97,8 +97,8 @@ PACKAGE_SNAP_LIB_SYMLINKS = "1"
 # Collapse /usr into /
 prefix = ""
 exec_prefix = ""
-prefix_native = ""
-exec_prefix_native = ""
+prefix-native = ""
+exec_prefix-native = ""

 # Don't install ldconfig and associated gubbins
 USE_LDCONFIG = "0"

diff --git a/recipes/gcc/gcc-cross-sdk_4.1.2.bbb/recipes/gcc/gcc-cross-sdk_4.1.2.bb

index 6a74606..7efe162 100644
--- a/recipes/gcc/gcc-cross-sdk_4.1.2.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.1.2.bb
@@ -7,4 +7,4 @@ require gcc-package-sdk.inc

 DEPENDS += "gmp-native mpfr-native"

-EXTRA_OECONF += "--disable-libunwind-exceptions--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"+EXTRA_OECONF += "--disable-libunwind-exceptions--with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"diff --git a/recipes/gcc/gcc-cross-sdk_4.2.2.bbb/recipes/gcc/gcc-cross-sdk_4.2.2.bb

index bea9839..da4450f 100644
--- a/recipes/gcc/gcc-cross-sdk_4.2.2.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.2.2.bb
@@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native"

 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
                --disable-libgomp --disable-libmudflap \
-               --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+               --with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"

diff --git a/recipes/gcc/gcc-cross-sdk_4.2.3.bbb/recipes/gcc/gcc-cross-sdk_4.2.3.bb

index bea9839..da4450f 100644
--- a/recipes/gcc/gcc-cross-sdk_4.2.3.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.2.3.bb
@@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native"

 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
                --disable-libgomp --disable-libmudflap \
-               --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+               --with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"

diff --git a/recipes/gcc/gcc-cross-sdk_4.2.4.bbb/recipes/gcc/gcc-cross-sdk_4.2.4.bb

index 9c67c7e..b41adb5 100644
--- a/recipes/gcc/gcc-cross-sdk_4.2.4.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.2.4.bb
@@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native"

 EXTRA_OECONF += "--disable-libunwind-exceptions --enable-libssp \
                --enable-libgomp --disable-libmudflap \
-               --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+               --with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"

diff --git a/recipes/gcc/gcc-cross-sdk_4.3.1.bbb/recipes/gcc/gcc-cross-sdk_4.3.1.bb

index bea9839..da4450f 100644
--- a/recipes/gcc/gcc-cross-sdk_4.3.1.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.3.1.bb
@@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native"

 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
                --disable-libgomp --disable-libmudflap \
-               --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+               --with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"

diff --git a/recipes/gcc/gcc-cross-sdk_4.3.2.bbb/recipes/gcc/gcc-cross-sdk_4.3.2.bb

index bea9839..da4450f 100644
--- a/recipes/gcc/gcc-cross-sdk_4.3.2.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.3.2.bb
@@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native"

 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
                --disable-libgomp --disable-libmudflap \
-               --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+               --with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"

diff --git a/recipes/gcc/gcc-cross-sdk_4.3.3.bbb/recipes/gcc/gcc-cross-sdk_4.3.3.bb

index ed39d31..3ada381 100644
--- a/recipes/gcc/gcc-cross-sdk_4.3.3.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.3.3.bb
@@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native"

 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
                --disable-libgomp --disable-libmudflap \
-               --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+               --with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"

diff --git a/recipes/gcc/gcc-cross-sdk_4.3.4.bbb/recipes/gcc/gcc-cross-sdk_4.3.4.bb

index 88e26c5..fda3d70 100644
--- a/recipes/gcc/gcc-cross-sdk_4.3.4.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.3.4.bb
@@ -11,4 +11,4 @@ DEPENDS += "gmp-native mpfr-native"

 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
                --disable-libgomp --disable-libmudflap \
-               --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+               --with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"

diff --git a/recipes/gcc/gcc-cross-sdk_4.4.1.bbb/recipes/gcc/gcc-cross-sdk_4.4.1.bb

index e1b510e..c2913fa 100644
--- a/recipes/gcc/gcc-cross-sdk_4.4.1.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.4.1.bb
@@ -10,4 +10,4 @@ DEPENDS += "gmp-native mpfr-native"

 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
                --disable-libgomp --disable-libmudflap \
-               --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+               --with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"

diff --git a/recipes/gcc/gcc-cross-sdk_4.4.2.bbb/recipes/gcc/gcc-cross-sdk_4.4.2.bb

index e1b510e..c2913fa 100644
--- a/recipes/gcc/gcc-cross-sdk_4.4.2.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.4.2.bb
@@ -10,4 +10,4 @@ DEPENDS += "gmp-native mpfr-native"

 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
                --disable-libgomp --disable-libmudflap \
-               --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+               --with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"

diff --git a/recipes/gcc/gcc-cross-sdk_4.4.3.bbb/recipes/gcc/gcc-cross-sdk_4.4.3.bb

index e1b510e..c2913fa 100644
--- a/recipes/gcc/gcc-cross-sdk_4.4.3.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.4.3.bb
@@ -10,4 +10,4 @@ DEPENDS += "gmp-native mpfr-native"

 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
                --disable-libgomp --disable-libmudflap \
-               --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+               --with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"

diff --git a/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bbb/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb

index 2e4fcf2..3cf64bd 100644
--- a/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb
+++ b/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb
@@ -13,7 +13,7 @@ EXTRA_OECONF += " \
                --disable-libgomp \
                --disable-libunwind-exceptions \
                --disable-libmudflap \
-               --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} \
+               --with-mpfr=${STAGING_DIR_NATIVE}${prefix-native} \
                "

#We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this:-isystem/OE/angstrom-tmp/staging/i686-linux/usr/include

diff --git a/recipes/gcc/gcc-cross-sdk_svn.bb b/recipes/gcc/gcc-cross-sdk_svn.bb
index 48d8a0d..4c6cae4 100644
--- a/recipes/gcc/gcc-cross-sdk_svn.bb
+++ b/recipes/gcc/gcc-cross-sdk_svn.bb
@@ -11,4 +11,4 @@ DEPENDS += "libmpc-native gmp-native mpfr-native"

 EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
                --disable-libgomp --disable-libmudflap \
-               --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+               --with-mpfr=${STAGING_DIR_NATIVE}${prefix-native}"
diff --git a/recipes/gcc/gcc-cross_4.1.0.bb b/recipes/gcc/gcc-cross_4.1.0.bb
index def0586..4bddd02 100644
--- a/recipes/gcc/gcc-cross_4.1.0.bb
+++ b/recipes/gcc/gcc-cross_4.1.0.bb
@@ -5,4 +5,4 @@ require gcc-cross4.inc
 require gcc-configure-cross.inc
 require gcc-package-cross.inc