[oe-commits] org.oe.dev classes: Sync staging layout cleanups from Poky
rpurdie commit
openembedded-commits at lists.openembedded.org
Sun Nov 18 01:04:45 UTC 2007
classes: Sync staging layout cleanups from Poky
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: f685529b729d043eda09b16df494e6b6e3670b52
ViewMTN: http://monotone.openembedded.org/revision/info/f685529b729d043eda09b16df494e6b6e3670b52
Files:
1
classes/base.bbclass
classes/binconfig.bbclass
classes/cross.bbclass
classes/distutils.bbclass
classes/image.bbclass
classes/mozilla.bbclass
classes/pkgconfig.bbclass
classes/rootfs_deb.bbclass
classes/sdk.bbclass
classes/tmake.bbclass
classes/xlibs.bbclass
Diffs:
#
# mt diff -readfc810872d799794c4b85a58f8eab1800e803f -rf685529b729d043eda09b16df494e6b6e3670b52
#
#
#
# patch "classes/base.bbclass"
# from [e1c68dc4c2e471a2a583c360a4fd407334e3f6b4]
# to [aa9556ce2534ddc34c19b8887bb5cd01a46e8ba1]
#
# patch "classes/binconfig.bbclass"
# from [6df8ff62e378cb9641276f7b3ed87f3cda559c4e]
# to [660275cce8f7fec339f68e7aa419d334663a5a21]
#
# patch "classes/cross.bbclass"
# from [3a4bcbb22dfee161783616c57a9668a76776f63c]
# to [8ef5df86820dc67931c8ddb72f1fe303ee04f0b8]
#
# patch "classes/distutils.bbclass"
# from [539b0b48207ebc4a3d5c0eb1aabe41de88cc8922]
# to [09ebff44a5c1e71a442d953d3616f2d4f8c4eaaa]
#
# patch "classes/image.bbclass"
# from [469ee07830a49ad3c97a67804413039b7e82c1a0]
# to [57e9ee07875e7423b6e199df2c69e55bdcdb8a69]
#
# patch "classes/mozilla.bbclass"
# from [31a97114fb000d9036266b9dcdcc85790ae09d2f]
# to [6ab6eb167d906fa0e43bd10ab5c10985f1a1162a]
#
# patch "classes/pkgconfig.bbclass"
# from [63cdda1bfc6dad494dbd704675246aa24fc852ae]
# to [9d65286d1a88f4f1731e7a5c0d77b73f19a4fb91]
#
# patch "classes/rootfs_deb.bbclass"
# from [2626dcbe48732859448d08101587a14fe238e7ac]
# to [a0b75d9e9ae17a15ef75f4c35ae2dbe1a9b70922]
#
# patch "classes/sdk.bbclass"
# from [2c814910040ad3a2a065b5001ff19084627f4b30]
# to [c676bc74ec4f1990541362dca4fe5698aca8eba8]
#
# patch "classes/tmake.bbclass"
# from [8bd645a6112f70f5ddcc9fa992ff31da23f56038]
# to [4306ef98dd175ec795cc2dc43fabf275758f235d]
#
# patch "classes/xlibs.bbclass"
# from [ea5dd6de4c563ff84d78c6feaf862d16dc6d3948]
# to [2be3a77c5785ddbbf13dd40f8f9ce044da7a0769]
#
============================================================
--- classes/base.bbclass e1c68dc4c2e471a2a583c360a4fd407334e3f6b4
+++ classes/base.bbclass aa9556ce2534ddc34c19b8887bb5cd01a46e8ba1
@@ -684,8 +684,8 @@ base_do_stage () {
:
}
-do_populate_staging[dirs] = "${STAGING_DIR_TARGET}/bin ${STAGING_DIR_TARGET}/lib \
- ${STAGING_DIR_TARGET}/include \
+do_populate_staging[dirs] = "${STAGING_DIR_TARGET}/${layout_bindir} ${STAGING_DIR_TARGET}/${layout_libdir} \
+ ${STAGING_DIR_TARGET}/${layout_includedir} \
${STAGING_BINDIR_NATIVE} ${STAGING_LIBDIR_NATIVE} \
${STAGING_INCDIR_NATIVE} \
${STAGING_DATADIR} \
============================================================
--- classes/binconfig.bbclass 6df8ff62e378cb9641276f7b3ed87f3cda559c4e
+++ classes/binconfig.bbclass 660275cce8f7fec339f68e7aa419d334663a5a21
@@ -16,8 +16,8 @@ def get_binconfig_mangle(d):
s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'"
s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'"
s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'"
- s += " -e 's:OEPREFIX:${STAGING_LIBDIR}/..:'"
- s += " -e 's:OEEXECPREFIX:${STAGING_LIBDIR}/..:'"
+ s += " -e 's:OEPREFIX:${STAGING_DIR_HOST}${layout_prefix}:'"
+ s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${layout_exec_prefix}:'"
s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'"
s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'"
return s
@@ -33,7 +33,7 @@ do_install_append() {
-e 's:${STAGING_LIBDIR}:${libdir}:g;' \
-e 's:${STAGING_INCDIR}:${includedir}:g;' \
-e 's:${STAGING_DATADIR}:${datadir}:' \
- -e 's:${STAGING_LIBDIR}/..:${prefix}:' > ${D}${bindir}/`basename $config`
+ -e 's:${STAGING_DIR_HOST}${layout_prefix}:${prefix}:' > ${D}${bindir}/`basename $config`
done
fi
@@ -42,7 +42,7 @@ do_install_append() {
-e 's:${STAGING_LIBDIR}:${libdir}:g;' \
-e 's:${STAGING_INCDIR}:${includedir}:g;' \
-e 's:${STAGING_DATADIR}:${datadir}:' \
- -e 's:${STAGING_LIBDIR}/..:${prefix}:' \
+ -e 's:${STAGING_DIR_HOST}${layout_prefix}:${prefix}:' \
$lafile
done
}
============================================================
--- classes/cross.bbclass 3a4bcbb22dfee161783616c57a9668a76776f63c
+++ classes/cross.bbclass 8ef5df86820dc67931c8ddb72f1fe303ee04f0b8
@@ -18,7 +18,7 @@ LDFLAGS = "${BUILD_LDFLAGS}"
CFLAGS = "${BUILD_CFLAGS}"
CXXFLAGS = "${BUILD_CFLAGS}"
LDFLAGS = "${BUILD_LDFLAGS}"
-LDFLAGS_build-darwin = "-L${STAGING_LIBDIR_NATIVE} "
+LDFLAGS_build-darwin = "-L${STAGING_LIBDIR_NATIVE}"
# Overrides for paths
============================================================
--- classes/distutils.bbclass 539b0b48207ebc4a3d5c0eb1aabe41de88cc8922
+++ classes/distutils.bbclass 09ebff44a5c1e71a442d953d3616f2d4f8c4eaaa
@@ -13,10 +13,10 @@ distutils_stage_all() {
}
distutils_stage_all() {
- install -d ${STAGING_INCDIR}/../${PYTHON_DIR}/site-packages
- PYTHONPATH=${STAGING_INCDIR}/../${PYTHON_DIR}/site-packages \
+ install -d ${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages
+ PYTHONPATH=${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages \
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
- ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${STAGING_INCDIR}/.. --install-data=${STAGING_INCDIR}/../share || \
+ ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${STAGING_DIR_HOST}${layout_prefix} --install-data=${STAGING_DATADIR} || \
oefatal "python setup.py install (stage) execution failed."
}
============================================================
--- classes/image.bbclass 469ee07830a49ad3c97a67804413039b7e82c1a0
+++ classes/image.bbclass 57e9ee07875e7423b6e199df2c69e55bdcdb8a69
@@ -1,9 +1,10 @@ RDEPENDS += "${IMAGE_INSTALL}"
inherit rootfs_${IMAGE_PKGTYPE}
LICENSE = "MIT"
PACKAGES = ""
RDEPENDS += "${IMAGE_INSTALL}"
+# "export IMAGE_BASENAME" not supported at this time
IMAGE_BASENAME[export] = "1"
export PACKAGE_INSTALL ?= "${IMAGE_INSTALL}"
@@ -179,8 +180,13 @@ set_image_autologin () {
sed -i 's%^AUTOLOGIN=\"false"%AUTOLOGIN="true"%g' ${IMAGE_ROOTFS}/etc/sysconfig/gpelogin
}
+# Can be use to create /etc/timestamp during image construction to give a reasonably
+# sane default time setting
+rootfs_update_timestamp () {
+ date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp
+}
# export the zap_root_password, create_etc_timestamp and remote_init_link
-EXPORT_FUNCTIONS zap_root_password create_etc_timestamp remove_init_link do_rootfs make_zimage_symlink_relative set_image_autologin
+EXPORT_FUNCTIONS zap_root_password create_etc_timestamp remove_init_link do_rootfs make_zimage_symlink_relative set_image_autologin rootfs_update_timestamp
addtask rootfs before do_build after do_install
============================================================
--- classes/mozilla.bbclass 31a97114fb000d9036266b9dcdcc85790ae09d2f
+++ classes/mozilla.bbclass 6ab6eb167d906fa0e43bd10ab5c10985f1a1162a
@@ -19,7 +19,7 @@ export HOST_LIBIDL_LIBS = "`${HOST_LIBID
export CONFIGURE_ARGS = "${EXTRA_OECONF}"
export HOST_LIBIDL_CFLAGS = "`${HOST_LIBIDL_CONFIG} --cflags`"
export HOST_LIBIDL_LIBS = "`${HOST_LIBIDL_CONFIG} --libs`"
-export HOST_LIBIDL_CONFIG = "PKG_CONFIG_PATH=${STAGING_DATADIR_NATIVE}/pkgconfig pkg-config libIDL-2.0"
+export HOST_LIBIDL_CONFIG = "PKG_CONFIG_PATH=${STAGING_LIBDIR_NATIVE}/pkgconfig pkg-config libIDL-2.0"
export HOST_CC = "${BUILD_CC}"
export HOST_CXX = "${BUILD_CXX}"
export HOST_CFLAGS = "${BUILD_CFLAGS}"
============================================================
--- classes/pkgconfig.bbclass 63cdda1bfc6dad494dbd704675246aa24fc852ae
+++ classes/pkgconfig.bbclass 9d65286d1a88f4f1731e7a5c0d77b73f19a4fb91
@@ -15,8 +15,8 @@ def get_pkgconfig_mangle(d):
s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'"
s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'"
s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'"
- s += " -e 's:OEPREFIX:${STAGING_LIBDIR}/..:'"
- s += " -e 's:OEEXECPREFIX:${STAGING_LIBDIR}/..:'"
+ s += " -e 's:OEPREFIX:${STAGING_DIR_HOST}${layout_prefix}:'"
+ s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${layout_exec_prefix}:'"
s += " -e 's:-L${WORKDIR}\S*: :g'"
s += " -e 's:-I${WORKDIR}\S*: :g'"
============================================================
--- classes/rootfs_deb.bbclass 2626dcbe48732859448d08101587a14fe238e7ac
+++ classes/rootfs_deb.bbclass a0b75d9e9ae17a15ef75f4c35ae2dbe1a9b70922
@@ -10,8 +10,8 @@ fakeroot rootfs_deb_do_rootfs () {
mkdir -p ${IMAGE_ROOTFS}/var/dpkg/info
mkdir -p ${IMAGE_ROOTFS}/var/dpkg/updates
- rm -f ${STAGING_DIR}${sysconfdir}/apt/sources.list.rev
- rm -f ${STAGING_DIR}${sysconfdir}/apt/preferences
+ rm -f ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev
+ rm -f ${STAGING_ETCDIR_NATIVE}/apt/preferences
> ${IMAGE_ROOTFS}/var/dpkg/status
> ${IMAGE_ROOTFS}/var/dpkg/available
# > ${STAGING_DIR}/var/dpkg/status
@@ -28,25 +28,27 @@ fakeroot rootfs_deb_do_rootfs () {
apt-ftparchive packages . | bzip2 > Packages.bz2
echo "Label: $arch" > Release
- echo "deb file:${DEPLOY_DIR_DEB}/$arch/ ./" >> ${STAGING_DIR}${sysconfdir}/apt/sources.list.rev
+ echo "deb file:${DEPLOY_DIR_DEB}/$arch/ ./" >> ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev
(echo "Package: *"
echo "Pin: release l=$arch"
echo "Pin-Priority: $((800 + $priority))"
- echo) >> ${STAGING_DIR}${sysconfdir}/apt/preferences
+ echo) >> ${STAGING_ETCDIR_NATIVE}/apt/preferences
priority=$(expr $priority + 5)
done
- tac ${STAGING_DIR}${sysconfdir}/apt/sources.list.rev > ${STAGING_DIR}${sysconfdir}/apt/sources.list
+ tac ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev > ${STAGING_ETCDIR_NATIVE}/apt/sources.list
- cat "${STAGING_DIR}${sysconfdir}/apt/apt.conf.sample" \
+ cat "${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample" \
| sed -e 's#Architecture ".*";#Architecture "${TARGET_ARCH}";#' \
- > "${STAGING_DIR}${sysconfdir}/apt/apt-rootfs.conf"
+ > "${STAGING_ETCDIR_NATIVE}/apt/apt-rootfs.conf"
- export APT_CONFIG="${STAGING_DIR}${sysconfdir}/apt/apt-rootfs.conf"
+ export APT_CONFIG="${STAGING_ETCDIR_NATIVE}/apt/apt-rootfs.conf"
export D=${IMAGE_ROOTFS}
export OFFLINE_ROOT=${IMAGE_ROOTFS}
export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS}
+ mkdir -p ${IMAGE_ROOTFS}/var/lib/dpkg/alternatives
+
apt-get update
_flag () {
============================================================
--- classes/sdk.bbclass 2c814910040ad3a2a065b5001ff19084627f4b30
+++ classes/sdk.bbclass c676bc74ec4f1990541362dca4fe5698aca8eba8
@@ -16,12 +16,36 @@ LDFLAGS = "${BUILD_LDFLAGS}"
CXXFLAGS = "${BUILD_CFLAGS}"
LDFLAGS = "${BUILD_LDFLAGS}"
+# Path prefixes
prefix = "${SDK_PREFIX}"
exec_prefix = "${prefix}"
-base_prefix = "${exec_prefix}"
+base_prefix = "${prefix}"
+# Base paths
+export base_bindir = "${prefix}/bin"
+export base_sbindir = "${prefix}/bin"
+export base_libdir = "${prefix}/lib"
+
+# Architecture independent paths
+export datadir = "${prefix}/share"
+export sysconfdir = "${prefix}/etc"
+export sharedstatedir = "${datadir}/com"
+export localstatedir = "${prefix}/var"
+export infodir = "${datadir}/info"
+export mandir = "${datadir}/man"
+export docdir = "${datadir}/doc"
+export servicedir = "${prefix}/srv"
+
+# Architecture dependent paths
+export bindir = "${prefix}/bin"
+export sbindir = "${prefix}/bin"
+export libexecdir = "${prefix}/libexec"
+export libdir = "${prefix}/lib"
+export includedir = "${prefix}/include"
+export oldincludedir = "${prefix}/include"
+
FILES_${PN} = "${prefix}"
FILES_${PN}-dbg += "${prefix}/.debug \
${prefix}/bin/.debug \
- ${prefix}/sbin/.debug \
"
+
============================================================
--- classes/tmake.bbclass 8bd645a6112f70f5ddcc9fa992ff31da23f56038
+++ classes/tmake.bbclass 4306ef98dd175ec795cc2dc43fabf275758f235d
@@ -54,7 +54,7 @@ tmake_do_configure() {
}
tmake_do_configure() {
- paths="${STAGING_DATADIR}/tmake/qws/${TARGET_OS}-${TARGET_ARCH}-g++ $STAGING_DIR/share/tmake/$OS-g++"
+ paths="${STAGING_DATADIR}/tmake/qws/${TARGET_OS}-${TARGET_ARCH}-g++ ${STAGING_DATADIR}/tmake/$OS-g++"
if (echo "${TARGET_ARCH}"|grep -q 'i.86'); then
paths="${STAGING_DATADIR}/tmake/qws/${TARGET_OS}-x86-g++ $paths"
fi
============================================================
--- classes/xlibs.bbclass ea5dd6de4c563ff84d78c6feaf862d16dc6d3948
+++ classes/xlibs.bbclass 2be3a77c5785ddbbf13dd40f8f9ce044da7a0769
@@ -6,10 +6,10 @@ do_stage() {
inherit autotools pkgconfig
do_stage() {
- oe_runmake install prefix=${STAGING_DIR} \
+ oe_runmake install prefix=${STAGING_DIR_HOST}${layout_prefix} \
bindir=${STAGING_BINDIR} \
includedir=${STAGING_INCDIR} \
libdir=${STAGING_LIBDIR} \
datadir=${STAGING_DATADIR} \
- mandir=${STAGING_DATADIR}/man
+ mandir=${STAGING_DIR_HOST}${layout_mandir}
}
More information about the Openembedded-commits
mailing list