diff options
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/include/fso-autorev.inc | 3 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 6 | ||||
| -rw-r--r-- | conf/distro/include/sane-toolchain.inc | 3 | ||||
| -rw-r--r-- | conf/distro/minimal.conf | 7 |
4 files changed, 10 insertions, 9 deletions
diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc index 6de3c82a38..d0b3a77d08 100644 --- a/conf/distro/include/fso-autorev.inc +++ b/conf/distro/include/fso-autorev.inc @@ -3,6 +3,7 @@ SRCREV_pn-dbus-hlid = "${AUTOREV}" SRCREV_pn-frameworkd = "${AUTOREV}" SRCREV_pn-frameworkd-devel = "${AUTOREV}" SRCREV_pn-fsod = "${AUTOREV}" +SRCREV_pn-fsodeviced = "${AUTOREV}" SRCREV_pn-fso-abyss = "${AUTOREV}" SRCREV_pn-fso-apm = "${AUTOREV}" SRCREV_pn-fso-gsm0710muxd = "${AUTOREV}" @@ -11,6 +12,8 @@ SRCREV_pn-fso-monitord = "${AUTOREV}" SRCREV_pn-fso-sounds = "${AUTOREV}" SRCREV_pn-gsmd2 = "${AUTOREV}" SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}" +SRCREV_pn-libeflvala = "${AUTOREV}" +SRCREV_pn-libfsoframework = "${AUTOREV}" SRCREV_pn-libframeworkd-glib = "${AUTOREV}" SRCREV_pn-libgsm0710 = "${AUTOREV}" SRCREV_pn-libgsm0710mux = "${AUTOREV}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index e0b8dba733..87e9204e45 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -141,7 +141,7 @@ SRCREV_pn-osb-browser ?= "125" SRCREV_pn-osb-jscore ?= "117" SRCREV_pn-osb-nrcit ?= "125" SRCREV_pn-osb-nrcore ?= "126" -SRCREV_pn-openezx-kernel ?= "cd10215486503506f53667d69958cc547a510cce" +SRCREV_pn-openezx-kernel ?= "87c2ff2531fd4a5f6799a80b339859dd3ebf4191" SRCREV_pn-openmoko-agpsui ?= "7" SRCREV_pn-openmoko-alsa-scenarios ?= "4732" SRCREV_pn-openmoko-appearance ?= "3262" @@ -232,9 +232,7 @@ SRCREV_pn-uclibc-initial ?= "24279" SRCREV_pn-usbpath ?= "3172" SRCREV_pn-usbpath-native ?= "3172" SRCREV_pn-vala-terminal ?= "94117f453ce884e9c30b611fae6fc19f85f98f2b" -SRCREV_pn-webkit-gtk ?= "40814" -SRCREV_pn-webkit-qt ?= "28656" -SRCREV_pn-webkit-qtopia ?= "28656" +SRCREV_pn-webkit-gtk ?= "41827" SRCREV_pn-wlan-ng-modules ?= "1859" SRCREV_pn-wlan-ng-utils ?= "1859" SRCREV_pn-wmiconfig ?= "4522" diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc index b261d635af..f70e98ee17 100644 --- a/conf/distro/include/sane-toolchain.inc +++ b/conf/distro/include/sane-toolchain.inc @@ -117,9 +117,6 @@ TARGET_CC_ARCH_pn-cairo_armv5te = "-march=armv4t" # Can be "glibc", "eglibc" or "uclibc" PREFERRED_LIBC ?= "glibc" PSTAGE_EXTRAPATH = "${PREFERRED_LIBC}" - -CACHE = "${TMPDIR}/cache/${PREFERRED_LIBC}/${MACHINE}" -DEPLOY_DIR = "${TMPDIR}/deploy/${PREFERRED_LIBC}" require conf/distro/include/sane-toolchain-${PREFERRED_LIBC}.inc # Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf index 196018b431..56724446cf 100644 --- a/conf/distro/minimal.conf +++ b/conf/distro/minimal.conf @@ -57,6 +57,8 @@ IPKG_VARIANT = "opkg-nogpg" ############################################################################# # Name the generated images in a sane way IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${PREFERRED_LIBC}-${PREFERRED_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}" +CACHE ?= "${TMPDIR}/cache/${PREFERRED_LIBC}/${MACHINE}" +DEPLOY_DIR ?= "${TMPDIR}/deploy/${PREFERRED_LIBC}" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" ############################################################################# @@ -99,8 +101,8 @@ require conf/distro/include/preferred-xorg-versions-X11R7.4.inc ############################################################################# # Ship extra debug utils in the rootfs when doing a debug build -DEBUG_APPS ?= "" -DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "task-cli-tools-debug",d)}' +DISTRO_EXTRA_APPS ?= "" +DISTRO_EXTRA_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "task-cli-tools-debug",d)}' # Additional content I (only valid if you include task-base) # distro-feed-configs: configuration files for the online feeds @@ -110,6 +112,7 @@ DISTRO_EXTRA_RDEPENDS += "\ distro-feed-configs \ util-linux-ng-mount util-linux-ng-umount \ angstrom-libc-fixup-hack \ + ${DISTRO_EXTRA_APPS} \ " # Additional content II (can be masked with BAD_RECOMMENDS) |