All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 2/2] Renamed prefix_native, bindir_native, etc using camelCaps
@ 2010-03-18  1:31 Douglas Royds
  2010-03-18  3:37 ` Holger Hans Peter Freyther
  0 siblings, 1 reply; 8+ messages in thread
From: Douglas Royds @ 2010-03-18  1:31 UTC (permalink / raw)
  To: openembedded-devel

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

Signed-off-by: Douglas Royds <douglas.royds@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..55f4a7d 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}/${bindirCross}"
  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..f8eea5e 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}${prefixNative}"
+exec_prefix = "${STAGING_DIR_NATIVE}${prefixNative}"

  # 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..a145218 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}${libdirNative}/opkg/info/ ]; then
+		mkdir -p ${TMPDIR}${libdirNative}/opkg/info/
  	fi
- 	if [ ! -e ${TMPDIR}${libdir_native}/ipkg/ ]; then
-		ln -sf opkg/ ${TMPDIR}${libdir_native}/ipkg || true
+ 	if [ ! -e ${TMPDIR}${libdirNative}/ipkg/ ]; then
+		ln -sf opkg/ ${TMPDIR}${libdirNative}/ipkg || true
  	fi
  }

@@ -182,7 +182,7 @@ python packagestage_scenefunc () {
          #
          # Install the staging package somewhere temporarily so we can 
extract the stamp files
          #
- 
bb.mkdirhier(bb.data.expand("${WORKDIR}/tstage/${libdir_native}/opkg/info/ ", d))
+ 
bb.mkdirhier(bb.data.expand("${WORKDIR}/tstage/${libdirNative}/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}${libdirNative}/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}${libdirNative}/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}${libdirNative}/opkg/info/${PSTAGE_PKGPN}.list
  }

  python do_package_stage () {
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 0886587..ef519d9 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_bindirNative = "/bin"
+base_sbindirNative = "/sbin"
+sysconfdirNative = "/etc"
+prefixNative = "/usr"
+bindirNative = "${prefixNative}/bin"
+sbindirNative = "${prefixNative}/sbin"
+includedirNative = "${prefixNative}/include"
+libdirNative = "${prefixNative}/lib"
+datadirNative = "${prefixNative}/share"
+bindirCross = "/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}${bindirNative}"
+STAGING_BINDIR_CROSS  = 
"${STAGING_DIR_NATIVE}${bindirNative}/${MULTIMACH_HOST_SYS}"
+STAGING_BINDIR_CROSS_BASEPKG = 
"${STAGING_DIR_NATIVE}${bindirNative}/${BASEPKG_TARGET_SYS}"
+STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${libdirNative}"
+STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedirNative}"
+STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdirNative}"
+STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${datadirNative}"

  # 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}${sbindirNative}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/${bindirCross}:${STAGING_DIR_NATIVE}${base_sbindirNative}:${STAGING_DIR_NATIVE}${base_bindirNative}:"
  export PATH

  ##################################################################
diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf
index 9885425..d055076 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 = ""
+prefixNative = ""
+exec_prefixNative = ""

  # Don't install ldconfig and associated gubbins
  USE_LDCONFIG = "0"
diff --git a/recipes/gcc/gcc-cross-sdk_4.1.2.bb 
b/recipes/gcc/gcc-cross-sdk_4.1.2.bb
index 6a74606..babeeef 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}${prefixNative}"
diff --git a/recipes/gcc/gcc-cross-sdk_4.2.2.bb 
b/recipes/gcc/gcc-cross-sdk_4.2.2.bb
index bea9839..9118e54 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}${prefixNative}"
diff --git a/recipes/gcc/gcc-cross-sdk_4.2.3.bb 
b/recipes/gcc/gcc-cross-sdk_4.2.3.bb
index bea9839..9118e54 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}${prefixNative}"
diff --git a/recipes/gcc/gcc-cross-sdk_4.2.4.bb 
b/recipes/gcc/gcc-cross-sdk_4.2.4.bb
index 9c67c7e..d90e864 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}${prefixNative}"
diff --git a/recipes/gcc/gcc-cross-sdk_4.3.1.bb 
b/recipes/gcc/gcc-cross-sdk_4.3.1.bb
index bea9839..9118e54 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}${prefixNative}"
diff --git a/recipes/gcc/gcc-cross-sdk_4.3.2.bb 
b/recipes/gcc/gcc-cross-sdk_4.3.2.bb
index bea9839..9118e54 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}${prefixNative}"
diff --git a/recipes/gcc/gcc-cross-sdk_4.3.3.bb 
b/recipes/gcc/gcc-cross-sdk_4.3.3.bb
index ed39d31..fcd0964 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}${prefixNative}"
diff --git a/recipes/gcc/gcc-cross-sdk_4.3.4.bb 
b/recipes/gcc/gcc-cross-sdk_4.3.4.bb
index 88e26c5..116ec1e 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}${prefixNative}"
diff --git a/recipes/gcc/gcc-cross-sdk_4.4.1.bb 
b/recipes/gcc/gcc-cross-sdk_4.4.1.bb
index e1b510e..03fd3a5 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}${prefixNative}"
diff --git a/recipes/gcc/gcc-cross-sdk_4.4.2.bb 
b/recipes/gcc/gcc-cross-sdk_4.4.2.bb
index e1b510e..03fd3a5 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}${prefixNative}"
diff --git a/recipes/gcc/gcc-cross-sdk_4.4.3.bb 
b/recipes/gcc/gcc-cross-sdk_4.4.3.bb
index e1b510e..03fd3a5 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}${prefixNative}"
diff --git a/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb 
b/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb
index 2e4fcf2..f334027 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}${prefixNative} \
  		"

  #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..30f4fa4 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}${prefixNative}"
diff --git a/recipes/gcc/gcc-cross_4.1.0.bb b/recipes/gcc/gcc-cross_4.1.0.bb
index def0586..1685201 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

-EXTRA_OECONF += "--disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += "--disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefixNative}"
diff --git a/recipes/gcc/gcc-cross_4.1.1.bb b/recipes/gcc/gcc-cross_4.1.1.bb
index e96867e..a1f63bd 100644
--- a/recipes/gcc/gcc-cross_4.1.1.bb
+++ b/recipes/gcc/gcc-cross_4.1.1.bb
@@ -7,4 +7,4 @@ require gcc-package-cross.inc

  SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "

-EXTRA_OECONF += "--disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += "--disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefixNative}"
diff --git a/recipes/gcc/gcc-cross_4.1.2.bb b/recipes/gcc/gcc-cross_4.1.2.bb
index 2367d19..963eca1 100644
--- a/recipes/gcc/gcc-cross_4.1.2.bb
+++ b/recipes/gcc/gcc-cross_4.1.2.bb
@@ -9,6 +9,6 @@ SRC_URI_append_fail-fast = " 
file://zecke-no-host-includes.patch;patch=1 "

  EXTRA_OECONF_append_avr32= "  --disable-libmudflap "

-EXTRA_OECONF += "--disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += "--disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefixNative}"

  ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
diff --git a/recipes/gcc/gcc-cross_4.2.1.bb b/recipes/gcc/gcc-cross_4.2.1.bb
index 8c7f4c5..e0d1c41 100644
--- a/recipes/gcc/gcc-cross_4.2.1.bb
+++ b/recipes/gcc/gcc-cross_4.2.1.bb
@@ -7,6 +7,6 @@ require gcc-package-cross.inc

  SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "

-EXTRA_OECONF += "--disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += "--disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefixNative}"

  ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
diff --git a/recipes/gcc/gcc-cross_4.2.2.bb b/recipes/gcc/gcc-cross_4.2.2.bb
index cf1bf68..36c4e20 100644
--- a/recipes/gcc/gcc-cross_4.2.2.bb
+++ b/recipes/gcc/gcc-cross_4.2.2.bb
@@ -7,6 +7,6 @@ require gcc-package-cross.inc

  SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "

-EXTRA_OECONF += "--disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += "--disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefixNative}"

  ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
diff --git a/recipes/gcc/gcc-cross_4.2.3.bb b/recipes/gcc/gcc-cross_4.2.3.bb
index cf1bf68..36c4e20 100644
--- a/recipes/gcc/gcc-cross_4.2.3.bb
+++ b/recipes/gcc/gcc-cross_4.2.3.bb
@@ -7,6 +7,6 @@ require gcc-package-cross.inc

  SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "

-EXTRA_OECONF += "--disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += "--disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefixNative}"

  ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
diff --git a/recipes/gcc/gcc-cross_4.2.4.bb b/recipes/gcc/gcc-cross_4.2.4.bb
index cf1bf68..36c4e20 100644
--- a/recipes/gcc/gcc-cross_4.2.4.bb
+++ b/recipes/gcc/gcc-cross_4.2.4.bb
@@ -7,6 +7,6 @@ require gcc-package-cross.inc

  SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "

-EXTRA_OECONF += "--disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += "--disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefixNative}"

  ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
diff --git a/recipes/gcc/gcc-cross_4.3.1.bb b/recipes/gcc/gcc-cross_4.3.1.bb
index acd5521..5835784 100644
--- a/recipes/gcc/gcc-cross_4.3.1.bb
+++ b/recipes/gcc/gcc-cross_4.3.1.bb
@@ -7,6 +7,6 @@ require gcc-package-cross.inc

  SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "

-EXTRA_OECONF += "  --enable-cheaders=c_std --disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += "  --enable-cheaders=c_std --disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefixNative}"

  ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
diff --git a/recipes/gcc/gcc-cross_4.3.2.bb b/recipes/gcc/gcc-cross_4.3.2.bb
index 94b98b9..6c3dd7e 100644
--- a/recipes/gcc/gcc-cross_4.3.2.bb
+++ b/recipes/gcc/gcc-cross_4.3.2.bb
@@ -6,6 +6,6 @@ require gcc-package-cross.inc

  SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "

-EXTRA_OECONF += "  --enable-cheaders=c_std --disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += "  --enable-cheaders=c_std --disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefixNative}"

  ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
diff --git a/recipes/gcc/gcc-cross_4.3.3.bb b/recipes/gcc/gcc-cross_4.3.3.bb
index 94b98b9..6c3dd7e 100644
--- a/recipes/gcc/gcc-cross_4.3.3.bb
+++ b/recipes/gcc/gcc-cross_4.3.3.bb
@@ -6,6 +6,6 @@ require gcc-package-cross.inc

  SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "

-EXTRA_OECONF += "  --enable-cheaders=c_std --disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += "  --enable-cheaders=c_std --disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefixNative}"

  ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
diff --git a/recipes/gcc/gcc-cross_4.3.4.bb b/recipes/gcc/gcc-cross_4.3.4.bb
index 71cb5e6..9891b08 100644
--- a/recipes/gcc/gcc-cross_4.3.4.bb
+++ b/recipes/gcc/gcc-cross_4.3.4.bb
@@ -6,6 +6,6 @@ require gcc-package-cross.inc

  SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "

-EXTRA_OECONF += "  --enable-cheaders=c_std --disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += "  --enable-cheaders=c_std --disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefixNative}"

  ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
diff --git a/recipes/gcc/gcc-cross_4.4.1.bb b/recipes/gcc/gcc-cross_4.4.1.bb
index 11eb29d..e5cdc8a 100644
--- a/recipes/gcc/gcc-cross_4.4.1.bb
+++ b/recipes/gcc/gcc-cross_4.4.1.bb
@@ -6,6 +6,6 @@ PR = "${INC_PR}.1"

  SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "

-EXTRA_OECONF += " --disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += " --disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefixNative}"

  ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
diff --git a/recipes/gcc/gcc-cross_4.4.2.bb b/recipes/gcc/gcc-cross_4.4.2.bb
index 11eb29d..e5cdc8a 100644
--- a/recipes/gcc/gcc-cross_4.4.2.bb
+++ b/recipes/gcc/gcc-cross_4.4.2.bb
@@ -6,6 +6,6 @@ PR = "${INC_PR}.1"

  SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "

-EXTRA_OECONF += " --disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += " --disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefixNative}"

  ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
diff --git a/recipes/gcc/gcc-cross_4.4.3.bb b/recipes/gcc/gcc-cross_4.4.3.bb
index 11eb29d..e5cdc8a 100644
--- a/recipes/gcc/gcc-cross_4.4.3.bb
+++ b/recipes/gcc/gcc-cross_4.4.3.bb
@@ -6,6 +6,6 @@ PR = "${INC_PR}.1"

  SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "

-EXTRA_OECONF += " --disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += " --disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefixNative}"

  ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
diff --git a/recipes/gcc/gcc-cross_csl-arm-2007q3.bb 
b/recipes/gcc/gcc-cross_csl-arm-2007q3.bb
index adf7f5a..3e2271f 100644
--- a/recipes/gcc/gcc-cross_csl-arm-2007q3.bb
+++ b/recipes/gcc/gcc-cross_csl-arm-2007q3.bb
@@ -7,7 +7,7 @@ require gcc-package-cross.inc

  SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "

-EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefixNative}"

  #We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: 
-isystem/OE/angstrom-tmp/staging/i686-linux/usr/include
  CFLAGS = ""
diff --git a/recipes/gcc/gcc-cross_csl-arm-2008q1.bb 
b/recipes/gcc/gcc-cross_csl-arm-2008q1.bb
index d534574..32e65c5 100644
--- a/recipes/gcc/gcc-cross_csl-arm-2008q1.bb
+++ b/recipes/gcc/gcc-cross_csl-arm-2008q1.bb
@@ -7,7 +7,7 @@ require gcc-package-cross.inc

  SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "

-EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefixNative}"

  #We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: 
-isystem/OE/angstrom-tmp/staging/i686-linux/usr/include
  CFLAGS = ""
diff --git a/recipes/gcc/gcc-cross_csl-arm-2008q3.bb 
b/recipes/gcc/gcc-cross_csl-arm-2008q3.bb
index ef4ef30..d226e26 100644
--- a/recipes/gcc/gcc-cross_csl-arm-2008q3.bb
+++ b/recipes/gcc/gcc-cross_csl-arm-2008q3.bb
@@ -7,7 +7,7 @@ require gcc-package-cross.inc

  SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "

-EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
+EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefixNative}"

  #We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: 
-isystem/OE/angstrom-tmp/staging/i686-linux/usr/include
  CFLAGS = ""
diff --git a/recipes/gcc/gcc-cross_svn.bb b/recipes/gcc/gcc-cross_svn.bb
index 2d3c136..ae5f374 100644
--- a/recipes/gcc/gcc-cross_svn.bb
+++ b/recipes/gcc/gcc-cross_svn.bb
@@ -8,6 +8,6 @@ DEPENDS += "libmpc-native"

  SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "

-EXTRA_OECONF += " --disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} --with-system-zlib"
+EXTRA_OECONF += " --disable-libunwind-exceptions 
--with-mpfr=${STAGING_DIR_NATIVE}${prefixNative} --with-system-zlib"

  ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
diff --git a/recipes/libtool/libtool-cross_1.5.10.bb 
b/recipes/libtool/libtool-cross_1.5.10.bb
index 1ae9c68..b813252 100644
--- a/recipes/libtool/libtool-cross_1.5.10.bb
+++ b/recipes/libtool/libtool-cross_1.5.10.bb
@@ -13,8 +13,8 @@ SRC_URI_append = " file://rpath-control.patch;patch=1 \

  S = "${WORKDIR}/libtool-${PV}"

-prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
-exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
+prefix = "${STAGING_DIR_NATIVE}${prefixNative}"
+exec_prefix = "${STAGING_DIR_NATIVE}${prefixNative}"
  bindir = "${STAGING_BINDIR_NATIVE}"

  do_configure_prepend () {
diff --git a/recipes/libtool/libtool-cross_1.5.22.bb 
b/recipes/libtool/libtool-cross_1.5.22.bb
index 3832612..81429a3 100644
--- a/recipes/libtool/libtool-cross_1.5.22.bb
+++ b/recipes/libtool/libtool-cross_1.5.22.bb
@@ -12,8 +12,8 @@ SRC_URI_append = " file://libdir-la.patch;patch=1 \
                     file://install-path-check.patch;patch=1"
  S = "${WORKDIR}/libtool-${PV}"

-prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
-exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
+prefix = "${STAGING_DIR_NATIVE}${prefixNative}"
+exec_prefix = "${STAGING_DIR_NATIVE}${prefixNative}"
  bindir = "${STAGING_BINDIR_NATIVE}"

  do_compile () {
diff --git a/recipes/libtool/libtool-cross_1.5.24.bb 
b/recipes/libtool/libtool-cross_1.5.24.bb
index 211e5a3..2f7f92c 100644
--- a/recipes/libtool/libtool-cross_1.5.24.bb
+++ b/recipes/libtool/libtool-cross_1.5.24.bb
@@ -9,8 +9,8 @@ SRC_URI_append = " file://libdir-la.patch;patch=1 \
                     file://install-path-check.patch;patch=1"
  S = "${WORKDIR}/libtool-${PV}"

-prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
-exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
+prefix = "${STAGING_DIR_NATIVE}${prefixNative}"
+exec_prefix = "${STAGING_DIR_NATIVE}${prefixNative}"
  bindir = "${STAGING_BINDIR_NATIVE}"

  do_compile () {
diff --git a/recipes/libtool/libtool-cross_2.2.4.bb 
b/recipes/libtool/libtool-cross_2.2.4.bb
index 1a60b57..9c83174 100644
--- a/recipes/libtool/libtool-cross_2.2.4.bb
+++ b/recipes/libtool/libtool-cross_2.2.4.bb
@@ -17,8 +17,8 @@ DOLT_PATCH_i586 = " file://add_dolt.patch;patch=1"

  S = "${WORKDIR}/libtool-${PV}"

-prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
-exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
+prefix = "${STAGING_DIR_NATIVE}${prefixNative}"
+exec_prefix = "${STAGING_DIR_NATIVE}${prefixNative}"
  bindir = "${STAGING_BINDIR_NATIVE}"

  do_compile () {
diff --git a/recipes/libtool/libtool-cross_2.2.6a.bb 
b/recipes/libtool/libtool-cross_2.2.6a.bb
index d3ea34a..15e74d1 100644
--- a/recipes/libtool/libtool-cross_2.2.6a.bb
+++ b/recipes/libtool/libtool-cross_2.2.6a.bb
@@ -15,8 +15,8 @@ DOLT_PATCH_i586 = " file://add_dolt.patch;patch=1"
  #SRC_URI_append_linux = "${DOLT_PATCH}"
  #SRC_URI_append_linux-gnueabi = "${DOLT_PATCH}"

-prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
-exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
+prefix = "${STAGING_DIR_NATIVE}${prefixNative}"
+exec_prefix = "${STAGING_DIR_NATIVE}${prefixNative}"
  bindir = "${STAGING_BINDIR_NATIVE}"

  do_compile () {
diff --git a/recipes/libtool/libtool-cross_2.2.6b.bb 
b/recipes/libtool/libtool-cross_2.2.6b.bb
index d3ea34a..15e74d1 100644
--- a/recipes/libtool/libtool-cross_2.2.6b.bb
+++ b/recipes/libtool/libtool-cross_2.2.6b.bb
@@ -15,8 +15,8 @@ DOLT_PATCH_i586 = " file://add_dolt.patch;patch=1"
  #SRC_URI_append_linux = "${DOLT_PATCH}"
  #SRC_URI_append_linux-gnueabi = "${DOLT_PATCH}"

-prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
-exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
+prefix = "${STAGING_DIR_NATIVE}${prefixNative}"
+exec_prefix = "${STAGING_DIR_NATIVE}${prefixNative}"
  bindir = "${STAGING_BINDIR_NATIVE}"

  do_compile () {
-- 
1.6.3.3







=======================================================================
This email, including any attachments, is only for the intended
addressee.  It is subject to copyright, is confidential and may be
the subject of legal or other privilege, none of which is waived or
lost by reason of this transmission.
If the receiver is not the intended addressee, please accept our
apologies, notify us by return, delete all copies and perform no
other act on the email.
Unfortunately, we cannot warrant that the email has not been
 altered or corrupted during transmission.
=======================================================================




^ permalink raw reply related	[flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] Renamed prefix_native, bindir_native, etc using camelCaps
  2010-03-18  1:31 [PATCH 2/2] Renamed prefix_native, bindir_native, etc using camelCaps Douglas Royds
@ 2010-03-18  3:37 ` Holger Hans Peter Freyther
  2010-03-18 17:29   ` Richard Purdie
  0 siblings, 1 reply; 8+ messages in thread
From: Holger Hans Peter Freyther @ 2010-03-18  3:37 UTC (permalink / raw)
  To: openembedded-devel

On Thursday 18 March 2010 02:31:11 Douglas Royds wrote:
>     - Avoids clashing with the machine override when MACHINE=native
>     - bindir_cross similarly renamed for consistency

Thank you for that much work. I think we established the usage of '-' instead 
of '_' to avoid clashes with the override detection though.



^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] Renamed prefix_native, bindir_native, etc using camelCaps
  2010-03-18  3:37 ` Holger Hans Peter Freyther
@ 2010-03-18 17:29   ` Richard Purdie
  2010-03-18 17:49     ` Koen Kooi
  2010-03-18 20:58     ` Douglas Royds
  0 siblings, 2 replies; 8+ messages in thread
From: Richard Purdie @ 2010-03-18 17:29 UTC (permalink / raw)
  To: openembedded-devel

On Thu, 2010-03-18 at 04:37 +0100, Holger Hans Peter Freyther wrote:
> On Thursday 18 March 2010 02:31:11 Douglas Royds wrote:
> >     - Avoids clashing with the machine override when MACHINE=native
> >     - bindir_cross similarly renamed for consistency
> 
> Thank you for that much work. I think we established the usage of '-' instead 
> of '_' to avoid clashes with the override detection though.

I just noticed this problem. It makes me very very nervous to introduce
yet another variable naming convention, particularly one we don't use
anywhere else :/.

Might it be simpler to rename the native machine? Using "native" in the
override namespace is asking for trouble :(.

Cheers,

Richard




^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] Renamed prefix_native, bindir_native, etc using camelCaps
  2010-03-18 17:29   ` Richard Purdie
@ 2010-03-18 17:49     ` Koen Kooi
  2010-03-18 19:42       ` Richard Purdie
  2010-03-18 20:58     ` Douglas Royds
  1 sibling, 1 reply; 8+ messages in thread
From: Koen Kooi @ 2010-03-18 17:49 UTC (permalink / raw)
  To: openembedded-devel

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 18-03-10 18:29, Richard Purdie wrote:
> On Thu, 2010-03-18 at 04:37 +0100, Holger Hans Peter Freyther wrote:
>> On Thursday 18 March 2010 02:31:11 Douglas Royds wrote:
>>>     - Avoids clashing with the machine override when MACHINE=native
>>>     - bindir_cross similarly renamed for consistency
>>
>> Thank you for that much work. I think we established the usage of '-' instead 
>> of '_' to avoid clashes with the override detection though.
> 
> I just noticed this problem. It makes me very very nervous to introduce
> yet another variable naming convention, particularly one we don't use
> anywhere else :/.
> 
> Might it be simpler to rename the native machine? Using "native" in the
> override namespace is asking for trouble :(.

rename it to 'host'?

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFLomegMkyGM64RGpERAm7XAJ9OB1gmMzsb3FOqjV8Mm2xwkv+LzACfcXUq
fxy5Z/ZFU4y/m/2vM8dspKo=
=NkTG
-----END PGP SIGNATURE-----




^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] Renamed prefix_native, bindir_native, etc using camelCaps
  2010-03-18 17:49     ` Koen Kooi
@ 2010-03-18 19:42       ` Richard Purdie
  2010-03-18 19:55         ` Khem Raj
  0 siblings, 1 reply; 8+ messages in thread
From: Richard Purdie @ 2010-03-18 19:42 UTC (permalink / raw)
  To: openembedded-devel

On Thu, 2010-03-18 at 18:49 +0100, Koen Kooi wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> On 18-03-10 18:29, Richard Purdie wrote:
> > On Thu, 2010-03-18 at 04:37 +0100, Holger Hans Peter Freyther wrote:
> >> On Thursday 18 March 2010 02:31:11 Douglas Royds wrote:
> >>>     - Avoids clashing with the machine override when MACHINE=native
> >>>     - bindir_cross similarly renamed for consistency
> >>
> >> Thank you for that much work. I think we established the usage of '-' instead 
> >> of '_' to avoid clashes with the override detection though.
> > 
> > I just noticed this problem. It makes me very very nervous to introduce
> > yet another variable naming convention, particularly one we don't use
> > anywhere else :/.
> > 
> > Might it be simpler to rename the native machine? Using "native" in the
> > override namespace is asking for trouble :(.
> 
> rename it to 'host'?

Its still not a good name to have in overrides. We really need something
meaningful but not generic e.g. "localmachine"

Cheers,

Richard







^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] Renamed prefix_native, bindir_native, etc using  camelCaps
  2010-03-18 19:42       ` Richard Purdie
@ 2010-03-18 19:55         ` Khem Raj
  0 siblings, 0 replies; 8+ messages in thread
From: Khem Raj @ 2010-03-18 19:55 UTC (permalink / raw)
  To: openembedded-devel

On Thu, Mar 18, 2010 at 12:42 PM, Richard Purdie <rpurdie@rpsys.net> wrote:
> On Thu, 2010-03-18 at 18:49 +0100, Koen Kooi wrote:
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> On 18-03-10 18:29, Richard Purdie wrote:
>> > On Thu, 2010-03-18 at 04:37 +0100, Holger Hans Peter Freyther wrote:
>> >> On Thursday 18 March 2010 02:31:11 Douglas Royds wrote:
>> >>>     - Avoids clashing with the machine override when MACHINE=native
>> >>>     - bindir_cross similarly renamed for consistency
>> >>
>> >> Thank you for that much work. I think we established the usage of '-' instead
>> >> of '_' to avoid clashes with the override detection though.
>> >
>> > I just noticed this problem. It makes me very very nervous to introduce
>> > yet another variable naming convention, particularly one we don't use
>> > anywhere else :/.
>> >
>> > Might it be simpler to rename the native machine? Using "native" in the
>> > override namespace is asking for trouble :(.
>>
>> rename it to 'host'?



>
> Its still not a good name to have in overrides. We really need something
> meaningful but not generic e.g. "localmachine"

yeah I would vote for renaming the machine. Some overrides should be
respected just for
the level of intrusion they have.

>
> Cheers,
>
> Richard
>
>
>
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>



^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] Renamed prefix_native, bindir_native, etc using camelCaps
  2010-03-18 17:29   ` Richard Purdie
  2010-03-18 17:49     ` Koen Kooi
@ 2010-03-18 20:58     ` Douglas Royds
  2010-03-18 21:19       ` Richard Purdie
  1 sibling, 1 reply; 8+ messages in thread
From: Douglas Royds @ 2010-03-18 20:58 UTC (permalink / raw)
  To: openembedded-devel

Richard Purdie wrote:
> On Thu, 2010-03-18 at 04:37 +0100, Holger Hans Peter Freyther wrote:
>   
>> On Thursday 18 March 2010 02:31:11 Douglas Royds wrote:
>>     
>>>     - Avoids clashing with the machine override when MACHINE=native
>>>     - bindir_cross similarly renamed for consistency
>>>       
>> Thank you for that much work. I think we established the usage of '-' instead 
>> of '_' to avoid clashes with the override detection though.
>>     
>
> I just noticed this problem. It makes me very very nervous to introduce
> yet another variable naming convention, particularly one we don't use
> anywhere else :/.
>
> Might it be simpler to rename the native machine? Using "native" in the
> override namespace is asking for trouble :(.

I have no objection to renaming the native machine, but I think we 
should also ensure that we never use _thing variable names (in lower 
case). We have a weak distinction between overrides and underscored 
variable names. By convention, BitBake variables are entirely in 
uppercase, and overrides in lower case, but this convention fails when 
the variable names are externally imposed (by the Autotools), 
exec_prefix being a case in point.

I propose that we rename prefix_native and friends to avoid any risk of 
clashing with the overrides.

Separately, if we wish, we can rename the native machine. I suggest 
"buildhost". This would also help to clarify that the following two 
builds have quite different intentions, though the result is similar:

    bitbake thing-native
    MACHINE=native bitbake thing

Douglas






=======================================================================
This email, including any attachments, is only for the intended
addressee.  It is subject to copyright, is confidential and may be
the subject of legal or other privilege, none of which is waived or
lost by reason of this transmission.
If the receiver is not the intended addressee, please accept our
apologies, notify us by return, delete all copies and perform no
other act on the email.
Unfortunately, we cannot warrant that the email has not been
 altered or corrupted during transmission.
=======================================================================




^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] Renamed prefix_native, bindir_native, etc using camelCaps
  2010-03-18 20:58     ` Douglas Royds
@ 2010-03-18 21:19       ` Richard Purdie
  0 siblings, 0 replies; 8+ messages in thread
From: Richard Purdie @ 2010-03-18 21:19 UTC (permalink / raw)
  To: openembedded-devel

On Fri, 2010-03-19 at 09:58 +1300, Douglas Royds wrote:
> Richard Purdie wrote:
> > On Thu, 2010-03-18 at 04:37 +0100, Holger Hans Peter Freyther wrote:
> >   
> >> On Thursday 18 March 2010 02:31:11 Douglas Royds wrote:
> >>     
> >>>     - Avoids clashing with the machine override when MACHINE=native
> >>>     - bindir_cross similarly renamed for consistency
> >>>       
> >> Thank you for that much work. I think we established the usage of '-' instead 
> >> of '_' to avoid clashes with the override detection though.
> >>     
> >
> > I just noticed this problem. It makes me very very nervous to introduce
> > yet another variable naming convention, particularly one we don't use
> > anywhere else :/.
> >
> > Might it be simpler to rename the native machine? Using "native" in the
> > override namespace is asking for trouble :(.
> 
> I have no objection to renaming the native machine, but I think we 
> should also ensure that we never use _thing variable names (in lower 
> case). We have a weak distinction between overrides and underscored 
> variable names. By convention, BitBake variables are entirely in 
> uppercase, and overrides in lower case, but this convention fails when 
> the variable names are externally imposed (by the Autotools), 
> exec_prefix being a case in point.
> 
> I propose that we rename prefix_native and friends to avoid any risk of 
> clashing with the overrides.

I think the better way to fix this long term is to change the override
character in bitbake itself. We've been around in circles on this issue
and its the only sane way as _ does make a logical separator in variable
names, rightly or wrongly.

> Separately, if we wish, we can rename the native machine. I suggest 
> "buildhost". This would also help to clarify that the following two 
> builds have quite different intentions, though the result is similar:
> 
>     bitbake thing-native
>     MACHINE=native bitbake thing

Agreed.

Cheers,

Richard




^ permalink raw reply	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2010-03-18 21:22 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-18  1:31 [PATCH 2/2] Renamed prefix_native, bindir_native, etc using camelCaps Douglas Royds
2010-03-18  3:37 ` Holger Hans Peter Freyther
2010-03-18 17:29   ` Richard Purdie
2010-03-18 17:49     ` Koen Kooi
2010-03-18 19:42       ` Richard Purdie
2010-03-18 19:55         ` Khem Raj
2010-03-18 20:58     ` Douglas Royds
2010-03-18 21:19       ` Richard Purdie

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.