summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/bitbake.conf94
-rw-r--r--conf/checksums.ini12
-rw-r--r--conf/distro/include/angstrom-2007-preferred-versions.inc6
-rw-r--r--conf/distro/include/sane-srcrevs.inc14
-rw-r--r--conf/distro/sharprom-compatible.conf4
-rw-r--r--conf/machine/mpc8323e-rdb.conf2
6 files changed, 85 insertions, 47 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 43e45bd87d..9e10e7405f 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -1,4 +1,38 @@
##################################################################
+# Standard target filesystem layout.
+##################################################################
+
+# Note these currently match the existing staging layout but this
+# is planned to change, see the oe-dev mailing list
+
+# Path prefixes
+layout_prefix = ""
+layout_exec_prefix = ""
+layout_base_prefix = ""
+
+# Base paths
+layout_base_bindir = "${layout_base_prefix}/bin"
+layout_base_sbindir = "${layout_base_prefix}/bin"
+layout_base_libdir = "${layout_base_prefix}/lib"
+
+# Architecture independent paths
+layout_sysconfdir = "/etc"
+layout_localstatedir = "/var"
+layout_servicedir = "/srv"
+layout_sharedstatedir = "${layout_prefix}/com"
+layout_datadir = "${layout_prefix}/share"
+layout_infodir = "${layout_datadir}/info"
+layout_mandir = "${layout_datadir}/man"
+layout_docdir = "${layout_datadir}/doc"
+
+# Architecture dependent paths
+layout_bindir = "${layout_exec_prefix}/bin"
+layout_sbindir = "${layout_exec_prefix}/bin"
+layout_libdir = "${layout_exec_prefix}/lib"
+layout_includedir = "${layout_exec_prefix}/include"
+layout_libexecdir = "${layout_exec_prefix}/libexec"
+
+##################################################################
# Standard target filesystem paths.
##################################################################
@@ -115,7 +149,7 @@ FILES = ""
FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
${sysconfdir} ${sharedstatedir} ${localstatedir} \
- /bin/* /sbin/* /lib/*.so* ${datadir}/${PN} ${libdir}/${PN}/* \
+ ${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*.so* ${datadir}/${PN} ${libdir}/${PN}/* \
${datadir}/pixmaps ${datadir}/applications \
${datadir}/idl ${datadir}/omf ${datadir}/sounds \
${libdir}/bonobo/servers"
@@ -126,13 +160,13 @@ SECTION_${PN}-doc = "doc"
FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \
- /lib/*.a /lib/*.o ${datadir}/aclocal"
+ ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal"
SECTION_${PN}-dev = "devel"
ALLOW_EMPTY_${PN}-dev = "1"
RDEPENDS_${PN}-dev = "${@['', '${PN} (>= ${PV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}"
FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \
- /bin/.debug /sbin/.debug /lib/.debug ${libdir}/${PN}/.debug \
+ ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug ${libdir}/${PN}/.debug \
${libdir}/matchbox-panel/.debug"
SECTION_${PN}-dbg = "devel"
ALLOW_EMPTY_${PN}-dbg = "1"
@@ -167,18 +201,26 @@ S = "${WORKDIR}/${P}"
B = "${S}"
STAGING_DIR = "${TMPDIR}/staging"
-STAGING_BINDIR = "${STAGING_DIR}/${HOST_SYS}/bin"
-STAGING_BINDIR_CROSS = "${STAGING_DIR}/${BUILD_SYS}/bin/${HOST_SYS}"
-STAGING_BINDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/bin"
-STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib"
-STAGING_LIBDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/lib"
-STAGING_ETCDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/etc"
-STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include"
-STAGING_DATADIR = "${STAGING_DIR}/${HOST_SYS}/share"
-STAGING_LOADER_DIR = "${STAGING_DIR}/${HOST_SYS}/loader"
-STAGING_FIRMWARE_DIR = "${STAGING_DIR}/${HOST_SYS}/firmware"
+
+STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}"
+STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}/bin"
+STAGING_BINDIR_CROSS = "${STAGING_DIR_NATIVE}/bin/${HOST_SYS}"
+STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}/lib"
+STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}/include"
+STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}/etc"
+STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}/share"
+
+STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}"
+STAGING_BINDIR = "${STAGING_DIR_HOST}/bin"
+STAGING_LIBDIR = "${STAGING_DIR_HOST}/lib"
+STAGING_INCDIR = "${STAGING_DIR_HOST}/include"
+STAGING_DATADIR = "${STAGING_DIR_HOST}/share"
+STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader"
+STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware"
STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4"
+STAGING_DIR_TARGET = "${STAGING_DIR}/${TARGET_SYS}"
+
DEPLOY_DIR = "${TMPDIR}/deploy"
DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar"
DEPLOY_DIR_IPK = "${DEPLOY_DIR}/ipk"
@@ -197,7 +239,7 @@ SDK_PREFIX = "/usr/local/${SDK_NAME}"
##################################################################
OLDEST_KERNEL = "2.4.0"
-STAGING_KERNEL_DIR = "${STAGING_DIR}/${HOST_SYS}/kernel"
+STAGING_KERNEL_DIR = "${STAGING_DIR_HOST}/kernel"
##################################################################
# Specific image creation and rootfs population info.
@@ -294,9 +336,9 @@ PATCHRESOLVE = 'noop'
# Build flags and options.
##################################################################
-export BUILD_CPPFLAGS = "-isystem${STAGING_DIR}/${BUILD_SYS}/include"
+export BUILD_CPPFLAGS = "-isystem${STAGING_INCDIR_NATIVE}"
export CPPFLAGS = "${TARGET_CPPFLAGS}"
-export TARGET_CPPFLAGS = "-isystem${STAGING_DIR}/${TARGET_SYS}/include"
+export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}/include"
export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}"
export CFLAGS = "${TARGET_CFLAGS}"
@@ -306,12 +348,12 @@ export BUILD_CXXFLAGS = "${BUILD_CFLAGS} -fpermissive"
export CXXFLAGS = "${TARGET_CXXFLAGS}"
export TARGET_CXXFLAGS = "${TARGET_CFLAGS} -fpermissive"
-export BUILD_LDFLAGS = "-L${STAGING_DIR}/${BUILD_SYS}/lib \
- -Wl,-rpath-link,${STAGING_DIR}/${BUILD_SYS}/lib \
- -Wl,-rpath,${STAGING_DIR}/${BUILD_SYS}/lib -Wl,-O1"
+export BUILD_LDFLAGS = "-L${STAGING_LIBDIR_NATIVE} \
+ -Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} \
+ -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-O1"
export LDFLAGS = "${TARGET_LDFLAGS}"
-export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \
- -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib \
+export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}/lib \
+ -Wl,-rpath-link,${STAGING_DIR_TARGET}/lib \
-Wl,-O1"
# Which flags to leave by strip-flags() in bin/build/oebuild.sh ?
@@ -340,9 +382,9 @@ BOOTSTRAP_EXTRA_RRECOMMENDS = ""
# Palmtop stuff.
##################################################################
-export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt2"
-export QPEDIR = "${STAGING_DIR}/${HOST_SYS}"
-export OPIEDIR = "${STAGING_DIR}/${HOST_SYS}"
+export QTDIR = "${STAGING_DIR_HOST}/qt2"
+export QPEDIR = "${STAGING_DIR_HOST}"
+export OPIEDIR = "${STAGING_DIR_HOST}"
export palmtopdir = "${libdir}/opie"
export palmqtdir = "${palmtopdir}"
@@ -443,8 +485,8 @@ export PKG_CONFIG_DIR = "${STAGING_LIBDIR}/pkgconfig"
export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}"
export PKG_CONFIG_DISABLE_UNINSTALLED = "yes"
-export QMAKE_MKSPEC_PATH = "${STAGING_DIR}/${BUILD_SYS}/share/qmake"
-export STAGING_SIPDIR = "${STAGING_DIR}/${BUILD_SYS}/share/sip"
+export QMAKE_MKSPEC_PATH = "${STAGING_DATADIR_NATIVE}/qmake"
+export STAGING_SIPDIR = "${STAGING_DATADIR_NATIVE}/sip"
export STAGING_IDLDIR = "${STAGING_DATADIR}/idl"
# library package naming
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 316860dfaa..19ffcdb42e 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -5818,10 +5818,6 @@ sha256=66c3f033fdc8f9ba0bd9d0ae2d1f2c11f9fa51bf0d1418e5cb75e29e6577a5bc
md5=15de3830b751818a54a42899bd3ae72c
sha256=5fdaf9af5ac4f75c0215d000b82b128fd054a582f81cc4f039a1e7fe69335ebb
-[http://gpephone.linuxtogo.org/download/gpephone/libchenabler-0.1/libchenabler-0.1.tar.gz]
-md5=f29e1e63fcc55e3ae4e81f5ee9dd7bdd
-sha256=448a3ab76109664bb6bd8bcc2c62d957c7d44b52e39c37d91b3b73b5cfe35a3f
-
[http://gpe.linuxtogo.org/download/source/libcontactsdb-0.1.tar.bz2]
md5=575442be0c61e4b1e05f2188e2ae3141
sha256=33a61a28617e5513e58bde9c16ef21c82c582c1513a0a325735c090ebbd9aefe
@@ -6050,10 +6046,6 @@ sha256=d4423a582510a1e3f47af9995337b590b9c480248821116b5397bc0652aeb52e
md5=64304da2d9e21239246c66f1d449b2c6
sha256=2b384172b54074aef4ec23b3fcc8292c86c7c4fb0efb943e7dea9d886a1d4846
-[http://gpephone.linuxtogo.org/download/gpephone/libgemwidget-0.1/libgemwidget-0.1.tar.bz2]
-md5=95d269ad7e7cb7d3032498ad2e47643b
-sha256=b8a1da871aa34362caf0c76dcbd3df42aef7313a4ed08f38eddcb159b80302c5
-
[ftp://ftp.gnome.org/pub/GNOME/sources/libglade/2.0/libglade-2.0.1.tar.bz2]
md5=4d93f6b01510013ae429e91af432cfe2
sha256=6386901d84cb41fb8a584f7aa1b54c984e0590f36f45ee016ef30aa45554194d
@@ -6426,10 +6418,6 @@ sha256=c80da366576501be18a987c28609bd8ffa340ed20fc03249c70c43634f077052
md5=54935c6cff42df2f1daada267b701392
sha256=18f0e2df191219c29b47dc12b4b06b5be7eaeef34b3436156547e5a9f4eb51c1
-[http://gpephone.linuxtogo.org/download/gpephone/libmsgenabler-1.0/libmsgenabler-1.0.tar.bz2]
-md5=53417c192cff3e32fb1d7b839201a04d
-sha256=8a58b9a9eb8cae0dc15453d7737050a3b241eb1030797f1559b4bbb5aff061e6
-
[http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-2.1.2.tar.gz]
md5=88d35af903665fecbdee77eb6d5e6cdd
sha256=f40f0318e8c8f7eee802de91ee8a9b5673c0f28a15527883bd20826e74dff54c
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index 1938f6c73f..c3a8fcc9ec 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -1,3 +1,7 @@
+# This is a lock-down file for stability purposes
+# If you change anything, send a mail to angstrom-distro-devel@linuxtogo.org
+# stating the change and the reason.
+
# bitbake -s | awk '{print "PREFERRED_VERSION_" $1 "=" $2}' | sed -e s:\+:\=:g | awk -F "=" '{print $1 " ?= \" "$2}' | awk -F "-r" '{print $1"\""}' | sed -e s,0:,,g -e s,1:,,g | sed s:\"\ :\":g> /tmp/angstrom-2007-preferred-versions.inc
PREFERRED_VERSION_0xffff ?= "0.2"
@@ -1044,7 +1048,7 @@ PREFERRED_VERSION_libtext-diff-perl-native ?= "0.35"
PREFERRED_VERSION_libticables ?= "3.9.2"
PREFERRED_VERSION_libticalcs ?= "4.5.9"
PREFERRED_VERSION_libtifiles ?= "0.6.5"
-PREFERRED_VERSION_libtinymail ?= "0.0.1"
+PREFERRED_VERSION_libtinymail ?= "0.0.3"
PREFERRED_VERSION_libtododb ?= "0.11"
PREFERRED_VERSION_libtomcrypt ?= "0.97b"
PREFERRED_VERSION_libtomoe-gtk ?= "0.1.0"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index d34d765af0..e537c66c30 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -9,12 +9,14 @@
SRCREV_pn-aircrack-ng ?= "802"
SRCREV_pn-bfin-uclibc ?= "1857"
+SRCREV_pn-dbus-c++-native ?= "13131"
+SRCREV_pn-dbus-c++ ?= "13131"
SRCREV_pn-dfu-util ?= "2866"
SRCREV_pn-dfu-util-native ?= "2866"
SRCREV_pn-eglibc ?= "3531"
SRCREV_pn-eglibc-initial ?= "3531"
SRCREV_pn-eglibc-intermediate ?= "3531"
-SRCREV_pn-ezxd ?= "2058"
+SRCREV_pn-ezxd ?= "2070"
SRCREV_pn-elf2flt="1786"
SRCREV_pn-fbgrab-viewer-native ?= "1943"
SRCREV_pn-fstests ?= "204"
@@ -27,7 +29,7 @@ SRCREV_pn-kismet-newcore ?= "2285"
SRCREV_pn-libfakekey ?= "1455"
SRCREV_pn-libgsmd ?= "3074"
SRCREV_pn-libgsmd-devel ?= "3293"
-SRCREV_pn-libjana ?= "662"
+SRCREV_pn-libjana ?= "665"
SRCREV_pn-libmokogsmd2 ?= "2950"
SRCREV_pn-libmokojournal2 ?= "3217"
SRCREV_pn-libmokopanelui2 ?= "3226"
@@ -53,7 +55,7 @@ SRCREV_pn-osb-nrcit ?= "125"
SRCREV_pn-osb-nrcore ?= "126"
SRCREV_pn-openmoko-appearance ?= "3239"
SRCREV_pn-openmoko-appmanager ?= "1851"
-SRCREV_pn-openmoko-appmanager2 ?= "3271"
+SRCREV_pn-openmoko-appmanager2 ?= "3299"
SRCREV_pn-openmoko-browser2 ?= "3249"
SRCREV_pn-openmoko-calculator ?= "2404"
SRCREV_pn-openmoko-calculator2 ?= "3235"
@@ -64,7 +66,7 @@ SRCREV_pn-openmoko-contacts2 ?= "358"
SRCREV_pn-openmoko-dates ?= "467"
SRCREV_pn-openmoko-dates2 ?= "658"
SRCREV_pn-openmoko-dialer ?= "2811"
-SRCREV_pn-openmoko-dialer2 ?= "3282"
+SRCREV_pn-openmoko-dialer2 ?= "3298"
SRCREV_pn-openmoko-feedreader2 ?= "3080"
SRCREV_pn-openmoko-finger-demo ?= "1671"
SRCREV_pn-openmoko-firststart2 ?= "3158"
@@ -74,7 +76,7 @@ SRCREV_pn-openmoko-icon-theme-standard2 ?= "3225"
SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3225"
SRCREV_pn-openmoko-keyboard ?= "1631"
SRCREV_pn-openmoko-libs ?= "2367"
-SRCREV_pn-openmoko-mediaplayer2 ?= "3274"
+SRCREV_pn-openmoko-mediaplayer2 ?= "3300"
SRCREV_pn-openmoko-messages ?= "2276"
SRCREV_pn-openmoko-panel-battery ?= "3272"
SRCREV_pn-openmoko-panel-bt ?= "2896"
@@ -101,7 +103,7 @@ SRCREV_pn-openmoko-theme-standard2-qvga ?= "3210"
SRCREV_pn-openmoko-today ?= "3056"
SRCREV_pn-openmoko-today2 ?= "3287"
SRCREV_pn-openmoko-today2-folders ?= "2680"
-SRCREV_pn-openmoko-worldclock2 ?= "3241"
+SRCREV_pn-openmoko-worldclock2 ?= "3301"
SRCREV_pn-openocd ?= "206"
SRCREV_pn-openocd-native ?= "206"
SRCREV_pn-oprofileui ?= "160"
diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf
index fd01d21397..92fd42f4f8 100644
--- a/conf/distro/sharprom-compatible.conf
+++ b/conf/distro/sharprom-compatible.conf
@@ -20,8 +20,8 @@ FULL_OPTIMIZATION_pn-fetchmail = "-fexpensive-optimizations -fomit-frame-pointer
OEINCLUDELOGS = "yes"
KERNEL_CONSOLE = "tty1"
# prebuilt toolchain doesn't know about -isystem
-export BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include"
-export TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
+export BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
+export TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}/${layout_includedir}"
#DEBUG_OPTIMIZATION = "-O -g3"
#DEBUG_BUILD = "1"
diff --git a/conf/machine/mpc8323e-rdb.conf b/conf/machine/mpc8323e-rdb.conf
index 0335cb6249..a6b29552c5 100644
--- a/conf/machine/mpc8323e-rdb.conf
+++ b/conf/machine/mpc8323e-rdb.conf
@@ -13,6 +13,8 @@ MACHINE_FEATURES = "kernel26 usbhost ext2"
PREFERRED_VERSION_u-boot = "git"
UBOOT_MACHINE = "MPC8323ERDB_config"
+EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000"
+
#don't try to access tty1
USE_VT = "0"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 13:41:35 +0000