aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/bitbake.conf1
-rw-r--r--conf/checksums.ini4
-rw-r--r--conf/distro/include/sane-srcrevs.inc12
3 files changed, 11 insertions, 6 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 48e098db44..3a68959c6c 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -297,6 +297,7 @@ B = "${S}"
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}"
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 1f76481579..cf43c35f77 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -12798,6 +12798,10 @@ sha256=84ac04a28ae41e17df0f181d8bc0049ae7a83baae07296e890ea5977a2952318
md5=0a9209f928002e5eee9cdff8fef4d4b3
sha256=c5c8a091ed9a1fa2dab86b4d87719064b50c202e8503046f50f299a361e6211c
+[http://netfilter.org/projects/iptables/files/iptables-1.4.6.tar.bz2]
+md5=c67cf30e281a924def6426be0973df56
+sha256=6e732798cad62163d6e033aa52e22b771246556a230c0f66cd33fe69e96d72a4
+
[ftp://ftp.debian.org/debian/pool/main/i/iptraf/iptraf_3.0.0-6.diff.gz]
md5=fe0e2944addbd5803b42e91f7e4ec5d7
sha256=5803c3f3653887896b75567daf617a8f200cecdd28beb870219b3954d9931efa
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 060f2277e3..c5a88d3966 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -14,7 +14,7 @@
SRCREV_pn-accelges ?= "206"
SRCREV_pn-advancedcaching ?= "9c3661f5573d2dd712437f1590070153d12e4c02"
SRCREV_pn-aircrack-ng ?= "802"
-SRCREV_pn-alsa-scenarii-shr ?= "e994275bbfdca33a6776d9edbddc711c10aba40d"
+SRCREV_pn-alsa-scenarii-shr ?= "ec04ab4bc92f9d4c4e398df9a2ee1330e3660373"
SRCREV_pn-alsa-scenario ?= "8bd7f83d847424eb44704cf1649974b2fda8d8f1"
SRCREV_pn-app-restarter ?= "4552"
SRCREV_pn-assassin ?= "268"
@@ -79,7 +79,7 @@ SRCREV_pn-fbgrab-viewer-native ?= "1943"
SRCREV_pn-ffalarms ?= "67"
SRCREV_pn-flashrom ?= "3682"
SRCREV_pn-fltk2 ?= "6671"
-SRCREV_pn-frameworkd-config-shr ?= "e994275bbfdca33a6776d9edbddc711c10aba40d"
+SRCREV_pn-frameworkd-config-shr ?= "ec04ab4bc92f9d4c4e398df9a2ee1330e3660373"
SRCREV_pn-frameworkd-config-shr_SHR_REV ?= ${SRCREV_pn-frameworkd-config-shr}
SRCREV_pn-fsod ?= "2a33e5ffe96c611e6a6b8b6c33d2a83ba656f55b"
SRCREV_pn-fsoraw ?= "20"
@@ -138,8 +138,8 @@ SRCREV_pn-libmokopanelui2 ?= "4568"
SRCREV_pn-libmokoui2 ?= "4695"
SRCREV_pn-libnl2 ?= "dc273a12da9f0116e80fa81d63beb820e632dd17"
SRCREV_pn-libowl ?= "277"
-SRCREV_pn-libphone-ui ?= "fb4035e797da8b88a3205e3bb5a034dc5bfe0888"
-SRCREV_pn-libphone-ui-shr ?= "18897be6c457f4e313604048522d2e839ff72e9f"
+SRCREV_pn-libphone-ui ?= "c9cb5c3ddcd04c5cd2c02214fbc7734b8452981c"
+SRCREV_pn-libphone-ui-shr ?= "acf4a496ed365fad77ab494bccda251141c1b57a"
SRCREV_pn-libphone-utils ?= "665f27d6c3af092ae56f652c9fe6b5631b4d10db"
SRCREV_pn-librfid ?= "2094"
SRCREV_pn-libsnmp-perl ?= "17367"
@@ -261,9 +261,9 @@ SRCREV_pn-osb-nrcit ?= "125"
SRCREV_pn-osb-nrcore ?= "126"
SRCREV_pn-packagekit ?= "96823118e98515dd41748e8c7bdb9cf7b1d4a95f"
SRCREV_pn-paroli ?= "bb9fb1969acdfbaa48b55902675a6d8949014c6d"
-SRCREV_pn-phonefsod ?= "0bc4b96c16c79a977cda3e3499caab32190cccf1"
+SRCREV_pn-phonefsod ?= "76d8cc085946e77e3fc27ef12a9d18411324747b"
SRCREV_pn-phoneui-apps ?= "c27e620302d0ea956da777f76a4aa217ae8366c6"
-SRCREV_pn-phoneuid ?= "cbcd831391489b3c08df6e2ed66a18f2dadc54d4"
+SRCREV_pn-phoneuid ?= "215e0b6e021e27cd042d675ec91d501a03211091"
SRCREV_pn-portaudio-v19 ?= "1387"
SRCREV_pn-psplash ?= "249"
SRCREV_pn-pty-forward-native ?= "a41cae9df1af4fc710c701ac01016d3668dd5fba"