diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-12-19 19:15:51 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2012-12-20 12:12:15 +0100 |
commit | 597f9bf624f81dd63358158fe656b8d7984cab07 (patch) | |
tree | 134accb52444c9a8ec98609720b8ac8845f8cef5 | |
parent | 1ecc46ac42a685057c94e1bd30147ea81ab925bf (diff) | |
download | meta-qt5-597f9bf624f81dd63358158fe656b8d7984cab07.tar.gz |
qt5: upgrade recipes to use 5.0.0 tarballs
* and change DEFAULT_PREFERRENCE for git recipes negative again
* bump SRCREV in git recipes to latest and update PV
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
18 files changed, 79 insertions, 58 deletions
diff --git a/recipes-qt/qt5/qt5-4.999+5.0.0-rc1.inc b/recipes-qt/qt5/qt5-4.999+5.0.0-rc1.inc deleted file mode 100644 index 5815fd2b..00000000 --- a/recipes-qt/qt5/qt5-4.999+5.0.0-rc1.inc +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | # Copyright (C) 2012 O.S. Systems Software LTDA. | ||
2 | |||
3 | QT_VERSION ?= "5.0.0-rc1" | ||
4 | |||
5 | SRC_URI += " \ | ||
6 | http://releases.qt-project.org/qt5.0/rc1/submodules_tar/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ | ||
7 | file://linux.conf \ | ||
8 | file://g++.conf \ | ||
9 | " | ||
10 | |||
11 | S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" | ||
12 | |||
13 | DEFAULT_PREFERENCE = "-1" | ||
14 | |||
15 | LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3" | ||
16 | LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ | ||
17 | file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ | ||
18 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ | ||
19 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" | ||
diff --git a/recipes-qt/qt5/qt5-4.999+git.inc b/recipes-qt/qt5/qt5-5.0.0+git.inc index 0dcaa624..9f2e2f31 100644 --- a/recipes-qt/qt5/qt5-4.999+git.inc +++ b/recipes-qt/qt5/qt5-5.0.0+git.inc | |||
@@ -9,7 +9,9 @@ SRC_URI += " \ | |||
9 | 9 | ||
10 | S = "${WORKDIR}/git" | 10 | S = "${WORKDIR}/git" |
11 | 11 | ||
12 | PV = "4.999+5.0.0-rc1+git${SRCPV}" | 12 | PV = "5.0.0+git${SRCPV}" |
13 | |||
14 | DEFAULT_PREFERENCE = "-1" | ||
13 | 15 | ||
14 | LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3" | 16 | LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3" |
15 | LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ | 17 | LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ |
diff --git a/recipes-qt/qt5/qt5-5.0.0.inc b/recipes-qt/qt5/qt5-5.0.0.inc new file mode 100644 index 00000000..4bdfaeed --- /dev/null +++ b/recipes-qt/qt5/qt5-5.0.0.inc | |||
@@ -0,0 +1,17 @@ | |||
1 | # Copyright (C) 2012 O.S. Systems Software LTDA. | ||
2 | |||
3 | QT_VERSION ?= "${PV}" | ||
4 | |||
5 | SRC_URI += " \ | ||
6 | http://releases.qt-project.org/qt5/${QT_VERSION}/submodules_tar/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \ | ||
7 | file://linux.conf \ | ||
8 | file://g++.conf \ | ||
9 | " | ||
10 | |||
11 | S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}" | ||
12 | |||
13 | LICENSE = "GFDL-1.3 & LGPLv2.1 | GPLv3" | ||
14 | LIC_FILES_CHKSUM ?= "file://LICENSE.LGPL;md5=02356821480f1d3d534b21e0343265b5 \ | ||
15 | file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ | ||
16 | file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ | ||
17 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e" | ||
diff --git a/recipes-qt/qt5/qt5-native_4.999+5.0.0-rc1.bb b/recipes-qt/qt5/qt5-native_4.999+5.0.0-rc1.bb deleted file mode 100644 index e08e48b6..00000000 --- a/recipes-qt/qt5/qt5-native_4.999+5.0.0-rc1.bb +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | require qt5-native.inc | ||
2 | require qt5-${PV}.inc | ||
3 | |||
4 | PR = "${INC_PR}.0" | ||
5 | |||
6 | DEFAULT_PREFERENCE = "-1" | ||
7 | |||
8 | SRC_URI[md5sum] = "589addbcc525a43c0ace55652f755dce" | ||
9 | SRC_URI[sha256sum] = "ad07d4d46e810f1371f4aafd66d97d48e8a1c1165d633bc9266ca9aea6087805" | ||
diff --git a/recipes-qt/qt5/qt5-native_4.999+git.bb b/recipes-qt/qt5/qt5-native_4.999+git.bb deleted file mode 100644 index 71403729..00000000 --- a/recipes-qt/qt5/qt5-native_4.999+git.bb +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | require qt5-native.inc | ||
2 | require qt5-4.999+git.inc | ||
3 | |||
4 | PR = "${INC_PR}.0" | ||
5 | |||
6 | SRCREV = "8c814db74718f18e88697feb97867b0d502e7f1d" | ||
diff --git a/recipes-qt/qt5/qt5-native_5.0.0+git.bb b/recipes-qt/qt5/qt5-native_5.0.0+git.bb new file mode 100644 index 00000000..e99971fb --- /dev/null +++ b/recipes-qt/qt5/qt5-native_5.0.0+git.bb | |||
@@ -0,0 +1,8 @@ | |||
1 | require qt5-native.inc | ||
2 | require qt5-5.0.0+git.inc | ||
3 | |||
4 | PR = "${INC_PR}.0" | ||
5 | |||
6 | DEFAULT_PREFERENCE = "-1" | ||
7 | |||
8 | SRCREV = "234163adb3ceb9a6f2fac04a276724bf8495ca8e" | ||
diff --git a/recipes-qt/qt5/qt5-native_5.0.0.bb b/recipes-qt/qt5/qt5-native_5.0.0.bb new file mode 100644 index 00000000..d9c922d6 --- /dev/null +++ b/recipes-qt/qt5/qt5-native_5.0.0.bb | |||
@@ -0,0 +1,7 @@ | |||
1 | require ${PN}.inc | ||
2 | require qt5-${PV}.inc | ||
3 | |||
4 | PR = "${INC_PR}.0" | ||
5 | |||
6 | SRC_URI[md5sum] = "c29073bfc3cf6b39492a2481d982386e" | ||
7 | SRC_URI[sha256sum] = "89bcde09b24e8139f9d1d957dcb07c5aada83d578c84279f66813f348243d500" | ||
diff --git a/recipes-qt/qt5/qtbase_4.999+5.0.0-rc1.bb b/recipes-qt/qt5/qtbase_4.999+5.0.0-rc1.bb deleted file mode 100644 index 83ab2a91..00000000 --- a/recipes-qt/qt5/qtbase_4.999+5.0.0-rc1.bb +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | require qtbase.inc | ||
2 | require qt5-${PV}.inc | ||
3 | |||
4 | PR = "${INC_PR}.0" | ||
5 | |||
6 | SRC_URI[md5sum] = "589addbcc525a43c0ace55652f755dce" | ||
7 | SRC_URI[sha256sum] = "ad07d4d46e810f1371f4aafd66d97d48e8a1c1165d633bc9266ca9aea6087805" | ||
diff --git a/recipes-qt/qt5/qtbase_4.999+git.bb b/recipes-qt/qt5/qtbase_4.999+git.bb deleted file mode 100644 index 09991cad..00000000 --- a/recipes-qt/qt5/qtbase_4.999+git.bb +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | require qtbase.inc | ||
2 | require qt5-4.999+git.inc | ||
3 | |||
4 | PR = "${INC_PR}.0" | ||
5 | |||
6 | SRCREV = "8c814db74718f18e88697feb97867b0d502e7f1d" | ||
diff --git a/recipes-qt/qt5/qtbase_5.0.0+git.bb b/recipes-qt/qt5/qtbase_5.0.0+git.bb new file mode 100644 index 00000000..f5f010a3 --- /dev/null +++ b/recipes-qt/qt5/qtbase_5.0.0+git.bb | |||
@@ -0,0 +1,6 @@ | |||
1 | require ${PN}.inc | ||
2 | require qt5-5.0.0+git.inc | ||
3 | |||
4 | PR = "${INC_PR}.0" | ||
5 | |||
6 | SRCREV = "234163adb3ceb9a6f2fac04a276724bf8495ca8e" | ||
diff --git a/recipes-qt/qt5/qtbase_5.0.0.bb b/recipes-qt/qt5/qtbase_5.0.0.bb new file mode 100644 index 00000000..d9c922d6 --- /dev/null +++ b/recipes-qt/qt5/qtbase_5.0.0.bb | |||
@@ -0,0 +1,7 @@ | |||
1 | require ${PN}.inc | ||
2 | require qt5-${PV}.inc | ||
3 | |||
4 | PR = "${INC_PR}.0" | ||
5 | |||
6 | SRC_URI[md5sum] = "c29073bfc3cf6b39492a2481d982386e" | ||
7 | SRC_URI[sha256sum] = "89bcde09b24e8139f9d1d957dcb07c5aada83d578c84279f66813f348243d500" | ||
diff --git a/recipes-qt/qt5/qtdeclarative_4.999+git.bb b/recipes-qt/qt5/qtdeclarative_4.999+git.bb deleted file mode 100644 index e934f3d4..00000000 --- a/recipes-qt/qt5/qtdeclarative_4.999+git.bb +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | require qtdeclarative.inc | ||
2 | require qt5-4.999+git.inc | ||
3 | |||
4 | PR = "${INC_PR}.0" | ||
5 | |||
6 | SRCREV = "27f0e91d6d24a5b871c79946323e3ee32f4a276c" | ||
diff --git a/recipes-qt/qt5/qtdeclarative_5.0.0+git.bb b/recipes-qt/qt5/qtdeclarative_5.0.0+git.bb new file mode 100644 index 00000000..0ba6becd --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative_5.0.0+git.bb | |||
@@ -0,0 +1,6 @@ | |||
1 | require ${PN}.inc | ||
2 | require qt5-5.0.0+git.inc | ||
3 | |||
4 | PR = "${INC_PR}.0" | ||
5 | |||
6 | SRCREV = "c8ef32e2b6cded37a6854b94a281464c1b7a298b" | ||
diff --git a/recipes-qt/qt5/qtdeclarative_5.0.0.bb b/recipes-qt/qt5/qtdeclarative_5.0.0.bb new file mode 100644 index 00000000..fb37cb87 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative_5.0.0.bb | |||
@@ -0,0 +1,7 @@ | |||
1 | require ${PN}.inc | ||
2 | require qt5-${PV}.inc | ||
3 | |||
4 | PR = "${INC_PR}.0" | ||
5 | |||
6 | SRC_URI[md5sum] = "5373ebb2f78e27e14d0c2b3997599832" | ||
7 | SRC_URI[sha256sum] = "eb13966ecaa61baff53f19b03e97f0e7ca7103a25d89c7540f6e8d7d98bf59bd" | ||
diff --git a/recipes-qt/qt5/qtjsbackend_4.999+git.bb b/recipes-qt/qt5/qtjsbackend-native_5.0.0+git.bb index b5ef96d5..48e2654e 100644 --- a/recipes-qt/qt5/qtjsbackend_4.999+git.bb +++ b/recipes-qt/qt5/qtjsbackend-native_5.0.0+git.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | require qtjsbackend.inc | 1 | require ${PN}.inc |
2 | require qt5-4.999+git.inc | 2 | require qt5-5.0.0+git.inc |
3 | 3 | ||
4 | PR = "${INC_PR}.0" | 4 | PR = "${INC_PR}.0" |
5 | 5 | ||
diff --git a/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb b/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb new file mode 100644 index 00000000..a6b77fd6 --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb | |||
@@ -0,0 +1,7 @@ | |||
1 | require ${PN}.inc | ||
2 | require qt5-${PV}.inc | ||
3 | |||
4 | PR = "${INC_PR}.0" | ||
5 | |||
6 | SRC_URI[md5sum] = "f7a745c09173abdd9cd21851557f76cc" | ||
7 | SRC_URI[sha256sum] = "277106c4bf9a79ffaa458fbf66844b34dbbec7165b3edf94f98c0922fc1c0f39" | ||
diff --git a/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb b/recipes-qt/qt5/qtjsbackend_5.0.0+git.bb index ae141247..48e2654e 100644 --- a/recipes-qt/qt5/qtjsbackend-native_4.999+git.bb +++ b/recipes-qt/qt5/qtjsbackend_5.0.0+git.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | require qtjsbackend-native.inc | 1 | require ${PN}.inc |
2 | require qt5-4.999+git.inc | 2 | require qt5-5.0.0+git.inc |
3 | 3 | ||
4 | PR = "${INC_PR}.0" | 4 | PR = "${INC_PR}.0" |
5 | 5 | ||
diff --git a/recipes-qt/qt5/qtjsbackend_5.0.0.bb b/recipes-qt/qt5/qtjsbackend_5.0.0.bb new file mode 100644 index 00000000..a6b77fd6 --- /dev/null +++ b/recipes-qt/qt5/qtjsbackend_5.0.0.bb | |||
@@ -0,0 +1,7 @@ | |||
1 | require ${PN}.inc | ||
2 | require qt5-${PV}.inc | ||
3 | |||
4 | PR = "${INC_PR}.0" | ||
5 | |||
6 | SRC_URI[md5sum] = "f7a745c09173abdd9cd21851557f76cc" | ||
7 | SRC_URI[sha256sum] = "277106c4bf9a79ffaa458fbf66844b34dbbec7165b3edf94f98c0922fc1c0f39" | ||