Renamed prefix_native, bindir_native, etc using camelCaps
PATCH 2/2 Renamed prefix_native, bindir_native, etc using camelCaps
- Avoids clashing with the machine override when MACHINE=native
- bindir_cross similarly renamed for consistency
--- 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(-)
classes/cross-canadian.bbclass +1 -1
@@ -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}"
classes/native.bbclass +2 -2
@@ -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 = ""
classes/packaged-staging.bbclass +4 -4
@@ -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" >> $STATUSFILEecho "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 () {
conf/bitbake.conf +18 -18
@@ -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 ##################################################################
conf/distro/micro.conf +2 -2
@@ -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"
recipes/gcc/gcc-cross-sdk_4.1.2.bb +1 -1
@@ -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}"
recipes/gcc/gcc-cross-sdk_4.2.2.bb +1 -1
@@ -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}"
recipes/gcc/gcc-cross-sdk_4.2.3.bb +1 -1
@@ -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}"
recipes/gcc/gcc-cross-sdk_4.2.4.bb +1 -1
@@ -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}"
recipes/gcc/gcc-cross-sdk_4.3.1.bb +1 -1
@@ -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}"
recipes/gcc/gcc-cross-sdk_4.3.2.bb +1 -1
@@ -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}"
recipes/gcc/gcc-cross-sdk_4.3.3.bb +1 -1
@@ -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}"
recipes/gcc/gcc-cross-sdk_4.3.4.bb +1 -1
@@ -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}"
recipes/gcc/gcc-cross-sdk_4.4.1.bb +1 -1
@@ -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}"
recipes/gcc/gcc-cross-sdk_4.4.2.bb +1 -1
@@ -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}"
recipes/gcc/gcc-cross-sdk_4.4.3.bb +1 -1
@@ -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}"
recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb +1 -1
@@ -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
recipes/gcc/gcc-cross-sdk_svn.bb +1 -1
@@ -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}"
recipes/gcc/gcc-cross_4.1.0.bb +1 -1
@@ -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}"
recipes/gcc/gcc-cross_4.1.1.bb +1 -1
@@ -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}"
recipes/gcc/gcc-cross_4.1.2.bb +1 -1
@@ -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}"
recipes/gcc/gcc-cross_4.2.1.bb +1 -1
@@ -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}"
recipes/gcc/gcc-cross_4.2.2.bb +1 -1
@@ -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}"
recipes/gcc/gcc-cross_4.2.3.bb +1 -1
@@ -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}"
recipes/gcc/gcc-cross_4.2.4.bb +1 -1
@@ -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}"
recipes/gcc/gcc-cross_4.3.1.bb +1 -1
@@ -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}"
recipes/gcc/gcc-cross_4.3.2.bb +1 -1
@@ -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}"
recipes/gcc/gcc-cross_4.3.3.bb +1 -1
@@ -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}"
recipes/gcc/gcc-cross_4.3.4.bb +1 -1
@@ -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}"
recipes/gcc/gcc-cross_4.4.1.bb +1 -1
@@ -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}"
recipes/gcc/gcc-cross_4.4.2.bb +1 -1
@@ -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}"
recipes/gcc/gcc-cross_4.4.3.bb +1 -1
@@ -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}"
recipes/gcc/gcc-cross_csl-arm-2007q3.bb +1 -2
@@ -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 = ""
recipes/gcc/gcc-cross_csl-arm-2008q1.bb +1 -2
@@ -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 = ""
recipes/gcc/gcc-cross_csl-arm-2008q3.bb +1 -2
@@ -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 = ""
recipes/gcc/gcc-cross_svn.bb +1 -1
@@ -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}"
recipes/libtool/libtool-cross_1.5.10.bb +2 -2
@@ -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 () {
recipes/libtool/libtool-cross_1.5.22.bb +2 -2
@@ -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 () {
recipes/libtool/libtool-cross_1.5.24.bb +2 -2
@@ -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 () {
recipes/libtool/libtool-cross_2.2.4.bb +2 -2
@@ -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 () {
recipes/libtool/libtool-cross_2.2.6a.bb +2 -2
@@ -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 () {
recipes/libtool/libtool-cross_2.2.6b.bb +2 -2
@@ -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 () {
Signature · 19 lines
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. =======================================================================
Quoted 2 lines · On Thursday 18 March 2010 02:31:11 Douglas Royds wrote:
- Avoids clashing with the machine override when MACHINE=native
-bindir_crosssimilarly 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.
Quoted 6 lines · Holger Hans Peter Freyther
Quoted 2 lines · On Thursday 18 March 2010 02:31:11 Douglas Royds wrote:
- Avoids clashing with the machine override when MACHINE=native
-bindir_crosssimilarly renamed for consistencyThank 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
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Quoted 8 lines · Richard Purdie
Quoted 6 lines · Holger Hans Peter Freyther
Quoted 2 lines · On Thursday 18 March 2010 02:31:11 Douglas Royds wrote:
- Avoids clashing with the machine override when MACHINE=native
-bindir_crosssimilarly renamed for consistencyThank you for that much work. I think we established the usage of '-' instead of '_' to avoid clashes with the override detection though.
Quoted 6 lines
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-----
Quoted 12 lines · Koen Kooi
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1Quoted 8 lines · Richard Purdie
Quoted 6 lines · Holger Hans Peter Freyther
Quoted 2 lines · On Thursday 18 March 2010 02:31:11 Douglas Royds wrote:
- Avoids clashing with the machine override when MACHINE=native
-bindir_crosssimilarly renamed for consistencyThank you for that much work. I think we established the usage of '-' instead of '_' to avoid clashes with the override detection though.
Quoted 8 lines
Quoted 6 lines
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
Quoted 20 lines · Richard Purdie
Quoted 19 lines · Koen Kooi
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1Quoted 14 lines · Richard Purdie
Quoted 6 lines · Holger Hans Peter Freyther
Quoted 2 lines · On Thursday 18 March 2010 02:31:11 Douglas Royds wrote:
- Avoids clashing with the machine override when MACHINE=native
-bindir_crosssimilarly renamed for consistencyThank 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 :(.
Quoted 7 lines
Quoted 1 line
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.
Quoted 14 lines
Cheers,
Richard
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Quoted 10 lines · Richard Purdie
Quoted 7 lines · Holger Hans Peter Freyther
Quoted 3 lines · On Thursday 18 March 2010 02:31:11 Douglas Royds wrote:
- Avoids clashing with the machine override when MACHINE=native
-bindir_crosssimilarly renamed for consistencyThank you for that much work. I think we established the usage of '-' instead of '_' to avoid clashes with the override detection though.
Quoted 6 lines
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.
=======================================================================
Quoted 27 lines · Douglas Royds
Quoted 11 lines · Richard Purdie
Quoted 8 lines · Holger Hans Peter Freyther
Quoted 3 lines · On Thursday 18 March 2010 02:31:11 Douglas Royds wrote:
- Avoids clashing with the machine override when MACHINE=native
-bindir_crosssimilarly renamed for consistencyThank you for that much work. I think we established the usage of '-' instead of '_' to avoid clashes with the override detection though.
Quoted 6 lines
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
_thingvariable 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_prefixbeing a case in point.
Quoted 2 lines
I propose that we rename
prefix_nativeand 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.
Quoted 6 lines
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