[OE-core] [PATCH 1/2] Update tzdata to 2014c
Removed solaris* as per http://mm.icann.org/pipermail/tz/2013-November/020488.html Signed-off-by: Armin Kuster akus...@mvista.com --- meta/recipes-extended/tzdata/tzdata_2013i.bb | 206 --- meta/recipes-extended/tzdata/tzdata_2014c.bb | 205 ++ 2 files changed, 205 insertions(+), 206 deletions(-) delete mode 100644 meta/recipes-extended/tzdata/tzdata_2013i.bb create mode 100644 meta/recipes-extended/tzdata/tzdata_2014c.bb diff --git a/meta/recipes-extended/tzdata/tzdata_2013i.bb b/meta/recipes-extended/tzdata/tzdata_2013i.bb deleted file mode 100644 index 4179b44..000 --- a/meta/recipes-extended/tzdata/tzdata_2013i.bb +++ /dev/null @@ -1,206 +0,0 @@ -SUMMARY = Timezone database -HOMEPAGE = ftp://elsie.nci.nih.gov/pub/; -SECTION = base -LICENSE = PD BSD -LIC_FILES_CHKSUM = file://asia;beginline=2;endline=3;md5=06468c0e84ef4d4c97045a4a29b08234 \ -file://README;md5=0b7570113550eb5d30aa4bd220964b8f -DEPENDS = tzcode-native - -inherit allarch - -RCONFLICTS_${PN} = timezones timezone-africa timezone-america timezone-antarctica \ - timezone-arctic timezone-asia timezone-atlantic \ - timezone-australia timezone-europe timezone-indian \ - timezone-iso3166.tab timezone-pacific timezone-zone.tab - -SRC_URI = ftp://ftp.iana.org/tz/releases/tzdata${PV}.tar.gz;name=tzdata; - -SRC_URI[tzdata.md5sum] = 8bc69eb75bea496ebe1d5a9ab576702d -SRC_URI[tzdata.sha256sum] = 1cd56a6ee964143ef0c65229968a5093988335b95e9115235b5e7b7e45e67dda - -S = ${WORKDIR} - -DEFAULT_TIMEZONE ?= Universal - -TZONES= africa antarctica asia australasia europe northamerica southamerica \ - factory etcetera backward systemv \ - -# pacificnew - -do_compile () { -for zone in ${TZONES}; do \ -${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo -L /dev/null \ --y ${S}/yearistype.sh ${S}/${zone} ; \ -${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/posix -L /dev/null \ --y ${S}/yearistype.sh ${S}/${zone} ; \ -${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/right -L ${S}/leapseconds \ --y ${S}/yearistype.sh ${S}/${zone} ; \ -done -} - -do_install () { -install -d ${D}/$exec_prefix ${D}${datadir}/zoneinfo -cp -pPR ${S}/$exec_prefix ${D}/ -# libc is removing zoneinfo files from package -cp -pP ${S}/zone.tab ${D}${datadir}/zoneinfo -cp -pP ${S}/iso3166.tab ${D}${datadir}/zoneinfo - -# Install default timezone -if [ -e ${D}${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ]; then -install -d ${D}${sysconfdir} -echo ${DEFAULT_TIMEZONE} ${D}${sysconfdir}/timezone -ln -s ${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ${D}${sysconfdir}/localtime -else -bberror DEFAULT_TIMEZONE is set to an invalid value. -exit 1 -fi - -chown -R root:root ${D} -} - -pkg_postinst_${PN} () { - etc_lt=$D${sysconfdir}/localtime - src=$D${sysconfdir}/timezone - - if [ -e ${src} ] ; then - tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' ${src}) - fi - - if [ -z ${tz} ] ; then - return 0 - fi - - if [ ! -e $D${datadir}/zoneinfo/${tz} ] ; then - echo You have an invalid TIMEZONE setting in ${src} - echo Your ${etc_lt} has been reset to Universal; enjoy! - tz=Universal - echo Updating ${etc_lt} with $D${datadir}/zoneinfo/${tz} - if [ -L ${etc_lt} ] ; then - rm -f ${etc_lt} - fi - ln -s ${datadir}/zoneinfo/${tz} ${etc_lt} - fi -} - -# Packages primarily organized by directory with a major city -# in most time zones in the base package - -PACKAGES = tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ -tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ -tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific - -FILES_tzdata-africa += ${datadir}/zoneinfo/Africa/* -RPROVIDES_tzdata-africa = tzdata-africa - -FILES_tzdata-americas += ${datadir}/zoneinfo/America/* \ -${datadir}/zoneinfo/US/*\ -${datadir}/zoneinfo/Brazil/*\ -${datadir}/zoneinfo/Canada/*\ -${datadir}/zoneinfo/Mexico/*\ -${datadir}/zoneinfo/Chile/* -RPROVIDES_tzdata-americas = tzdata-americas - -FILES_tzdata-antarctica += ${datadir}/zoneinfo/Antarctica/* -RPROVIDES_tzdata-antarctica = tzdata-antarctica - -FILES_tzdata-arctic += ${datadir}/zoneinfo/Arctic/* -RPROVIDES_tzdata-arctic = tzdata-arctic - -FILES_tzdata-asia += ${datadir}/zoneinfo/Asia/*\ -${datadir}/zoneinfo/Indian/*\ -${datadir}/zoneinfo/Mideast
[OE-core] [PATCH 2/2] Update tzcode to 2014c
Signed-off-by: Armin Kuster akus...@mvista.com --- .../recipes-extended/tzcode/tzcode-native_2013i.bb | 26 -- .../recipes-extended/tzcode/tzcode-native_2014c.bb | 25 + 2 files changed, 25 insertions(+), 26 deletions(-) delete mode 100644 meta/recipes-extended/tzcode/tzcode-native_2013i.bb create mode 100644 meta/recipes-extended/tzcode/tzcode-native_2014c.bb diff --git a/meta/recipes-extended/tzcode/tzcode-native_2013i.bb b/meta/recipes-extended/tzcode/tzcode-native_2013i.bb deleted file mode 100644 index cfedc5b..000 --- a/meta/recipes-extended/tzcode/tzcode-native_2013i.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = Timezone zoneinfo utils (zic, zdump, tzselect) -LICENSE = PD BSD - -LIC_FILES_CHKSUM = file://${WORKDIR}/README;md5=0b7570113550eb5d30aa4bd220964b8f - -# note that we allow for us to use data later than our code version -# -SRC_URI = ftp://ftp.iana.org/tz/releases/tzcode${PV}.tar.gz;name=tzcode \ - ftp://ftp.iana.org/tz/releases/tzdata2013i.tar.gz;name=tzdata; - -SRC_URI[tzcode.md5sum] = 86154c8b0cfb47f4e2027ecaa2ec547a -SRC_URI[tzcode.sha256sum] = 63bba6790afc1cb2ea0af2b998a35fc237e247608140dbe4e08b4216a8c31358 - -SRC_URI[tzdata.md5sum] = 8bc69eb75bea496ebe1d5a9ab576702d -SRC_URI[tzdata.sha256sum] = 1cd56a6ee964143ef0c65229968a5093988335b95e9115235b5e7b7e45e67dda - -S = ${WORKDIR} - -inherit native - -do_install () { -install -d ${D}${bindir}/ -install -m 755 zic ${D}${bindir}/ -install -m 755 zdump ${D}${bindir}/ -install -m 755 tzselect ${D}${bindir}/ -} diff --git a/meta/recipes-extended/tzcode/tzcode-native_2014c.bb b/meta/recipes-extended/tzcode/tzcode-native_2014c.bb new file mode 100644 index 000..4139825 --- /dev/null +++ b/meta/recipes-extended/tzcode/tzcode-native_2014c.bb @@ -0,0 +1,25 @@ +DESCRIPTION = tzcode, timezone zoneinfo utils -- zic, zdump, tzselect +LICENSE = PD + +LIC_FILES_CHKSUM = file://${WORKDIR}/README;md5=0b7570113550eb5d30aa4bd220964b8f + +# note that we allow for us to use data later than our code version +# +SRC_URI = ftp://ftp.iana.org/tz/releases/tzcode${PV}.tar.gz;name=tzcode \ + ftp://ftp.iana.org/tz/releases/tzdata2014c.tar.gz;name=tzdata; + +SRC_URI[tzcode.md5sum] = 657636f201ae8b561225afde49d274af +SRC_URI[tzcode.sha256sum] = 1461e6f6973797ccf516421b272a28082fe26754e8ae94967d8f931a4c8f011b +SRC_URI[tzdata.md5sum] = fa7f3dc1c6f6238253a6f2b850467e2e +SRC_URI[tzdata.sha256sum] = aa2924e012644de3a6cc3160690cb3afecf350af435daefa43bb669fb8f1 + +S = ${WORKDIR} + +inherit native + +do_install () { +install -d ${D}${bindir}/ +install -m 755 zic ${D}${bindir}/ +install -m 755 zdump ${D}${bindir}/ +install -m 755 tzselect ${D}${bindir}/ +} -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] Update timezone files to 2014c
This updates both tzcode and tzdate to latest Armin Kuster (2): Update tzdata to 2014c Update tzcode to 2014c .../recipes-extended/tzcode/tzcode-native_2013i.bb | 26 --- .../recipes-extended/tzcode/tzcode-native_2014c.bb | 25 +++ meta/recipes-extended/tzdata/tzdata_2013i.bb | 206 - meta/recipes-extended/tzdata/tzdata_2014c.bb | 205 4 files changed, 230 insertions(+), 232 deletions(-) delete mode 100644 meta/recipes-extended/tzcode/tzcode-native_2013i.bb create mode 100644 meta/recipes-extended/tzcode/tzcode-native_2014c.bb delete mode 100644 meta/recipes-extended/tzdata/tzdata_2013i.bb create mode 100644 meta/recipes-extended/tzdata/tzdata_2014c.bb -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2 V2] Update timezone files to 2014c
This updates both tzcode and tzdate to latest V2: License correction Solar type correction Armin Kuster (2): Update tzdata to 2014c Update tzcode to 2014c .../recipes-extended/tzcode/tzcode-native_2013i.bb | 26 --- .../recipes-extended/tzcode/tzcode-native_2014c.bb | 25 +++ meta/recipes-extended/tzdata/tzdata_2013i.bb | 206 - meta/recipes-extended/tzdata/tzdata_2014c.bb | 205 4 files changed, 230 insertions(+), 232 deletions(-) delete mode 100644 meta/recipes-extended/tzcode/tzcode-native_2013i.bb create mode 100644 meta/recipes-extended/tzcode/tzcode-native_2014c.bb delete mode 100644 meta/recipes-extended/tzdata/tzdata_2013i.bb create mode 100644 meta/recipes-extended/tzdata/tzdata_2014c.bb -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2 V2] Update tzdata to 2014c
Removed solar-time experiment as per http://mm.icann.org/pipermail/tz/2013-November/020488.html Signed-off-by: Armin Kuster akus...@mvista.com --- meta/recipes-extended/tzdata/tzdata_2013i.bb | 206 --- meta/recipes-extended/tzdata/tzdata_2014c.bb | 205 ++ 2 files changed, 205 insertions(+), 206 deletions(-) delete mode 100644 meta/recipes-extended/tzdata/tzdata_2013i.bb create mode 100644 meta/recipes-extended/tzdata/tzdata_2014c.bb diff --git a/meta/recipes-extended/tzdata/tzdata_2013i.bb b/meta/recipes-extended/tzdata/tzdata_2013i.bb deleted file mode 100644 index 4179b44..000 --- a/meta/recipes-extended/tzdata/tzdata_2013i.bb +++ /dev/null @@ -1,206 +0,0 @@ -SUMMARY = Timezone database -HOMEPAGE = ftp://elsie.nci.nih.gov/pub/; -SECTION = base -LICENSE = PD BSD -LIC_FILES_CHKSUM = file://asia;beginline=2;endline=3;md5=06468c0e84ef4d4c97045a4a29b08234 \ -file://README;md5=0b7570113550eb5d30aa4bd220964b8f -DEPENDS = tzcode-native - -inherit allarch - -RCONFLICTS_${PN} = timezones timezone-africa timezone-america timezone-antarctica \ - timezone-arctic timezone-asia timezone-atlantic \ - timezone-australia timezone-europe timezone-indian \ - timezone-iso3166.tab timezone-pacific timezone-zone.tab - -SRC_URI = ftp://ftp.iana.org/tz/releases/tzdata${PV}.tar.gz;name=tzdata; - -SRC_URI[tzdata.md5sum] = 8bc69eb75bea496ebe1d5a9ab576702d -SRC_URI[tzdata.sha256sum] = 1cd56a6ee964143ef0c65229968a5093988335b95e9115235b5e7b7e45e67dda - -S = ${WORKDIR} - -DEFAULT_TIMEZONE ?= Universal - -TZONES= africa antarctica asia australasia europe northamerica southamerica \ - factory etcetera backward systemv \ - -# pacificnew - -do_compile () { -for zone in ${TZONES}; do \ -${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo -L /dev/null \ --y ${S}/yearistype.sh ${S}/${zone} ; \ -${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/posix -L /dev/null \ --y ${S}/yearistype.sh ${S}/${zone} ; \ -${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/right -L ${S}/leapseconds \ --y ${S}/yearistype.sh ${S}/${zone} ; \ -done -} - -do_install () { -install -d ${D}/$exec_prefix ${D}${datadir}/zoneinfo -cp -pPR ${S}/$exec_prefix ${D}/ -# libc is removing zoneinfo files from package -cp -pP ${S}/zone.tab ${D}${datadir}/zoneinfo -cp -pP ${S}/iso3166.tab ${D}${datadir}/zoneinfo - -# Install default timezone -if [ -e ${D}${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ]; then -install -d ${D}${sysconfdir} -echo ${DEFAULT_TIMEZONE} ${D}${sysconfdir}/timezone -ln -s ${datadir}/zoneinfo/${DEFAULT_TIMEZONE} ${D}${sysconfdir}/localtime -else -bberror DEFAULT_TIMEZONE is set to an invalid value. -exit 1 -fi - -chown -R root:root ${D} -} - -pkg_postinst_${PN} () { - etc_lt=$D${sysconfdir}/localtime - src=$D${sysconfdir}/timezone - - if [ -e ${src} ] ; then - tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' ${src}) - fi - - if [ -z ${tz} ] ; then - return 0 - fi - - if [ ! -e $D${datadir}/zoneinfo/${tz} ] ; then - echo You have an invalid TIMEZONE setting in ${src} - echo Your ${etc_lt} has been reset to Universal; enjoy! - tz=Universal - echo Updating ${etc_lt} with $D${datadir}/zoneinfo/${tz} - if [ -L ${etc_lt} ] ; then - rm -f ${etc_lt} - fi - ln -s ${datadir}/zoneinfo/${tz} ${etc_lt} - fi -} - -# Packages primarily organized by directory with a major city -# in most time zones in the base package - -PACKAGES = tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ -tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ -tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific - -FILES_tzdata-africa += ${datadir}/zoneinfo/Africa/* -RPROVIDES_tzdata-africa = tzdata-africa - -FILES_tzdata-americas += ${datadir}/zoneinfo/America/* \ -${datadir}/zoneinfo/US/*\ -${datadir}/zoneinfo/Brazil/*\ -${datadir}/zoneinfo/Canada/*\ -${datadir}/zoneinfo/Mexico/*\ -${datadir}/zoneinfo/Chile/* -RPROVIDES_tzdata-americas = tzdata-americas - -FILES_tzdata-antarctica += ${datadir}/zoneinfo/Antarctica/* -RPROVIDES_tzdata-antarctica = tzdata-antarctica - -FILES_tzdata-arctic += ${datadir}/zoneinfo/Arctic/* -RPROVIDES_tzdata-arctic = tzdata-arctic - -FILES_tzdata-asia += ${datadir}/zoneinfo/Asia/*\ -${datadir}/zoneinfo/Indian/*\ -${datadir}/zoneinfo
[OE-core] [PATCH 2/2 V2] Update tzcode to 2014c
Signed-off-by: Armin Kuster akus...@mvista.com --- .../recipes-extended/tzcode/tzcode-native_2013i.bb | 26 -- .../recipes-extended/tzcode/tzcode-native_2014c.bb | 25 + 2 files changed, 25 insertions(+), 26 deletions(-) delete mode 100644 meta/recipes-extended/tzcode/tzcode-native_2013i.bb create mode 100644 meta/recipes-extended/tzcode/tzcode-native_2014c.bb diff --git a/meta/recipes-extended/tzcode/tzcode-native_2013i.bb b/meta/recipes-extended/tzcode/tzcode-native_2013i.bb deleted file mode 100644 index cfedc5b..000 --- a/meta/recipes-extended/tzcode/tzcode-native_2013i.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = Timezone zoneinfo utils (zic, zdump, tzselect) -LICENSE = PD BSD - -LIC_FILES_CHKSUM = file://${WORKDIR}/README;md5=0b7570113550eb5d30aa4bd220964b8f - -# note that we allow for us to use data later than our code version -# -SRC_URI = ftp://ftp.iana.org/tz/releases/tzcode${PV}.tar.gz;name=tzcode \ - ftp://ftp.iana.org/tz/releases/tzdata2013i.tar.gz;name=tzdata; - -SRC_URI[tzcode.md5sum] = 86154c8b0cfb47f4e2027ecaa2ec547a -SRC_URI[tzcode.sha256sum] = 63bba6790afc1cb2ea0af2b998a35fc237e247608140dbe4e08b4216a8c31358 - -SRC_URI[tzdata.md5sum] = 8bc69eb75bea496ebe1d5a9ab576702d -SRC_URI[tzdata.sha256sum] = 1cd56a6ee964143ef0c65229968a5093988335b95e9115235b5e7b7e45e67dda - -S = ${WORKDIR} - -inherit native - -do_install () { -install -d ${D}${bindir}/ -install -m 755 zic ${D}${bindir}/ -install -m 755 zdump ${D}${bindir}/ -install -m 755 tzselect ${D}${bindir}/ -} diff --git a/meta/recipes-extended/tzcode/tzcode-native_2014c.bb b/meta/recipes-extended/tzcode/tzcode-native_2014c.bb new file mode 100644 index 000..65a31ae --- /dev/null +++ b/meta/recipes-extended/tzcode/tzcode-native_2014c.bb @@ -0,0 +1,25 @@ +DESCRIPTION = tzcode, timezone zoneinfo utils -- zic, zdump, tzselect +LICENSE = PD BSD + +LIC_FILES_CHKSUM = file://${WORKDIR}/README;md5=0b7570113550eb5d30aa4bd220964b8f + +# note that we allow for us to use data later than our code version +# +SRC_URI = ftp://ftp.iana.org/tz/releases/tzcode${PV}.tar.gz;name=tzcode \ + ftp://ftp.iana.org/tz/releases/tzdata2014c.tar.gz;name=tzdata; + +SRC_URI[tzcode.md5sum] = 657636f201ae8b561225afde49d274af +SRC_URI[tzcode.sha256sum] = 1461e6f6973797ccf516421b272a28082fe26754e8ae94967d8f931a4c8f011b +SRC_URI[tzdata.md5sum] = fa7f3dc1c6f6238253a6f2b850467e2e +SRC_URI[tzdata.sha256sum] = aa2924e012644de3a6cc3160690cb3afecf350af435daefa43bb669fb8f1 + +S = ${WORKDIR} + +inherit native + +do_install () { +install -d ${D}${bindir}/ +install -m 755 zic ${D}${bindir}/ +install -m 755 zdump ${D}${bindir}/ +install -m 755 tzselect ${D}${bindir}/ +} -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] Update tzcode to 2014d for zic fix
Changes affecting code zic no longer generates files containing time stamps well before the Big Bang. This works around GNOME bug 730332 https://bugzilla.gnome.org/show_bug.cgi?id=730332. (Thanks to Leonardo Chiquitto for reporting the bug, and to Arthur David Olson and James Cloos for suggesting improvements to the fix.) Changes affecting documentation tz-link.htm now mentions GNOME. Signed-off-by: Armin Kuster akus...@mvista.com --- meta/recipes-extended/tzcode/tzcode-native.inc | 15 + .../recipes-extended/tzcode/tzcode-native_2014c.bb | 25 -- .../recipes-extended/tzcode/tzcode-native_2014d.bb | 11 ++ 3 files changed, 26 insertions(+), 25 deletions(-) create mode 100644 meta/recipes-extended/tzcode/tzcode-native.inc delete mode 100644 meta/recipes-extended/tzcode/tzcode-native_2014c.bb create mode 100644 meta/recipes-extended/tzcode/tzcode-native_2014d.bb diff --git a/meta/recipes-extended/tzcode/tzcode-native.inc b/meta/recipes-extended/tzcode/tzcode-native.inc new file mode 100644 index 000..f034333 --- /dev/null +++ b/meta/recipes-extended/tzcode/tzcode-native.inc @@ -0,0 +1,15 @@ +DESCRIPTION = tzcode, timezone zoneinfo utils -- zic, zdump, tzselect +LICENSE = PD BSD + +LIC_FILES_CHKSUM = file://${WORKDIR}/README;md5=0b7570113550eb5d30aa4bd220964b8f + +S = ${WORKDIR} + +inherit native + +do_install () { +install -d ${D}${bindir}/ +install -m 755 zic ${D}${bindir}/ +install -m 755 zdump ${D}${bindir}/ +install -m 755 tzselect ${D}${bindir}/ +} diff --git a/meta/recipes-extended/tzcode/tzcode-native_2014c.bb b/meta/recipes-extended/tzcode/tzcode-native_2014c.bb deleted file mode 100644 index 65a31ae..000 --- a/meta/recipes-extended/tzcode/tzcode-native_2014c.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = tzcode, timezone zoneinfo utils -- zic, zdump, tzselect -LICENSE = PD BSD - -LIC_FILES_CHKSUM = file://${WORKDIR}/README;md5=0b7570113550eb5d30aa4bd220964b8f - -# note that we allow for us to use data later than our code version -# -SRC_URI = ftp://ftp.iana.org/tz/releases/tzcode${PV}.tar.gz;name=tzcode \ - ftp://ftp.iana.org/tz/releases/tzdata2014c.tar.gz;name=tzdata; - -SRC_URI[tzcode.md5sum] = 657636f201ae8b561225afde49d274af -SRC_URI[tzcode.sha256sum] = 1461e6f6973797ccf516421b272a28082fe26754e8ae94967d8f931a4c8f011b -SRC_URI[tzdata.md5sum] = fa7f3dc1c6f6238253a6f2b850467e2e -SRC_URI[tzdata.sha256sum] = aa2924e012644de3a6cc3160690cb3afecf350af435daefa43bb669fb8f1 - -S = ${WORKDIR} - -inherit native - -do_install () { -install -d ${D}${bindir}/ -install -m 755 zic ${D}${bindir}/ -install -m 755 zdump ${D}${bindir}/ -install -m 755 tzselect ${D}${bindir}/ -} diff --git a/meta/recipes-extended/tzcode/tzcode-native_2014d.bb b/meta/recipes-extended/tzcode/tzcode-native_2014d.bb new file mode 100644 index 000..8d20158 --- /dev/null +++ b/meta/recipes-extended/tzcode/tzcode-native_2014d.bb @@ -0,0 +1,11 @@ +# note that we allow for us to use data later than our code version +# +SRC_URI = ftp://ftp.iana.org/tz/releases/tzcode${PV}.tar.gz;name=tzcode \ + ftp://ftp.iana.org/tz/releases/tzdata2014d.tar.gz;name=tzdata; + +SRC_URI[tzcode.md5sum] = 4a0f5f259ba8a2b826fffb1fa26d0134 +SRC_URI[tzcode.sha256sum] = e9c775bb76c9700521ada6277c25f8650a22b56d46c9f00f4147970ef13e +SRC_URI[tzdata.md5sum] = 299b86c0368ecfb321f15d5c408a1d9b +SRC_URI[tzdata.sha256sum] = 4b4966912f5d4a299b0bdf47e6f3103d82dc6a0b5a6b321e2b9d5662597a62f0 + +require tzcode-native.inc -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] Update tzdata to 2014d
moved build data to an inc file since it changes little. Signed-off-by: Armin Kuster akus...@mvista.com --- meta/recipes-extended/tzdata/{tzdata_2014c.bb = tzdata.inc} | 5 - meta/recipes-extended/tzdata/tzdata_2014d.bb | 6 ++ 2 files changed, 6 insertions(+), 5 deletions(-) rename meta/recipes-extended/tzdata/{tzdata_2014c.bb = tzdata.inc} (97%) create mode 100644 meta/recipes-extended/tzdata/tzdata_2014d.bb diff --git a/meta/recipes-extended/tzdata/tzdata_2014c.bb b/meta/recipes-extended/tzdata/tzdata.inc similarity index 97% rename from meta/recipes-extended/tzdata/tzdata_2014c.bb rename to meta/recipes-extended/tzdata/tzdata.inc index 457f145..06a6bea 100644 --- a/meta/recipes-extended/tzdata/tzdata_2014c.bb +++ b/meta/recipes-extended/tzdata/tzdata.inc @@ -12,11 +12,6 @@ RCONFLICTS_${PN} = timezones timezone-africa timezone-america timezone-antarcti timezone-australia timezone-europe timezone-indian \ timezone-iso3166.tab timezone-pacific timezone-zone.tab -SRC_URI = ftp://ftp.iana.org/tz/releases/tzdata${PV}.tar.gz;name=tzdata; - -SRC_URI[tzdata.md5sum] = fa7f3dc1c6f6238253a6f2b850467e2e -SRC_URI[tzdata.sha256sum] = aa2924e012644de3a6cc3160690cb3afecf350af435daefa43bb669fb8f1 - S = ${WORKDIR} DEFAULT_TIMEZONE ?= Universal diff --git a/meta/recipes-extended/tzdata/tzdata_2014d.bb b/meta/recipes-extended/tzdata/tzdata_2014d.bb new file mode 100644 index 000..984c665 --- /dev/null +++ b/meta/recipes-extended/tzdata/tzdata_2014d.bb @@ -0,0 +1,6 @@ +SRC_URI = ftp://ftp.iana.org/tz/releases/tzdata${PV}.tar.gz;name=tzdata; + +SRC_URI[tzdata.md5sum] = 299b86c0368ecfb321f15d5c408a1d9b +SRC_URI[tzdata.sha256sum] = 4b4966912f5d4a299b0bdf47e6f3103d82dc6a0b5a6b321e2b9d5662597a62f0 + +require tzdata.inc -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] Timezone code and date update to 2014d
It is not uncommon to have the tzcode and data update several times a year. This update fixes a bug the 2014c update introduced to zic. I moved the build information out of the bb files into inc files to keep future update patches smaller. Armin Kuster (2): Update tzcode to 2014d for zic fix Update tzdata to 2014d meta/recipes-extended/tzcode/tzcode-native.inc | 15 + .../recipes-extended/tzcode/tzcode-native_2014c.bb | 25 -- .../recipes-extended/tzcode/tzcode-native_2014d.bb | 11 ++ .../tzdata/{tzdata_2014c.bb = tzdata.inc} | 5 - meta/recipes-extended/tzdata/tzdata_2014d.bb | 6 ++ 5 files changed, 32 insertions(+), 30 deletions(-) create mode 100644 meta/recipes-extended/tzcode/tzcode-native.inc delete mode 100644 meta/recipes-extended/tzcode/tzcode-native_2014c.bb create mode 100644 meta/recipes-extended/tzcode/tzcode-native_2014d.bb rename meta/recipes-extended/tzdata/{tzdata_2014c.bb = tzdata.inc} (97%) create mode 100644 meta/recipes-extended/tzdata/tzdata_2014d.bb -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCH] cups: Fix build failure
The follwing error was seen when no crypt dependency was included. In file included from cups-private.h:29:0, | from attr.c:26: | http-private.h:83:24: fatal error: gcrypt.h: No such file or directory | #include gcrypt.h | ^ Add bcrypt to DEPENDS Signed-off-by: Armin Kuster akus...@mvista.com --- meta/recipes-extended/cups/cups.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index fd88552..249eac4 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -1,7 +1,7 @@ SUMMARY = An Internet printing system for Unix SECTION = console/utils LICENSE = GPLv2 LGPLv2 -DEPENDS = gnutls libpng jpeg dbus dbus-glib zlib libusb +DEPENDS = gnutls libpng jpeg dbus dbus-glib zlib libusb bcrypt PROVIDES = cups14 SRC_URI = http://www.cups.org/software/${PV}/${BP}-source.tar.bz2 \ -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCH] v2 cups: Shouldn't link against libgcrypt without using gcrypt functions
backported patch from cups.org to address the cryto dependency issue I am seeing. http://www.cups.org/str.php?L4399 Signed-off-by: Armin Kuster akus...@mvista.com --- meta/recipes-extended/cups/cups.inc| 1 + .../cups/cups/cups-no-gcrypt.patch | 40 ++ 2 files changed, 41 insertions(+) create mode 100644 meta/recipes-extended/cups/cups/cups-no-gcrypt.patch diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index fd88552..3b8027b 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -8,6 +8,7 @@ SRC_URI = http://www.cups.org/software/${PV}/${BP}-source.tar.bz2 \ file://use_echo_only_in_init.patch \ file://0001-don-t-try-to-run-generated-binaries.patch \ file://cups_serverbin.patch \ + file://cups-no-gcrypt.patch \ LEAD_SONAME = libcupsdriver.so diff --git a/meta/recipes-extended/cups/cups/cups-no-gcrypt.patch b/meta/recipes-extended/cups/cups/cups-no-gcrypt.patch new file mode 100644 index 000..465d353 --- /dev/null +++ b/meta/recipes-extended/cups/cups/cups-no-gcrypt.patch @@ -0,0 +1,40 @@ +Description: Don't build-depend on libgcrypt, as nothing is used from it +Author: Didier Raboud o...@debian.org +Bug-Debian: https://bugs.debian.org/638416 +Bug: http://www.cups.org/str.php?L +Last-Update: 2014-04-07 +--- a/config-scripts/cups-ssl.m4 b/config-scripts/cups-ssl.m4 +@@ -66,7 +66,6 @@ + dnl Then look for GNU TLS... + if test $have_ssl = 0 -a x$enable_gnutls != xno -a x$PKGCONFIG != x; then + AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config) +- AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config) + if $PKGCONFIG --exists gnutls; then + have_ssl=1 + SSLLIBS=`$PKGCONFIG --libs gnutls` +@@ -84,14 +83,6 @@ + if test $have_ssl = 1; then + CUPS_SERVERCERT=ssl/server.crt + CUPS_SERVERKEY=ssl/server.key +- +-if $PKGCONFIG --exists gcrypt; then +- SSLLIBS=$SSLLIBS `$PKGCONFIG --libs gcrypt` +- SSLFLAGS=$SSLFLAGS `$PKGCONFIG --cflags gcrypt` +- elif test x$LIBGCRYPTCONFIG != x; then +- SSLLIBS=$SSLLIBS `$LIBGCRYPTCONFIG --libs` +- SSLFLAGS=$SSLFLAGS `$LIBGCRYPTCONFIG --cflags` +- fi + fi + fi + +--- a/cups/http-private.h b/cups/http-private.h +@@ -80,7 +80,6 @@ + # elif defined HAVE_GNUTLS + #include gnutls/gnutls.h + #include gnutls/x509.h +-#include gcrypt.h + # elif defined(HAVE_CDSASSL) + #include CoreFoundation/CoreFoundation.h + #include Security/Security.h -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCH] v3 cups: Shouldn't link against libgcrypt without using gcrypt functions
[CUPS Ticket #4399] -- http://www.cups.org/str.php?L4399 Upstream-Status: Backport Backported from http://www.cups.org/strfiles.php/3308/cups-no-gcrypt.patch This addresses the cryto dependency seen during build. Signed-off-by: Armin Kuster akus...@mvista.com --- meta/recipes-extended/cups/cups.inc| 1 + .../cups/cups/cups-no-gcrypt.patch | 40 ++ 2 files changed, 41 insertions(+) create mode 100644 meta/recipes-extended/cups/cups/cups-no-gcrypt.patch diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index fd88552..3b8027b 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -8,6 +8,7 @@ SRC_URI = http://www.cups.org/software/${PV}/${BP}-source.tar.bz2 \ file://use_echo_only_in_init.patch \ file://0001-don-t-try-to-run-generated-binaries.patch \ file://cups_serverbin.patch \ + file://cups-no-gcrypt.patch \ LEAD_SONAME = libcupsdriver.so diff --git a/meta/recipes-extended/cups/cups/cups-no-gcrypt.patch b/meta/recipes-extended/cups/cups/cups-no-gcrypt.patch new file mode 100644 index 000..465d353 --- /dev/null +++ b/meta/recipes-extended/cups/cups/cups-no-gcrypt.patch @@ -0,0 +1,40 @@ +Description: Don't build-depend on libgcrypt, as nothing is used from it +Author: Didier Raboud o...@debian.org +Bug-Debian: https://bugs.debian.org/638416 +Bug: http://www.cups.org/str.php?L +Last-Update: 2014-04-07 +--- a/config-scripts/cups-ssl.m4 b/config-scripts/cups-ssl.m4 +@@ -66,7 +66,6 @@ + dnl Then look for GNU TLS... + if test $have_ssl = 0 -a x$enable_gnutls != xno -a x$PKGCONFIG != x; then + AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config) +- AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config) + if $PKGCONFIG --exists gnutls; then + have_ssl=1 + SSLLIBS=`$PKGCONFIG --libs gnutls` +@@ -84,14 +83,6 @@ + if test $have_ssl = 1; then + CUPS_SERVERCERT=ssl/server.crt + CUPS_SERVERKEY=ssl/server.key +- +-if $PKGCONFIG --exists gcrypt; then +- SSLLIBS=$SSLLIBS `$PKGCONFIG --libs gcrypt` +- SSLFLAGS=$SSLFLAGS `$PKGCONFIG --cflags gcrypt` +- elif test x$LIBGCRYPTCONFIG != x; then +- SSLLIBS=$SSLLIBS `$LIBGCRYPTCONFIG --libs` +- SSLFLAGS=$SSLFLAGS `$LIBGCRYPTCONFIG --cflags` +- fi + fi + fi + +--- a/cups/http-private.h b/cups/http-private.h +@@ -80,7 +80,6 @@ + # elif defined HAVE_GNUTLS + #include gnutls/gnutls.h + #include gnutls/x509.h +-#include gcrypt.h + # elif defined(HAVE_CDSASSL) + #include CoreFoundation/CoreFoundation.h + #include Security/Security.h -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCH] v4 cups: Shouldn't link against libgcrypt without using gcrypt functions
Backported from http://www.cups.org/strfiles.php/3308/cups-no-gcrypt.patch This addresses the cryto dependency seen during build. Signed-off-by: Armin Kuster akus...@mvista.com --- meta/recipes-extended/cups/cups.inc| 1 + .../cups/cups/cups-no-gcrypt.patch | 49 ++ 2 files changed, 50 insertions(+) create mode 100644 meta/recipes-extended/cups/cups/cups-no-gcrypt.patch diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index fd88552..3b8027b 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -8,6 +8,7 @@ SRC_URI = http://www.cups.org/software/${PV}/${BP}-source.tar.bz2 \ file://use_echo_only_in_init.patch \ file://0001-don-t-try-to-run-generated-binaries.patch \ file://cups_serverbin.patch \ + file://cups-no-gcrypt.patch \ LEAD_SONAME = libcupsdriver.so diff --git a/meta/recipes-extended/cups/cups/cups-no-gcrypt.patch b/meta/recipes-extended/cups/cups/cups-no-gcrypt.patch new file mode 100644 index 000..8bbcf39 --- /dev/null +++ b/meta/recipes-extended/cups/cups/cups-no-gcrypt.patch @@ -0,0 +1,49 @@ +Description: Don't build-depend on libgcrypt, as nothing is used from it +Author: Didier Raboud o...@debian.org +Bug-Debian: https://bugs.debian.org/638416 +Bug: http://www.cups.org/str.php?L + +[CUPS Ticket #4399] -- http://www.cups.org/str.php?L4399 + +Backported from http://www.cups.org/strfiles.php/3308/cups-no-gcrypt.patch + +Upstream-Status: Backport + +Signed-off-by: Armin Kuster akus...@mvista.com + +Last-Update: 2014-04-07 +--- a/config-scripts/cups-ssl.m4 b/config-scripts/cups-ssl.m4 +@@ -66,7 +66,6 @@ + dnl Then look for GNU TLS... + if test $have_ssl = 0 -a x$enable_gnutls != xno -a x$PKGCONFIG != x; then + AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config) +- AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config) + if $PKGCONFIG --exists gnutls; then + have_ssl=1 + SSLLIBS=`$PKGCONFIG --libs gnutls` +@@ -84,14 +83,6 @@ + if test $have_ssl = 1; then + CUPS_SERVERCERT=ssl/server.crt + CUPS_SERVERKEY=ssl/server.key +- +-if $PKGCONFIG --exists gcrypt; then +- SSLLIBS=$SSLLIBS `$PKGCONFIG --libs gcrypt` +- SSLFLAGS=$SSLFLAGS `$PKGCONFIG --cflags gcrypt` +- elif test x$LIBGCRYPTCONFIG != x; then +- SSLLIBS=$SSLLIBS `$LIBGCRYPTCONFIG --libs` +- SSLFLAGS=$SSLFLAGS `$LIBGCRYPTCONFIG --cflags` +- fi + fi + fi + +--- a/cups/http-private.h b/cups/http-private.h +@@ -80,7 +80,6 @@ + # elif defined HAVE_GNUTLS + #include gnutls/gnutls.h + #include gnutls/x509.h +-#include gcrypt.h + # elif defined(HAVE_CDSASSL) + #include CoreFoundation/CoreFoundation.h + #include Security/Security.h -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCH 2/2] tzcode: update to verison 2014e
Signed-off-by: Armin Kuster akus...@mvista.com --- meta/recipes-extended/tzcode/tzcode-native_2014d.bb | 11 --- meta/recipes-extended/tzcode/tzcode-native_2014e.bb | 11 +++ 2 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 meta/recipes-extended/tzcode/tzcode-native_2014d.bb create mode 100644 meta/recipes-extended/tzcode/tzcode-native_2014e.bb diff --git a/meta/recipes-extended/tzcode/tzcode-native_2014d.bb b/meta/recipes-extended/tzcode/tzcode-native_2014d.bb deleted file mode 100644 index 8d20158..000 --- a/meta/recipes-extended/tzcode/tzcode-native_2014d.bb +++ /dev/null @@ -1,11 +0,0 @@ -# note that we allow for us to use data later than our code version -# -SRC_URI = ftp://ftp.iana.org/tz/releases/tzcode${PV}.tar.gz;name=tzcode \ - ftp://ftp.iana.org/tz/releases/tzdata2014d.tar.gz;name=tzdata; - -SRC_URI[tzcode.md5sum] = 4a0f5f259ba8a2b826fffb1fa26d0134 -SRC_URI[tzcode.sha256sum] = e9c775bb76c9700521ada6277c25f8650a22b56d46c9f00f4147970ef13e -SRC_URI[tzdata.md5sum] = 299b86c0368ecfb321f15d5c408a1d9b -SRC_URI[tzdata.sha256sum] = 4b4966912f5d4a299b0bdf47e6f3103d82dc6a0b5a6b321e2b9d5662597a62f0 - -require tzcode-native.inc diff --git a/meta/recipes-extended/tzcode/tzcode-native_2014e.bb b/meta/recipes-extended/tzcode/tzcode-native_2014e.bb new file mode 100644 index 000..405ed60 --- /dev/null +++ b/meta/recipes-extended/tzcode/tzcode-native_2014e.bb @@ -0,0 +1,11 @@ +# note that we allow for us to use data later than our code version +# +SRC_URI = ftp://ftp.iana.org/tz/releases/tzcode${PV}.tar.gz;name=tzcode \ + ftp://ftp.iana.org/tz/releases/tzdata2014e.tar.gz;name=tzdata; + +SRC_URI[tzcode.md5sum] = 552251600ee3571c244d33c7196ec2ed +SRC_URI[tzcode.sha256sum] = 43ebc426ab4911e222a4487f24289adfd2bc5eb09363a5e77cdabf56374a8c1c +SRC_URI[tzdata.md5sum] = 8a49fdedd4e832da8e85f7f9bcaedc33 +SRC_URI[tzdata.sha256sum] = 08e243a79051f838d86ac1311a78b74047951302d448024e823b5b7aa71f86c5 + +require tzcode-native.inc -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [Patch 0/2] Timezone update to 2014e
Changes affecting near-future time stamps Egypt's 2014 Ramadan-based transitions are June 26 and July 31 at 24:00. (Thanks to Imed Chihi.) Guess that from 2015 on Egypt will temporarily switch to standard time at 24:00 the last Thursday before Ramadan, and back to DST at 00:00 the first Friday after Ramadan. Similarly, Morocco's are June 28 at 03:00 and August 2 at 02:00. (Thanks to Milamber Space Network.) Guess that from 2015 on Morocco will temporarily switch to standard time at 03:00 the last Saturday before Ramadan, and back to DST at 02:00 the first Saturday after Ramadan. Changes affecting past time stamps The abbreviation MSM (Moscow Midsummer Time) is now used instead of MSD for Moscow's double daylight time in summer 1921. Also, a typo VLASST has been repaired to be VLAST for Vladivostok summer time in 1991. (Thanks to Hank W. for reporting the problems.) Changes affecting commentary tz-link.htm now cites RFC 7265 for jCal, mentions PTP and the draft CalDAV extension, updates URLs for TSP, TZInfo, IATA, and removes stale pointers to World Time Explorer and WORLDTIME. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCH 1/2] tzdata: update to version 2014e
Signed-off-by: Armin Kuster akus...@mvista.com --- meta/recipes-extended/tzdata/tzdata_2014d.bb | 6 -- meta/recipes-extended/tzdata/tzdata_2014e.bb | 6 ++ 2 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 meta/recipes-extended/tzdata/tzdata_2014d.bb create mode 100644 meta/recipes-extended/tzdata/tzdata_2014e.bb diff --git a/meta/recipes-extended/tzdata/tzdata_2014d.bb b/meta/recipes-extended/tzdata/tzdata_2014d.bb deleted file mode 100644 index 984c665..000 --- a/meta/recipes-extended/tzdata/tzdata_2014d.bb +++ /dev/null @@ -1,6 +0,0 @@ -SRC_URI = ftp://ftp.iana.org/tz/releases/tzdata${PV}.tar.gz;name=tzdata; - -SRC_URI[tzdata.md5sum] = 299b86c0368ecfb321f15d5c408a1d9b -SRC_URI[tzdata.sha256sum] = 4b4966912f5d4a299b0bdf47e6f3103d82dc6a0b5a6b321e2b9d5662597a62f0 - -require tzdata.inc diff --git a/meta/recipes-extended/tzdata/tzdata_2014e.bb b/meta/recipes-extended/tzdata/tzdata_2014e.bb new file mode 100644 index 000..b53d323 --- /dev/null +++ b/meta/recipes-extended/tzdata/tzdata_2014e.bb @@ -0,0 +1,6 @@ +SRC_URI = ftp://ftp.iana.org/tz/releases/tzdata${PV}.tar.gz;name=tzdata; + +SRC_URI[tzdata.md5sum] = 8a49fdedd4e832da8e85f7f9bcaedc33 +SRC_URI[tzdata.sha256sum] = 08e243a79051f838d86ac1311a78b74047951302d448024e823b5b7aa71f86c5 + +require tzdata.inc -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCH 0/2] update lz4 and add maintainer
Update SRC_URI to github so we can use less complicated fetch Update to version 119 Add self to maintainers list. If inappropriate, then drop second patch Armin Kuster (2): lz4: update to latest version 119 lz4: Add self to maintainers list meta-yocto/conf/distro/include/maintainers.inc | 1 + meta/recipes-support/lz4/{lz4_svn.bb = lz4_r119.bb} | 12 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) rename meta/recipes-support/lz4/{lz4_svn.bb = lz4_r119.bb} (63%) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCH 2/2] lz4: Add self to maintainers list
Signed-off-by: Armin Kuster akus...@mvista.com --- meta-yocto/conf/distro/include/maintainers.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-yocto/conf/distro/include/maintainers.inc b/meta-yocto/conf/distro/include/maintainers.inc index 4d2f46b..4c566d1 100644 --- a/meta-yocto/conf/distro/include/maintainers.inc +++ b/meta-yocto/conf/distro/include/maintainers.inc @@ -419,6 +419,7 @@ RECIPE_MAINTAINER_pn-lttng-tools = Richard Purdie richard.purdie@linuxfoundati RECIPE_MAINTAINER_pn-lttng-ust = Richard Purdie richard.pur...@linuxfoundation.org RECIPE_MAINTAINER_pn-lzop = Saul Wold s...@linux.intel.com RECIPE_MAINTAINER_pn-lzo = Saul Wold s...@linux.intel.com +RECIPE_MAINTAINER_pn-lz4 = Armin Kuster akus...@mvista.com RECIPE_MAINTAINER_pn-m4 = Robert Yang liezhi.y...@windriver.com RECIPE_MAINTAINER_pn-mailx = Kai Kang kai.k...@windriver.com RECIPE_MAINTAINER_pn-make = Robert Yang liezhi.y...@windriver.com -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCH 1/2] lz4: update to latest version 119
Update SRC_URI to github as googlecode does not have this version Minor clean to reflect non-svn fetch Signed-off-by: Armin Kuster akus...@mvista.com --- meta/recipes-support/lz4/{lz4_svn.bb = lz4_r119.bb} | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) rename meta/recipes-support/lz4/{lz4_svn.bb = lz4_r119.bb} (63%) diff --git a/meta/recipes-support/lz4/lz4_svn.bb b/meta/recipes-support/lz4/lz4_r119.bb similarity index 63% rename from meta/recipes-support/lz4/lz4_svn.bb rename to meta/recipes-support/lz4/lz4_r119.bb index 38e36d8..dfc155e 100644 --- a/meta/recipes-support/lz4/lz4_svn.bb +++ b/meta/recipes-support/lz4/lz4_r119.bb @@ -2,15 +2,15 @@ SUMMARY = Extremely Fast Compression algorithm DESCRIPTION = LZ4 is a very fast lossless compression algorithm, providing compression speed at 400 MB/s per core, scalable with multi-cores CPU. It also features an extremely fast decoder, with speed in multiple GB/s per core, typically reaching RAM speed limits on multi-core systems. LICENSE = BSD -LIC_FILES_CHKSUM = file://LICENSE;md5=2008d2325e11691e17fcaa3a6046f850 +LIC_FILES_CHKSUM = file://LICENSE;md5=0b0d063f37a4477b54af2459477dcafd -# Upstream names releases after SVN revs -SRCREV = 112 -PV = r${SRCREV} -SRC_URI = svn://lz4.googlecode.com/svn/;module=trunk;protocol=http +SRC_URI = https://github.com/Cyan4973/lz4/archive/${PV}.tar.gz; -S = ${WORKDIR}/trunk +SRC_URI[md5sum] = 3fc4ed20cb98dba909896f485b25d0f1 +SRC_URI[sha256sum] = 1deb77e5cc7b41422c02dd3d56e7e0f0deb20723a54cad4ad5a65fb1f4805b1c + +S = ${WORKDIR}/${BPN}-${PV} EXTRA_OEMAKE = PREFIX=${prefix} CC='${CC}' DESTDIR=${D} LIBDIR=${libdir} INCLUDEDIR=${includedir} -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [meta-oe][PATCH] V2 lz4: update to latest version
update to version r119 Use github instead of svn LICENSE md5sum changed since it was updated in r117 FIxes CVE-2014-4611 Signed-off-by: Armin Kuster akus...@mvista.com --- meta/recipes-support/lz4/lz4_git.bb | 18 ++ 1 file changed, 18 insertions(+) create mode 100644 meta/recipes-support/lz4/lz4_git.bb diff --git a/meta/recipes-support/lz4/lz4_git.bb b/meta/recipes-support/lz4/lz4_git.bb new file mode 100644 index 000..3978d76 --- /dev/null +++ b/meta/recipes-support/lz4/lz4_git.bb @@ -0,0 +1,18 @@ +SUMMARY = Extremely Fast Compression algorithm +DESCRIPTION = LZ4 is a very fast lossless compression algorithm, providing compression speed at 400 MB/s per core, scalable with multi-cores CPU. It also features an extremely fast decoder, with speed in multiple GB/s per core, typically reaching RAM speed limits on multi-core systems. + +LICENSE = BSD +LIC_FILES_CHKSUM = file://LICENSE;md5=0b0d063f37a4477b54af2459477dcafd + +SRCREV = 28fd251bc7b42e5cde15f9a2d78fc53b3b575558 +SRC_URI= git://github.com/Cyan4973/lz4.git;branch=master + +S = ${WORKDIR}/git + +EXTRA_OEMAKE = PREFIX=${prefix} CC='${CC}' DESTDIR=${D} LIBDIR=${libdir} INCLUDEDIR=${includedir} + +do_install() { + oe_runmake install +} + +BBCLASSEXTEND += native nativesdk -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [meta-oe][PATCH] [v3] lz4: update to latest version
update to version r119 Use github instead of svn LICENSE md5sum changed since it was updated in r117 FIxes CVE-2014-4611 Signed-off-by: Armin Kuster akus...@mvista.com --- meta/recipes-support/lz4/{lz4_svn.bb = lz4_git.bb} | 11 --- 1 file changed, 4 insertions(+), 7 deletions(-) rename meta/recipes-support/lz4/{lz4_svn.bb = lz4_git.bb} (68%) diff --git a/meta/recipes-support/lz4/lz4_svn.bb b/meta/recipes-support/lz4/lz4_git.bb similarity index 68% rename from meta/recipes-support/lz4/lz4_svn.bb rename to meta/recipes-support/lz4/lz4_git.bb index 38e36d8..3978d76 100644 --- a/meta/recipes-support/lz4/lz4_svn.bb +++ b/meta/recipes-support/lz4/lz4_git.bb @@ -2,15 +2,12 @@ SUMMARY = Extremely Fast Compression algorithm DESCRIPTION = LZ4 is a very fast lossless compression algorithm, providing compression speed at 400 MB/s per core, scalable with multi-cores CPU. It also features an extremely fast decoder, with speed in multiple GB/s per core, typically reaching RAM speed limits on multi-core systems. LICENSE = BSD -LIC_FILES_CHKSUM = file://LICENSE;md5=2008d2325e11691e17fcaa3a6046f850 +LIC_FILES_CHKSUM = file://LICENSE;md5=0b0d063f37a4477b54af2459477dcafd -# Upstream names releases after SVN revs -SRCREV = 112 -PV = r${SRCREV} +SRCREV = 28fd251bc7b42e5cde15f9a2d78fc53b3b575558 +SRC_URI= git://github.com/Cyan4973/lz4.git;branch=master -SRC_URI = svn://lz4.googlecode.com/svn/;module=trunk;protocol=http - -S = ${WORKDIR}/trunk +S = ${WORKDIR}/git EXTRA_OEMAKE = PREFIX=${prefix} CC='${CC}' DESTDIR=${D} LIBDIR=${libdir} INCLUDEDIR=${includedir} -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [meta-oe][PATCH] nettle: update to version 3.0
Update to latest version Add GNUv3 license Signed-off-by: Armin Kuster akus...@mvista.com --- .../nettle/{nettle_2.7.1.bb = nettle_3.0.bb}| 16 1 file changed, 8 insertions(+), 8 deletions(-) rename meta/recipes-support/nettle/{nettle_2.7.1.bb = nettle_3.0.bb} (59%) diff --git a/meta/recipes-support/nettle/nettle_2.7.1.bb b/meta/recipes-support/nettle/nettle_3.0.bb similarity index 59% rename from meta/recipes-support/nettle/nettle_2.7.1.bb rename to meta/recipes-support/nettle/nettle_3.0.bb index 8aa5351..04789c9 100644 --- a/meta/recipes-support/nettle/nettle_2.7.1.bb +++ b/meta/recipes-support/nettle/nettle_3.0.bb @@ -1,17 +1,19 @@ SUMMARY = A low level cryptographic library HOMEPAGE = http://www.lysator.liu.se/~nisse/nettle/; SECTION = libs -LICENSE = LGPLv2.1 GPLv2 -LIC_FILES_CHKSUM = file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://serpent-decrypt.c;beginline=53;endline=67;md5=bcfd4745d53ca57f82907089898e390d \ - file://serpent-set-key.c;beginline=56;endline=70;md5=bcfd4745d53ca57f82907089898e390d +LICENSE = LGPLv2.1 GPLv2 GPLv3 +LIC_FILES_CHKSUM = file://COPYINGv3;md5=11cc2d3ee574f9d6b7ee797bdce4d423\ + file://serpent-decrypt.c;beginline=53;endline=67;md5=a4ccbeb343203d3586661f45c1cab577 \ + file://serpent-set-key.c;beginline=56;endline=70;md5=150b0ea44cdfb712a83331bff566e9a8 DEPENDS += gmp SRC_URI = http://www.lysator.liu.se/~nisse/archive/${BP}.tar.gz; -SRC_URI[md5sum] = 003d5147911317931dd453520eb234a5 -SRC_URI[sha256sum] = bc71ebd43435537d767799e414fce88e521b7278d48c860651216e1fc6555b40 +SRC_URI[md5sum] = f64b1bf1e774b7ae6e507318e340250e +SRC_URI[sha256sum] = 9651c0bd2326eb737d0ed9eb403444712407c01a25b0fe813432ef31bebcd913 + +inherit autotools-brokensep EXTRA_OECONF = --disable-openssl @@ -21,6 +23,4 @@ do_configure_prepend() { fi } -inherit autotools - BBCLASSEXTEND = native -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [meta-oe][PATCH] [v2] nettle: update to version 3.0
Updating to version 3.x Version 3.x includes GPL v3 code. They call it dual licensing Keeping 2.7.1 as it is GPL v2 Put common code in inc file Signed-off-by: Armin Kuster akus...@mvista.com --- meta/recipes-support/nettle/nettle.inc | 27 +++ meta/recipes-support/nettle/nettle_2.7.1.bb | 20 +++- meta/recipes-support/nettle/nettle_3.0.bb | 16 3 files changed, 46 insertions(+), 17 deletions(-) create mode 100644 meta/recipes-support/nettle/nettle.inc create mode 100644 meta/recipes-support/nettle/nettle_3.0.bb diff --git a/meta/recipes-support/nettle/nettle.inc b/meta/recipes-support/nettle/nettle.inc new file mode 100644 index 000..bca35c0 --- /dev/null +++ b/meta/recipes-support/nettle/nettle.inc @@ -0,0 +1,27 @@ +SUMMARY = A low level cryptographic library +HOMEPAGE = http://www.lysator.liu.se/~nisse/nettle/; +SECTION = libs +LICENSE = LGPLv2.1 GPLv2 + +# Version 2.7.1 is GPL v2 +# set PREFERRED_VERSION_nettle = 2.7.1 in local.conf +# if you want GPLv2 code +# +# Version 3.x is GPL v2 and v3 + + +DEPENDS += gmp + +SRC_URI = http://www.lysator.liu.se/~nisse/archive/${BP}.tar.gz; + +EXTRA_OECONF = --disable-openssl + +do_configure_prepend() { + if [ ! -e ${S}/acinclude.m4 -a -e ${S}/aclocal.m4 ]; then + cp ${S}/aclocal.m4 ${S}/acinclude.m4 + fi +} + +inherit autotools + +BBCLASSEXTEND = native diff --git a/meta/recipes-support/nettle/nettle_2.7.1.bb b/meta/recipes-support/nettle/nettle_2.7.1.bb index 8aa5351..9ef9f64 100644 --- a/meta/recipes-support/nettle/nettle_2.7.1.bb +++ b/meta/recipes-support/nettle/nettle_2.7.1.bb @@ -1,26 +1,12 @@ -SUMMARY = A low level cryptographic library -HOMEPAGE = http://www.lysator.liu.se/~nisse/nettle/; -SECTION = libs + +include nettle.inc + LICENSE = LGPLv2.1 GPLv2 LIC_FILES_CHKSUM = file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://serpent-decrypt.c;beginline=53;endline=67;md5=bcfd4745d53ca57f82907089898e390d \ file://serpent-set-key.c;beginline=56;endline=70;md5=bcfd4745d53ca57f82907089898e390d -DEPENDS += gmp - -SRC_URI = http://www.lysator.liu.se/~nisse/archive/${BP}.tar.gz; SRC_URI[md5sum] = 003d5147911317931dd453520eb234a5 SRC_URI[sha256sum] = bc71ebd43435537d767799e414fce88e521b7278d48c860651216e1fc6555b40 -EXTRA_OECONF = --disable-openssl - -do_configure_prepend() { - if [ ! -e ${S}/acinclude.m4 -a -e ${S}/aclocal.m4 ]; then - cp ${S}/aclocal.m4 ${S}/acinclude.m4 - fi -} - -inherit autotools - -BBCLASSEXTEND = native diff --git a/meta/recipes-support/nettle/nettle_3.0.bb b/meta/recipes-support/nettle/nettle_3.0.bb new file mode 100644 index 000..bac2e71 --- /dev/null +++ b/meta/recipes-support/nettle/nettle_3.0.bb @@ -0,0 +1,16 @@ +# +# Nettle 3 and above contains GPL v3 code +# use 2.7.1 if you do not want GPL v3 code +# + +include nettle.inc + +LICENSE = LGPLv2.1 GPLv2 GPLv3 + +LIC_FILES_CHKSUM = file://COPYINGv3;md5=11cc2d3ee574f9d6b7ee797bdce4d423\ + file://serpent-decrypt.c;beginline=53;endline=67;md5=a4ccbeb343203d3586661f45c1cab577 \ + file://serpent-set-key.c;beginline=56;endline=70;md5=150b0ea44cdfb712a83331bff566e9a8 + +SRC_URI[md5sum] = f64b1bf1e774b7ae6e507318e340250e +SRC_URI[sha256sum] = 9651c0bd2326eb737d0ed9eb403444712407c01a25b0fe813432ef31bebcd913 + -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [meta-oe][PATCH] [v4] lz4: update to latest version
update to version r119 Use github instead of svn LICENSE md5sum changed since it was updated in r117 for a copyright date change Fixes CVE-2014-4611 Signed-off-by: Armin Kuster akus...@mvista.com --- meta/recipes-support/lz4/{lz4_svn.bb = lz4_git.bb} | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) rename meta/recipes-support/lz4/{lz4_svn.bb = lz4_git.bb} (69%) diff --git a/meta/recipes-support/lz4/lz4_svn.bb b/meta/recipes-support/lz4/lz4_git.bb similarity index 69% rename from meta/recipes-support/lz4/lz4_svn.bb rename to meta/recipes-support/lz4/lz4_git.bb index 38e36d8..8285302 100644 --- a/meta/recipes-support/lz4/lz4_svn.bb +++ b/meta/recipes-support/lz4/lz4_git.bb @@ -2,15 +2,14 @@ SUMMARY = Extremely Fast Compression algorithm DESCRIPTION = LZ4 is a very fast lossless compression algorithm, providing compression speed at 400 MB/s per core, scalable with multi-cores CPU. It also features an extremely fast decoder, with speed in multiple GB/s per core, typically reaching RAM speed limits on multi-core systems. LICENSE = BSD -LIC_FILES_CHKSUM = file://LICENSE;md5=2008d2325e11691e17fcaa3a6046f850 +LIC_FILES_CHKSUM = file://LICENSE;md5=0b0d063f37a4477b54af2459477dcafd -# Upstream names releases after SVN revs -SRCREV = 112 -PV = r${SRCREV} +PV = r119 -SRC_URI = svn://lz4.googlecode.com/svn/;module=trunk;protocol=http +SRCREV = 28fd251bc7b42e5cde15f9a2d78fc53b3b575558 +SRC_URI= git://github.com/Cyan4973/lz4.git;branch=master -S = ${WORKDIR}/trunk +S = ${WORKDIR}/git EXTRA_OEMAKE = PREFIX=${prefix} CC='${CC}' DESTDIR=${D} LIBDIR=${libdir} INCLUDEDIR=${includedir} -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [meta-oe][PATCH] [v4] lz4: update to latest
update to version r119 LICENSE md5sum changed since it was updated in r117 for copyright date change Fixes CVE-2014-4611 Signed-off-by: Armin Kuster akus...@mvista.com --- meta/recipes-support/lz4/lz4_svn.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/lz4/lz4_svn.bb b/meta/recipes-support/lz4/lz4_svn.bb index 38e36d8..44160f4 100644 --- a/meta/recipes-support/lz4/lz4_svn.bb +++ b/meta/recipes-support/lz4/lz4_svn.bb @@ -2,10 +2,10 @@ SUMMARY = Extremely Fast Compression algorithm DESCRIPTION = LZ4 is a very fast lossless compression algorithm, providing compression speed at 400 MB/s per core, scalable with multi-cores CPU. It also features an extremely fast decoder, with speed in multiple GB/s per core, typically reaching RAM speed limits on multi-core systems. LICENSE = BSD -LIC_FILES_CHKSUM = file://LICENSE;md5=2008d2325e11691e17fcaa3a6046f850 +LIC_FILES_CHKSUM = file://LICENSE;md5=0b0d063f37a4477b54af2459477dcafd # Upstream names releases after SVN revs -SRCREV = 112 +SRCREV = 119 PV = r${SRCREV} SRC_URI = svn://lz4.googlecode.com/svn/;module=trunk;protocol=http -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCH] lz4: update to 120
Update package to version 120 Add Makefile to LIC_FILES_CHKSUM check as it changes with every rev. Signed-off-by: Armin Kuster akus...@mvista.com --- meta/recipes-support/lz4/lz4_svn.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/lz4/lz4_svn.bb b/meta/recipes-support/lz4/lz4_svn.bb index 44160f4..adbe098 100644 --- a/meta/recipes-support/lz4/lz4_svn.bb +++ b/meta/recipes-support/lz4/lz4_svn.bb @@ -2,10 +2,11 @@ SUMMARY = Extremely Fast Compression algorithm DESCRIPTION = LZ4 is a very fast lossless compression algorithm, providing compression speed at 400 MB/s per core, scalable with multi-cores CPU. It also features an extremely fast decoder, with speed in multiple GB/s per core, typically reaching RAM speed limits on multi-core systems. LICENSE = BSD -LIC_FILES_CHKSUM = file://LICENSE;md5=0b0d063f37a4477b54af2459477dcafd +LIC_FILES_CHKSUM = file://LICENSE;md5=0b0d063f37a4477b54af2459477dcafd \ +file://Makefile;md5=ca9db31c873dc45240e2792a866ab0b5 # Upstream names releases after SVN revs -SRCREV = 119 +SRCREV = 120 PV = r${SRCREV} SRC_URI = svn://lz4.googlecode.com/svn/;module=trunk;protocol=http -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] 2/2] tzdata: update to 2014f
md5sum on asia file changed do to severel tzone updates Signed-off-by: Armin Kuster akus...@mvista.com --- meta/recipes-extended/tzdata/tzdata.inc | 2 +- meta/recipes-extended/tzdata/tzdata_2014e.bb | 6 -- meta/recipes-extended/tzdata/tzdata_2014f.bb | 6 ++ 3 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 meta/recipes-extended/tzdata/tzdata_2014e.bb create mode 100644 meta/recipes-extended/tzdata/tzdata_2014f.bb diff --git a/meta/recipes-extended/tzdata/tzdata.inc b/meta/recipes-extended/tzdata/tzdata.inc index 06a6bea..f13a4fe 100644 --- a/meta/recipes-extended/tzdata/tzdata.inc +++ b/meta/recipes-extended/tzdata/tzdata.inc @@ -2,7 +2,7 @@ DESCRIPTION = Timezone data HOMEPAGE = ftp://elsie.nci.nih.gov/pub/; SECTION = base LICENSE = PD BSD -LIC_FILES_CHKSUM = file://asia;beginline=2;endline=3;md5=06468c0e84ef4d4c97045a4a29b08234 +LIC_FILES_CHKSUM = file://asia;beginline=2;endline=3;md5=996a9811747aa48db91ed239e5b355a1 DEPENDS = tzcode-native inherit allarch diff --git a/meta/recipes-extended/tzdata/tzdata_2014e.bb b/meta/recipes-extended/tzdata/tzdata_2014e.bb deleted file mode 100644 index b53d323..000 --- a/meta/recipes-extended/tzdata/tzdata_2014e.bb +++ /dev/null @@ -1,6 +0,0 @@ -SRC_URI = ftp://ftp.iana.org/tz/releases/tzdata${PV}.tar.gz;name=tzdata; - -SRC_URI[tzdata.md5sum] = 8a49fdedd4e832da8e85f7f9bcaedc33 -SRC_URI[tzdata.sha256sum] = 08e243a79051f838d86ac1311a78b74047951302d448024e823b5b7aa71f86c5 - -require tzdata.inc diff --git a/meta/recipes-extended/tzdata/tzdata_2014f.bb b/meta/recipes-extended/tzdata/tzdata_2014f.bb new file mode 100644 index 000..caad383 --- /dev/null +++ b/meta/recipes-extended/tzdata/tzdata_2014f.bb @@ -0,0 +1,6 @@ +SRC_URI = ftp://ftp.iana.org/tz/releases/tzdata${PV}.tar.gz;name=tzdata; + +SRC_URI[tzdata.md5sum] = f333b2e8f876221a97871cae0c188aa5 +SRC_URI[tzdata.sha256sum] = eed690a72124f380bcb14947d398a7a482acb9ab792ae78bd4554e52c5ca2001 + +require tzdata.inc -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] 0/2] Update tzcode and data to 2014f
http://mm.icann.org/pipermail/tz-announce/2014-August/23.html Armin Kuster (2): tzcode: update to 2014f tzdata: update to 2014f meta/recipes-extended/tzcode/tzcode-native_2014e.bb | 11 --- meta/recipes-extended/tzcode/tzcode-native_2014f.bb | 11 +++ meta/recipes-extended/tzdata/tzdata.inc | 2 +- meta/recipes-extended/tzdata/tzdata_2014e.bb| 6 -- meta/recipes-extended/tzdata/tzdata_2014f.bb| 6 ++ 5 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 meta/recipes-extended/tzcode/tzcode-native_2014e.bb create mode 100644 meta/recipes-extended/tzcode/tzcode-native_2014f.bb delete mode 100644 meta/recipes-extended/tzdata/tzdata_2014e.bb create mode 100644 meta/recipes-extended/tzdata/tzdata_2014f.bb -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] 1/2] tzcode: update to 2014f
Signed-off-by: Armin Kuster akus...@mvista.com --- meta/recipes-extended/tzcode/tzcode-native_2014e.bb | 11 --- meta/recipes-extended/tzcode/tzcode-native_2014f.bb | 11 +++ 2 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 meta/recipes-extended/tzcode/tzcode-native_2014e.bb create mode 100644 meta/recipes-extended/tzcode/tzcode-native_2014f.bb diff --git a/meta/recipes-extended/tzcode/tzcode-native_2014e.bb b/meta/recipes-extended/tzcode/tzcode-native_2014e.bb deleted file mode 100644 index 405ed60..000 --- a/meta/recipes-extended/tzcode/tzcode-native_2014e.bb +++ /dev/null @@ -1,11 +0,0 @@ -# note that we allow for us to use data later than our code version -# -SRC_URI = ftp://ftp.iana.org/tz/releases/tzcode${PV}.tar.gz;name=tzcode \ - ftp://ftp.iana.org/tz/releases/tzdata2014e.tar.gz;name=tzdata; - -SRC_URI[tzcode.md5sum] = 552251600ee3571c244d33c7196ec2ed -SRC_URI[tzcode.sha256sum] = 43ebc426ab4911e222a4487f24289adfd2bc5eb09363a5e77cdabf56374a8c1c -SRC_URI[tzdata.md5sum] = 8a49fdedd4e832da8e85f7f9bcaedc33 -SRC_URI[tzdata.sha256sum] = 08e243a79051f838d86ac1311a78b74047951302d448024e823b5b7aa71f86c5 - -require tzcode-native.inc diff --git a/meta/recipes-extended/tzcode/tzcode-native_2014f.bb b/meta/recipes-extended/tzcode/tzcode-native_2014f.bb new file mode 100644 index 000..d9557ea --- /dev/null +++ b/meta/recipes-extended/tzcode/tzcode-native_2014f.bb @@ -0,0 +1,11 @@ +# note that we allow for us to use data later than our code version +# +SRC_URI = ftp://ftp.iana.org/tz/releases/tzcode${PV}.tar.gz;name=tzcode \ + ftp://ftp.iana.org/tz/releases/tzdata2014f.tar.gz;name=tzdata; + +SRC_URI[tzcode.md5sum] = 1e15be52900cd49e93f093d4731fec96 +SRC_URI[tzcode.sha256sum] = 8c12b56abf614722f0ab7cfc502492063b2c7c5de19563540132b81709ac2555 +SRC_URI[tzdata.md5sum] = f333b2e8f876221a97871cae0c188aa5 +SRC_URI[tzdata.sha256sum] = eed690a72124f380bcb14947d398a7a482acb9ab792ae78bd4554e52c5ca2001 + +require tzcode-native.inc -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] nettle: update nettle to version 3.0
With this update, LGPLv3 was added to many files. Each supported algorithms govern which license they want. Many are stated as ether v2 or v3 or both in parallel. Update license to be v2 or LGPLv3. The previous verion had one GPLv3 file so the licesne was incorrect. Signed-off-by: Armin Kuster akuster...@gmail.com --- .../nettle/{nettle_2.7.1.bb = nettle_3.0.bb} | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) rename meta/recipes-support/nettle/{nettle_2.7.1.bb = nettle_3.0.bb} (53%) diff --git a/meta/recipes-support/nettle/nettle_2.7.1.bb b/meta/recipes-support/nettle/nettle_3.0.bb similarity index 53% rename from meta/recipes-support/nettle/nettle_2.7.1.bb rename to meta/recipes-support/nettle/nettle_3.0.bb index f53afcc..0dc9bb6 100644 --- a/meta/recipes-support/nettle/nettle_2.7.1.bb +++ b/meta/recipes-support/nettle/nettle_3.0.bb @@ -1,17 +1,18 @@ SUMMARY = A low level cryptographic library HOMEPAGE = http://www.lysator.liu.se/~nisse/nettle/; SECTION = libs -LICENSE = LGPLv2.1 GPLv2 -LIC_FILES_CHKSUM = file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://serpent-decrypt.c;beginline=53;endline=67;md5=bcfd4745d53ca57f82907089898e390d \ - file://serpent-set-key.c;beginline=56;endline=70;md5=bcfd4745d53ca57f82907089898e390d - +LICENSE = LGPLv2.1 GPLv2 | LGPLv3 +LIC_FILES_CHKSUM = file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263\ + file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6\ +file://COPYINGv3;md5=11cc2d3ee574f9d6b7ee797bdce4d423\ + file://serpent-decrypt.c;beginline=53;endline=67;md5=a4ccbeb343203d3586661f45c1cab577 \ + file://serpent-set-key.c;beginline=56;endline=70;md5=150b0ea44cdfb712a83331bff566e9a8 DEPENDS += gmp SRC_URI = http://www.lysator.liu.se/~nisse/archive/${BP}.tar.gz; -SRC_URI[md5sum] = 003d5147911317931dd453520eb234a5 -SRC_URI[sha256sum] = bc71ebd43435537d767799e414fce88e521b7278d48c860651216e1fc6555b40 +SRC_URI[md5sum] = f64b1bf1e774b7ae6e507318e340250e +SRC_URI[sha256sum] = 9651c0bd2326eb737d0ed9eb403444712407c01a25b0fe813432ef31bebcd913 EXTRA_OECONF = --disable-openssl -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3] nettle: update nettle to version 3.0
With this update, LGPLv3 or GPLv3 where added to many files. Each supported algorithms govern which license they want. Many are stated as ether v2 or v3 or both in parallel. Update license to be v2 or LGPLv3 or GPLv3. The previous verion had one GPLv3 file so the license was incorrect. Signed-off-by: Armin Kuster akuster...@gmail.com --- .../nettle/{nettle_2.7.1.bb = nettle_3.0.bb} | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) rename meta/recipes-support/nettle/{nettle_2.7.1.bb = nettle_3.0.bb} (53%) diff --git a/meta/recipes-support/nettle/nettle_2.7.1.bb b/meta/recipes-support/nettle/nettle_3.0.bb similarity index 53% rename from meta/recipes-support/nettle/nettle_2.7.1.bb rename to meta/recipes-support/nettle/nettle_3.0.bb index f53afcc..a54317f 100644 --- a/meta/recipes-support/nettle/nettle_2.7.1.bb +++ b/meta/recipes-support/nettle/nettle_3.0.bb @@ -1,17 +1,18 @@ SUMMARY = A low level cryptographic library HOMEPAGE = http://www.lysator.liu.se/~nisse/nettle/; SECTION = libs -LICENSE = LGPLv2.1 GPLv2 -LIC_FILES_CHKSUM = file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://serpent-decrypt.c;beginline=53;endline=67;md5=bcfd4745d53ca57f82907089898e390d \ - file://serpent-set-key.c;beginline=56;endline=70;md5=bcfd4745d53ca57f82907089898e390d - +LICENSE = LGPLv2.1 GPLv2 | LGPLv3 | GPLv3 +LIC_FILES_CHKSUM = file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263\ + file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6\ +file://COPYINGv3;md5=11cc2d3ee574f9d6b7ee797bdce4d423\ + file://serpent-decrypt.c;beginline=53;endline=67;md5=a4ccbeb343203d3586661f45c1cab577 \ + file://serpent-set-key.c;beginline=56;endline=70;md5=150b0ea44cdfb712a83331bff566e9a8 DEPENDS += gmp SRC_URI = http://www.lysator.liu.se/~nisse/archive/${BP}.tar.gz; -SRC_URI[md5sum] = 003d5147911317931dd453520eb234a5 -SRC_URI[sha256sum] = bc71ebd43435537d767799e414fce88e521b7278d48c860651216e1fc6555b40 +SRC_URI[md5sum] = f64b1bf1e774b7ae6e507318e340250e +SRC_URI[sha256sum] = 9651c0bd2326eb737d0ed9eb403444712407c01a25b0fe813432ef31bebcd913 EXTRA_OECONF = --disable-openssl -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [[PATCH] python: add webbrowser module
webbrowser is being compiled but not included in packaging. Add webbrowser to python-netclient Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/recipes-devtools/python/python-2.7-manifest.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python-2.7-manifest.inc b/meta/recipes-devtools/python/python-2.7-manifest.inc index a8afe13..b477f3f 100644 --- a/meta/recipes-devtools/python/python-2.7-manifest.inc +++ b/meta/recipes-devtools/python/python-2.7-manifest.inc @@ -159,7 +159,7 @@ FILES_${PN}-multiprocessing=${libdir}/python2.7/lib-dynload/_multiprocessing.so SUMMARY_${PN}-netclient=Python Internet Protocol clients RDEPENDS_${PN}-netclient=${PN}-core ${PN}-crypt ${PN}-datetime ${PN}-io ${PN}-lang ${PN}-logging ${PN}-mime -FILES_${PN}-netclient=${libdir}/python2.7/*Cookie*.* ${libdir}/python2.7/base64.* ${libdir}/python2.7/cookielib.* ${libdir}/python2.7/ftplib.* ${libdir}/python2.7/gopherlib.* ${libdir}/python2.7/hmac.* ${libdir}/python2.7/httplib.* ${libdir}/python2.7/mimetypes.* ${libdir}/python2.7/nntplib.* ${libdir}/python2.7/poplib.* ${libdir}/python2.7/smtplib.* ${libdir}/python2.7/telnetlib.* ${libdir}/python2.7/urllib.* ${libdir}/python2.7/urllib2.* ${libdir}/python2.7/urlparse.* ${libdir}/python2.7/uuid.* ${libdir}/python2.7/rfc822.* ${libdir}/python2.7/mimetools.* +FILES_${PN}-netclient=${libdir}/python2.7/*Cookie*.* ${libdir}/python2.7/base64.* ${libdir}/python2.7/cookielib.* ${libdir}/python2.7/ftplib.* ${libdir}/python2.7/gopherlib.* ${libdir}/python2.7/hmac.* ${libdir}/python2.7/httplib.* ${libdir}/python2.7/mimetypes.* ${libdir}/python2.7/nntplib.* ${libdir}/python2.7/poplib.* ${libdir}/python2.7/smtplib.* ${libdir}/python2.7/telnetlib.* ${libdir}/python2.7/urllib.* ${libdir}/python2.7/urllib2.* ${libdir}/python2.7/urlparse.* ${libdir}/python2.7/uuid.* ${libdir}/python2.7/rfc822.* ${libdir}/python2.7/mimetools.* ${libdir}/python2.7/webbrowser.* SUMMARY_${PN}-netserver=Python Internet Protocol servers RDEPENDS_${PN}-netserver=${PN}-core ${PN}-netclient -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH]] gpm: ppc64 build issue
tmp-gcd_1.s: Assembler messages: | tmp-gcd_1.s:94: Error: unsupported relocation against BMOD_1_TO_MOD_1_THRESHOLD | make[2]: *** [gcd_1.lo] Error 1 Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/recipes-support/gmp/gmp/gpm-6.0.0-ppc64.patch | 25 ++ meta/recipes-support/gmp/gmp_6.0.0.bb | 1 + 2 files changed, 26 insertions(+) create mode 100644 meta/recipes-support/gmp/gmp/gpm-6.0.0-ppc64.patch diff --git a/meta/recipes-support/gmp/gmp/gpm-6.0.0-ppc64.patch b/meta/recipes-support/gmp/gmp/gpm-6.0.0-ppc64.patch new file mode 100644 index 000..19bb4fa --- /dev/null +++ b/meta/recipes-support/gmp/gmp/gpm-6.0.0-ppc64.patch @@ -0,0 +1,25 @@ + +Signed-off-by: Armin Kuster akuster...@gmail.com + +This patch with pulled from gmp. +https://gmplib.org/repo/gmp/rev/4a6d258b467f + +# HG changeset patch +# User Torbjorn Granlund t...@gmplib.org +# Date 1395835068 -3600 +# Node ID 4a6d258b467f661da0894cc60ecd060f2e3c67c7 +# Parent 301ce2788826a2d4d2725bd5cf01e998638db37a +Provide default for BMOD_1_TO_MOD_1_THRESHOLD. + +diff -r 301ce2788826 -r 4a6d258b467f mpn/powerpc64/mode64/gcd_1.asm +--- a/mpn/powerpc64/mode64/gcd_1.asmTue Mar 25 15:34:52 2014 +0100 b/mpn/powerpc64/mode64/gcd_1.asmWed Mar 26 12:57:48 2014 +0100 +@@ -43,6 +43,9 @@ + define(`n', `r4') + define(`v0',`r5') + ++ifdef(`BMOD_1_TO_MOD_1_THRESHOLD',, ++ `define(`BMOD_1_TO_MOD_1_THRESHOLD',30)') ++ + EXTERN_FUNC(mpn_mod_1) + EXTERN_FUNC(mpn_modexact_1c_odd) diff --git a/meta/recipes-support/gmp/gmp_6.0.0.bb b/meta/recipes-support/gmp/gmp_6.0.0.bb index 19e5f4d..cd515e8 100644 --- a/meta/recipes-support/gmp/gmp_6.0.0.bb +++ b/meta/recipes-support/gmp/gmp_6.0.0.bb @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ SRC_URI_append = file://use-includedir.patch \ file://append_user_provided_flags.patch \ + file://gpm-6.0.0-ppc64.patch \ SRC_URI[md5sum] = b7ff2d88cae7f8085bd5006096eed470 -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH]] gpm PPC64 build issue
While playing with adding qemuppc64, I found a build issue gpm. Armin Kuster (1): gpm: ppc64 build issue meta/recipes-support/gmp/gmp/gpm-6.0.0-ppc64.patch | 25 ++ meta/recipes-support/gmp/gmp_6.0.0.bb | 1 + 2 files changed, 26 insertions(+) create mode 100644 meta/recipes-support/gmp/gmp/gpm-6.0.0-ppc64.patch -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] gmp: ppc64 build issue
tmp-gcd_1.s: Assembler messages: | tmp-gcd_1.s:94: Error: unsupported relocation against BMOD_1_TO_MOD_1_THRESHOLD | make[2]: *** [gcd_1.lo] Error 1 V2: fixed PN name Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/recipes-support/gmp/gmp/gmp-6.0.0-ppc64.patch | 25 ++ meta/recipes-support/gmp/gmp_6.0.0.bb | 1 + 2 files changed, 26 insertions(+) create mode 100644 meta/recipes-support/gmp/gmp/gmp-6.0.0-ppc64.patch diff --git a/meta/recipes-support/gmp/gmp/gmp-6.0.0-ppc64.patch b/meta/recipes-support/gmp/gmp/gmp-6.0.0-ppc64.patch new file mode 100644 index 000..19bb4fa --- /dev/null +++ b/meta/recipes-support/gmp/gmp/gmp-6.0.0-ppc64.patch @@ -0,0 +1,25 @@ + +Signed-off-by: Armin Kuster akuster...@gmail.com + +This patch with pulled from gmp. +https://gmplib.org/repo/gmp/rev/4a6d258b467f + +# HG changeset patch +# User Torbjorn Granlund t...@gmplib.org +# Date 1395835068 -3600 +# Node ID 4a6d258b467f661da0894cc60ecd060f2e3c67c7 +# Parent 301ce2788826a2d4d2725bd5cf01e998638db37a +Provide default for BMOD_1_TO_MOD_1_THRESHOLD. + +diff -r 301ce2788826 -r 4a6d258b467f mpn/powerpc64/mode64/gcd_1.asm +--- a/mpn/powerpc64/mode64/gcd_1.asmTue Mar 25 15:34:52 2014 +0100 b/mpn/powerpc64/mode64/gcd_1.asmWed Mar 26 12:57:48 2014 +0100 +@@ -43,6 +43,9 @@ + define(`n', `r4') + define(`v0',`r5') + ++ifdef(`BMOD_1_TO_MOD_1_THRESHOLD',, ++ `define(`BMOD_1_TO_MOD_1_THRESHOLD',30)') ++ + EXTERN_FUNC(mpn_mod_1) + EXTERN_FUNC(mpn_modexact_1c_odd) diff --git a/meta/recipes-support/gmp/gmp_6.0.0.bb b/meta/recipes-support/gmp/gmp_6.0.0.bb index 19e5f4d..6218491 100644 --- a/meta/recipes-support/gmp/gmp_6.0.0.bb +++ b/meta/recipes-support/gmp/gmp_6.0.0.bb @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ SRC_URI_append = file://use-includedir.patch \ file://append_user_provided_flags.patch \ + file://gmp-6.0.0-ppc64.patch \ SRC_URI[md5sum] = b7ff2d88cae7f8085bd5006096eed470 -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] Add new tune files for IBM POWER5,6,7
I believe these are new tune files. They add support for IBM's POWER[5,6,7] cpus. Minimally tested on qemuppc64. This is the first set of patches to add qemuppc64 support. Let me know if there are any issues with the format of these tune files. Armin Kuster (3): IBM Power5: Add new tune file for PPC power5 cpu IBM power6: Add new tune file for PPC power6 IBM power7: Add new tune file for PPC power7 meta/conf/machine/include/tune-ppcpower5.inc | 21 + meta/conf/machine/include/tune-ppcpower6.inc | 21 + meta/conf/machine/include/tune-ppcpower7.inc | 21 + 3 files changed, 63 insertions(+) create mode 100644 meta/conf/machine/include/tune-ppcpower5.inc create mode 100644 meta/conf/machine/include/tune-ppcpower6.inc create mode 100644 meta/conf/machine/include/tune-ppcpower7.inc -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] IBM Power5: Add new tune file for PPC power5 cpu
Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/conf/machine/include/tune-ppcpower5.inc | 21 + 1 file changed, 21 insertions(+) create mode 100644 meta/conf/machine/include/tune-ppcpower5.inc diff --git a/meta/conf/machine/include/tune-ppcpower5.inc b/meta/conf/machine/include/tune-ppcpower5.inc new file mode 100644 index 000..30be869 --- /dev/null +++ b/meta/conf/machine/include/tune-ppcpower5.inc @@ -0,0 +1,21 @@ +DEFAULTTUNE ?= ppc64p5 + +require conf/machine/include/powerpc/arch-powerpc64.inc + +TUNEVALID[power5] = Enable IBM Power5 specific processor optimizations +TUNE_CCARGS .= ${@bb.utils.contains(TUNE_FEATURES, power5, -mcpu=power5, , d)} + +AVAILTUNES += ppcp5 ppc64p5 +TUNE_FEATURES_tune-ppcp5 = m32 fpu-hard power5 altivec +BASE_LIB_tune-ppcp5 = lib +TUNE_PKGARCH_tune-ppcp5 = ppcp5 +PACKAGE_EXTRA_ARCHS_tune-ppcp5 = ${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppcp5 + +TUNE_FEATURES_tune-ppc64p5 = m64 fpu-hard power5 altivec +BASE_LIB_tune-ppc64p5 = lib64 +TUNE_PKGARCH_tune-ppc64p5 = ppc64p5 +PACKAGE_EXTRA_ARCHS_tune-ppc64p5 = ${PACKAGE_EXTRA_ARCHS_tune-powerpc64} ppc64p5 + +# glibc configure options to get power5 specific library +GLIBC_EXTRA_OECONF_powerpc64 += ${@bb.utils.contains(TUNE_FEATURES, power5, --with-cpu=power5, , d)} +GLIBC_EXTRA_OECONF_powerpc += ${@bb.utils.contains(TUNE_FEATURES, power5, --with-cpu=power5, , d)} -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] IBM power6: Add new tune file for PPC power6
Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/conf/machine/include/tune-ppcpower6.inc | 21 + 1 file changed, 21 insertions(+) create mode 100644 meta/conf/machine/include/tune-ppcpower6.inc diff --git a/meta/conf/machine/include/tune-ppcpower6.inc b/meta/conf/machine/include/tune-ppcpower6.inc new file mode 100644 index 000..7563798 --- /dev/null +++ b/meta/conf/machine/include/tune-ppcpower6.inc @@ -0,0 +1,21 @@ +DEFAULTTUNE ?= ppcpr6 + +require conf/machine/include/powerpc/arch-powerpc64.inc + +TUNEVALID[power6] = Enable IBM Power6 specific processor optimizations +TUNE_CCARGS .= ${@bb.utils.contains(TUNE_FEATURES, power6, -mcpu=power6, , d)} + +AVAILTUNES += ppcp6 ppc64p6 +TUNE_FEATURES_tune-ppcp6 = m32 fpu-hard power6 altivec +BASE_LIB_tune-ppcp6 = lib +TUNE_PKGARCH_tune-ppcp6 = ppcp6 +PACKAGE_EXTRA_ARCHS_tune-ppcp6 = ${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppcp6 + +TUNE_FEATURES_tune-ppc64p6 = m64 fpu-hard power6 altivec +BASE_LIB_tune-ppc64p6 = lib64 +TUNE_PKGARCH_tune-ppc64p6 = ppc64p6 +PACKAGE_EXTRA_ARCHS_tune-ppc64p6 = ${PACKAGE_EXTRA_ARCHS_tune-powerpc64} ppc64p6 + +# glibc configure options to get power6 specific library +GLIBC_EXTRA_OECONF_powerpc64 += ${@bb.utils.contains(TUNE_FEATURES, power6, --with-cpu=power6, , d)} +GLIBC_EXTRA_OECONF_powerpc += ${@bb.utils.contains(TUNE_FEATURES, power6, --with-cpu=power6, , d)} -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] IBM power7: Add new tune file for PPC power7
Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/conf/machine/include/tune-ppcpower7.inc | 21 + 1 file changed, 21 insertions(+) create mode 100644 meta/conf/machine/include/tune-ppcpower7.inc diff --git a/meta/conf/machine/include/tune-ppcpower7.inc b/meta/conf/machine/include/tune-ppcpower7.inc new file mode 100644 index 000..7069e75 --- /dev/null +++ b/meta/conf/machine/include/tune-ppcpower7.inc @@ -0,0 +1,21 @@ +DEFAULTTUNE ?= ppcpr7 + +require conf/machine/include/powerpc/arch-powerpc64.inc + +TUNEVALID[power7] = Enable IBM Power7 specific processor optimizations +TUNE_CCARGS .= ${@bb.utils.contains(TUNE_FEATURES, power7, -mcpu=power7, , d)} + +AVAILTUNES += ppcp7 ppc64p7 +TUNE_FEATURES_tune-ppcp7 = m32 fpu-hard power7 altivec +BASE_LIB_tune-ppcp7 = lib +TUNE_PKGARCH_tune-ppcp7 = ppcp7 +PACKAGE_EXTRA_ARCHS_tune-ppcp7 = ${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppcp7 + +TUNE_FEATURES_tune-ppc64p7 = m64 fpu-hard power7 altivec +BASE_LIB_tune-ppc64p7 = lib64 +TUNE_PKGARCH_tune-ppc64p7 = ppc64p7 +PACKAGE_EXTRA_ARCHS_tune-ppc64p7 = ${PACKAGE_EXTRA_ARCHS_tune-powerpc64} ppc64p7 + +# glibc configure options to get power7 specific library +GLIBC_EXTRA_OECONF_powerpc64 += ${@bb.utils.contains(TUNE_FEATURES, power7, --with-cpu=power7, , d)} +GLIBC_EXTRA_OECONF_powerpc += ${@bb.utils.contains(TUNE_FEATURES, power7, --with-cpu=power7, , d)} -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3 v2] IBM power: new tune files for power5,6,7
Add tune files for IBM's POWER 5,6 and 7 cpus. V2: rename file from ppcpower* to power* after feedback from community. Armin Kuster (3): IBM Power5 v2: Add new tune file for PPC power5 cpu IBM power6 v2: Add new tune file for PPC power6 IBM power7 v2: Add new tune file for PPC power7 meta/conf/machine/include/tune-power5.inc | 21 + meta/conf/machine/include/tune-power6.inc | 21 + meta/conf/machine/include/tune-power7.inc | 21 + 3 files changed, 63 insertions(+) create mode 100644 meta/conf/machine/include/tune-power5.inc create mode 100644 meta/conf/machine/include/tune-power6.inc create mode 100644 meta/conf/machine/include/tune-power7.inc -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] IBM power6 v2: Add new tune file for PPC power6
v2: rename file Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/conf/machine/include/tune-power6.inc | 21 + 1 file changed, 21 insertions(+) create mode 100644 meta/conf/machine/include/tune-power6.inc diff --git a/meta/conf/machine/include/tune-power6.inc b/meta/conf/machine/include/tune-power6.inc new file mode 100644 index 000..7563798 --- /dev/null +++ b/meta/conf/machine/include/tune-power6.inc @@ -0,0 +1,21 @@ +DEFAULTTUNE ?= ppcpr6 + +require conf/machine/include/powerpc/arch-powerpc64.inc + +TUNEVALID[power6] = Enable IBM Power6 specific processor optimizations +TUNE_CCARGS .= ${@bb.utils.contains(TUNE_FEATURES, power6, -mcpu=power6, , d)} + +AVAILTUNES += ppcp6 ppc64p6 +TUNE_FEATURES_tune-ppcp6 = m32 fpu-hard power6 altivec +BASE_LIB_tune-ppcp6 = lib +TUNE_PKGARCH_tune-ppcp6 = ppcp6 +PACKAGE_EXTRA_ARCHS_tune-ppcp6 = ${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppcp6 + +TUNE_FEATURES_tune-ppc64p6 = m64 fpu-hard power6 altivec +BASE_LIB_tune-ppc64p6 = lib64 +TUNE_PKGARCH_tune-ppc64p6 = ppc64p6 +PACKAGE_EXTRA_ARCHS_tune-ppc64p6 = ${PACKAGE_EXTRA_ARCHS_tune-powerpc64} ppc64p6 + +# glibc configure options to get power6 specific library +GLIBC_EXTRA_OECONF_powerpc64 += ${@bb.utils.contains(TUNE_FEATURES, power6, --with-cpu=power6, , d)} +GLIBC_EXTRA_OECONF_powerpc += ${@bb.utils.contains(TUNE_FEATURES, power6, --with-cpu=power6, , d)} -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] IBM Power5 v2: Add new tune file for PPC power5 cpu
V2: rename file Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/conf/machine/include/tune-power5.inc | 21 + 1 file changed, 21 insertions(+) create mode 100644 meta/conf/machine/include/tune-power5.inc diff --git a/meta/conf/machine/include/tune-power5.inc b/meta/conf/machine/include/tune-power5.inc new file mode 100644 index 000..30be869 --- /dev/null +++ b/meta/conf/machine/include/tune-power5.inc @@ -0,0 +1,21 @@ +DEFAULTTUNE ?= ppc64p5 + +require conf/machine/include/powerpc/arch-powerpc64.inc + +TUNEVALID[power5] = Enable IBM Power5 specific processor optimizations +TUNE_CCARGS .= ${@bb.utils.contains(TUNE_FEATURES, power5, -mcpu=power5, , d)} + +AVAILTUNES += ppcp5 ppc64p5 +TUNE_FEATURES_tune-ppcp5 = m32 fpu-hard power5 altivec +BASE_LIB_tune-ppcp5 = lib +TUNE_PKGARCH_tune-ppcp5 = ppcp5 +PACKAGE_EXTRA_ARCHS_tune-ppcp5 = ${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppcp5 + +TUNE_FEATURES_tune-ppc64p5 = m64 fpu-hard power5 altivec +BASE_LIB_tune-ppc64p5 = lib64 +TUNE_PKGARCH_tune-ppc64p5 = ppc64p5 +PACKAGE_EXTRA_ARCHS_tune-ppc64p5 = ${PACKAGE_EXTRA_ARCHS_tune-powerpc64} ppc64p5 + +# glibc configure options to get power5 specific library +GLIBC_EXTRA_OECONF_powerpc64 += ${@bb.utils.contains(TUNE_FEATURES, power5, --with-cpu=power5, , d)} +GLIBC_EXTRA_OECONF_powerpc += ${@bb.utils.contains(TUNE_FEATURES, power5, --with-cpu=power5, , d)} -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] IBM power7 v2: Add new tune file for PPC power7
v2: rename file Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/conf/machine/include/tune-power7.inc | 21 + 1 file changed, 21 insertions(+) create mode 100644 meta/conf/machine/include/tune-power7.inc diff --git a/meta/conf/machine/include/tune-power7.inc b/meta/conf/machine/include/tune-power7.inc new file mode 100644 index 000..7069e75 --- /dev/null +++ b/meta/conf/machine/include/tune-power7.inc @@ -0,0 +1,21 @@ +DEFAULTTUNE ?= ppcpr7 + +require conf/machine/include/powerpc/arch-powerpc64.inc + +TUNEVALID[power7] = Enable IBM Power7 specific processor optimizations +TUNE_CCARGS .= ${@bb.utils.contains(TUNE_FEATURES, power7, -mcpu=power7, , d)} + +AVAILTUNES += ppcp7 ppc64p7 +TUNE_FEATURES_tune-ppcp7 = m32 fpu-hard power7 altivec +BASE_LIB_tune-ppcp7 = lib +TUNE_PKGARCH_tune-ppcp7 = ppcp7 +PACKAGE_EXTRA_ARCHS_tune-ppcp7 = ${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppcp7 + +TUNE_FEATURES_tune-ppc64p7 = m64 fpu-hard power7 altivec +BASE_LIB_tune-ppc64p7 = lib64 +TUNE_PKGARCH_tune-ppc64p7 = ppc64p7 +PACKAGE_EXTRA_ARCHS_tune-ppc64p7 = ${PACKAGE_EXTRA_ARCHS_tune-powerpc64} ppc64p7 + +# glibc configure options to get power7 specific library +GLIBC_EXTRA_OECONF_powerpc64 += ${@bb.utils.contains(TUNE_FEATURES, power7, --with-cpu=power7, , d)} +GLIBC_EXTRA_OECONF_powerpc += ${@bb.utils.contains(TUNE_FEATURES, power7, --with-cpu=power7, , d)} -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] tzdata: update to 2014g
For a full description of the changes see: http://mm.icann.org/pipermail/tz-announce/2014-August/24.html Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/recipes-extended/tzdata/tzdata_2014f.bb | 6 -- meta/recipes-extended/tzdata/tzdata_2014g.bb | 6 ++ 2 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 meta/recipes-extended/tzdata/tzdata_2014f.bb create mode 100644 meta/recipes-extended/tzdata/tzdata_2014g.bb diff --git a/meta/recipes-extended/tzdata/tzdata_2014f.bb b/meta/recipes-extended/tzdata/tzdata_2014f.bb deleted file mode 100644 index caad383..000 --- a/meta/recipes-extended/tzdata/tzdata_2014f.bb +++ /dev/null @@ -1,6 +0,0 @@ -SRC_URI = ftp://ftp.iana.org/tz/releases/tzdata${PV}.tar.gz;name=tzdata; - -SRC_URI[tzdata.md5sum] = f333b2e8f876221a97871cae0c188aa5 -SRC_URI[tzdata.sha256sum] = eed690a72124f380bcb14947d398a7a482acb9ab792ae78bd4554e52c5ca2001 - -require tzdata.inc diff --git a/meta/recipes-extended/tzdata/tzdata_2014g.bb b/meta/recipes-extended/tzdata/tzdata_2014g.bb new file mode 100644 index 000..e831833 --- /dev/null +++ b/meta/recipes-extended/tzdata/tzdata_2014g.bb @@ -0,0 +1,6 @@ +SRC_URI = ftp://ftp.iana.org/tz/releases/tzdata${PV}.tar.gz;name=tzdata; + +SRC_URI[tzdata.md5sum] = f9f59425e55b21d2e52bb3a95fc17b8d +SRC_URI[tzdata.sha256sum] = 5547d5b7a982f7f53fffe68cb2a13692553f591a17d58c8ef15b20679d82a270 + +require tzdata.inc -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] tzcode: update to 2014g
The readme md5sum changed do you wording changes. Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/recipes-extended/tzcode/tzcode-native.inc | 2 +- meta/recipes-extended/tzcode/tzcode-native_2014f.bb | 11 --- meta/recipes-extended/tzcode/tzcode-native_2014g.bb | 11 +++ 3 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 meta/recipes-extended/tzcode/tzcode-native_2014f.bb create mode 100644 meta/recipes-extended/tzcode/tzcode-native_2014g.bb diff --git a/meta/recipes-extended/tzcode/tzcode-native.inc b/meta/recipes-extended/tzcode/tzcode-native.inc index f034333..4af1e20 100644 --- a/meta/recipes-extended/tzcode/tzcode-native.inc +++ b/meta/recipes-extended/tzcode/tzcode-native.inc @@ -1,7 +1,7 @@ DESCRIPTION = tzcode, timezone zoneinfo utils -- zic, zdump, tzselect LICENSE = PD BSD -LIC_FILES_CHKSUM = file://${WORKDIR}/README;md5=0b7570113550eb5d30aa4bd220964b8f +LIC_FILES_CHKSUM = file://${WORKDIR}/README;md5=d0ff93a73dd5bc3c6e724bb4343760f6 S = ${WORKDIR} diff --git a/meta/recipes-extended/tzcode/tzcode-native_2014f.bb b/meta/recipes-extended/tzcode/tzcode-native_2014f.bb deleted file mode 100644 index d9557ea..000 --- a/meta/recipes-extended/tzcode/tzcode-native_2014f.bb +++ /dev/null @@ -1,11 +0,0 @@ -# note that we allow for us to use data later than our code version -# -SRC_URI = ftp://ftp.iana.org/tz/releases/tzcode${PV}.tar.gz;name=tzcode \ - ftp://ftp.iana.org/tz/releases/tzdata2014f.tar.gz;name=tzdata; - -SRC_URI[tzcode.md5sum] = 1e15be52900cd49e93f093d4731fec96 -SRC_URI[tzcode.sha256sum] = 8c12b56abf614722f0ab7cfc502492063b2c7c5de19563540132b81709ac2555 -SRC_URI[tzdata.md5sum] = f333b2e8f876221a97871cae0c188aa5 -SRC_URI[tzdata.sha256sum] = eed690a72124f380bcb14947d398a7a482acb9ab792ae78bd4554e52c5ca2001 - -require tzcode-native.inc diff --git a/meta/recipes-extended/tzcode/tzcode-native_2014g.bb b/meta/recipes-extended/tzcode/tzcode-native_2014g.bb new file mode 100644 index 000..55e591a --- /dev/null +++ b/meta/recipes-extended/tzcode/tzcode-native_2014g.bb @@ -0,0 +1,11 @@ +# note that we allow for us to use data later than our code version +# +SRC_URI = ftp://ftp.iana.org/tz/releases/tzcode${PV}.tar.gz;name=tzcode \ + ftp://ftp.iana.org/tz/releases/tzdata2014g.tar.gz;name=tzdata; + +SRC_URI[tzcode.md5sum] = f154679d48b724fe191efc19b55abd24 +SRC_URI[tzcode.sha256sum] = df555fa4ad57cc7394812941d6d037b8c7ecea55e9916eaf4cd2adcb3403af7a +SRC_URI[tzdata.md5sum] = f9f59425e55b21d2e52bb3a95fc17b8d +SRC_URI[tzdata.sha256sum] = 5547d5b7a982f7f53fffe68cb2a13692553f591a17d58c8ef15b20679d82a270 + +require tzcode-native.inc -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] lz4: update to version 122
Makefile md5sum changed its is where they bump the version. r122 fixes: Fix : AIX AIX64 support (SamG) Fix : mips 64-bits support (lew van) Added : Examples directory, using code examples from Takayuki Matsuoka Updated : Framing specification, to v1.4.1 Updated : xxHash, to r36 r121 fixes: Fix : make install for OS-X and BSD, thanks to Takayuki Matsuoka Added : make install for kFreeBSD and Hurd (Nobuhiro Iwamatsu) Fix : LZ4 HC streaming bug Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/recipes-support/lz4/lz4_svn.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/lz4/lz4_svn.bb b/meta/recipes-support/lz4/lz4_svn.bb index adbe098..bbd5d93 100644 --- a/meta/recipes-support/lz4/lz4_svn.bb +++ b/meta/recipes-support/lz4/lz4_svn.bb @@ -3,10 +3,10 @@ DESCRIPTION = LZ4 is a very fast lossless compression algorithm, providing comp LICENSE = BSD LIC_FILES_CHKSUM = file://LICENSE;md5=0b0d063f37a4477b54af2459477dcafd \ -file://Makefile;md5=ca9db31c873dc45240e2792a866ab0b5 +file://Makefile;md5=68938168b5cee826476a13e1b8d1f480 # Upstream names releases after SVN revs -SRCREV = 120 +SRCREV = 122 PV = r${SRCREV} SRC_URI = svn://lz4.googlecode.com/svn/;module=trunk;protocol=http -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [[PATCH] qemuppc64: add machine
override USER_CLASSES as prelink does not currently work on ppc64 --- meta/conf/machine/qemuppc64.conf | 16 1 file changed, 16 insertions(+) create mode 100644 meta/conf/machine/qemuppc64.conf diff --git a/meta/conf/machine/qemuppc64.conf b/meta/conf/machine/qemuppc64.conf new file mode 100644 index 000..86916e5 --- /dev/null +++ b/meta/conf/machine/qemuppc64.conf @@ -0,0 +1,16 @@ +#@TYPE: Machine +#@NAME: qemu PPC 64 Emulator setup +#@DESCRIPTION: Machine configuration for running an PPC system under qemu emulation + +require conf/machine/include/qemu.inc +DEFAULTTUNE ?= ppc64p6 +require conf/machine/include/tune-power6.inc + +#prelink broken +USER_CLASSES = buildstats image-mklibs + +KERNEL_IMAGETYPE = vmlinux + +IMAGE_FSTYPES = ext2 ext3 + +SERIAL_CONSOLE ?= ttyS0 -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] Adding new qemuppc64 machine config
apply after linux-yocto/3.14: configuration updates and feature merges. Armin Kuster (1): qemuppc64: add machine meta/conf/machine/qemuppc64.conf | 16 1 file changed, 16 insertions(+) create mode 100644 meta/conf/machine/qemuppc64.conf -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] machine: add qemuppc64 machine
override USER_CLASSES as prelink does not work on ppc64 V2: use _remove instead of overriding USER_CLASSES USER_CLASSES_remove = image-prelink IMAGE_PREPROCESS_COMMAND_remove = prelink_image; Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/conf/machine/qemuppc64.conf | 17 + 1 file changed, 17 insertions(+) create mode 100644 meta/conf/machine/qemuppc64.conf diff --git a/meta/conf/machine/qemuppc64.conf b/meta/conf/machine/qemuppc64.conf new file mode 100644 index 000..14d5c90 --- /dev/null +++ b/meta/conf/machine/qemuppc64.conf @@ -0,0 +1,17 @@ +#@TYPE: Machine +#@NAME: qemu PPC 64 Emulator setup +#@DESCRIPTION: Machine configuration for running an PPC system under qemu emulation + +require conf/machine/include/qemu.inc +DEFAULTTUNE ?= ppc64p6 +require conf/machine/include/tune-power6.inc + +#prelink broken on ppc64 +USER_CLASSES_remove = image-prelink +IMAGE_PREPROCESS_COMMAND_remove = prelink_image; + +KERNEL_IMAGETYPE = vmlinux + +IMAGE_FSTYPES = ext2 ext3 + +SERIAL_CONSOLE ?= ttyS0 -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] linux-yocto: add to qemuppc64 to bb file
Not sure if this this is the correct process. Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/recipes-kernel/linux/linux-yocto_3.14.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux/linux-yocto_3.14.bb b/meta/recipes-kernel/linux/linux-yocto_3.14.bb index e06b191..dfe1de0 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.14.bb @@ -6,6 +6,7 @@ require recipes-kernel/linux/linux-yocto.inc KBRANCH_qemuarm ?= standard/arm-versatile-926ejs KBRANCH_qemumips ?= standard/mti-malta32 KBRANCH_qemuppc ?= standard/qemuppc +KBRANCH_qemuppc64 ?= standard/qemuppc KBRANCH_qemux86 ?= standard/common-pc/base KBRANCH_qemux86-64 ?= standard/common-pc-64/base KBRANCH_qemumips64 ?= standard/mti-malta64 @@ -13,6 +14,7 @@ KBRANCH_qemumips64 ?= standard/mti-malta64 SRCREV_machine_qemuarm ?= c32a2e1190325f685a61196f38fc03ceff2645bf SRCREV_machine_qemumips ?= 1ff50c529b49ceb55a670258f7cb8233c8006c6c SRCREV_machine_qemuppc ?= 12e9828a5b78891374375233b4075f682b9fbd0e +SRCREV_machine_qemuppc64 ?= 12e9828a5b78891374375233b4075f682b9fbd0e SRCREV_machine_qemux86 ?= 58d49fe770ad642e2bc0616159195ba837dc513b SRCREV_machine_qemux86-64 ?= b85edae6fd61ceadfc08099608e8ac90aa4c5c33 SRCREV_machine_qemumips64 ?= dcd579737386fca4d7bcf224bc118b14eb3c1d55 @@ -27,7 +29,7 @@ PV = ${LINUX_VERSION}+git${SRCPV} KMETA = meta -COMPATIBLE_MACHINE = qemuarm|qemux86|qemuppc|qemumips|qemumips64|qemux86-64 +COMPATIBLE_MACHINE = qemuarm|qemux86|qemuppc|qemuppc64|qemumips|qemumips64|qemux86-64 # Functionality flags KERNEL_EXTRA_FEATURES ?= features/netfilter/netfilter.scc -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] scripts: add qemuppc64 qemu scripts
Signed-off-by: Armin Kuster akuster...@gmail.com --- scripts/runqemu | 10 +++--- scripts/runqemu-internal | 30 ++ 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index ff64a1d..71cd798 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -109,7 +109,8 @@ while true; do arg=${1} case $arg in qemux86 | qemux86-64 | qemuarm | qemumips | qemumipsel | \ -qemumips64 | qemush4 | qemuppc | qemumicroblaze | qemuzynq) +qemumips64 | qemush4 | qemuppc | qemuppc64 | \ +qemumicroblaze | qemuzynq) [ -z $MACHINE ] MACHINE=$arg || \ error conflicting MACHINE types [$MACHINE] and [$arg] ;; @@ -229,13 +230,13 @@ fi if [ -z $MACHINE ]; then if [ x$FSTYPE = xvmdk ]; then -MACHINE=`basename $VM | sed -n 's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'` +MACHINE=`basename $VM | sed -n 's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\|qemuppc64).*/\1/p'` if [ -z $MACHINE ]; then error Unable to set MACHINE from vmdk filename [$VM] fi echo Set MACHINE to [$MACHINE] based on vmdk [$VM] else -MACHINE=`basename $KERNEL | sed -n 's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'` +MACHINE=`basename $KERNEL | sed -n 's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\qemuppc64).*/\1/p'` if [ -z $MACHINE ]; then error Unable to set MACHINE from kernel filename [$KERNEL] fi @@ -316,6 +317,9 @@ QEMUSH4_DEFAULT_FSTYPE=ext3 QEMUPPC_DEFAULT_KERNEL=vmlinux-qemuppc.bin QEMUPPC_DEFAULT_FSTYPE=ext3 +QEMUPPC64_DEFAULT_KERNEL=vmlinux-qemuppc64.bin +QEMUPPC64_DEFAULT_FSTYPE=ext3 + QEMUMICROBLAZE_DEFAULT_KERNEL=linux.bin.ub QEMUMICROBLAZE_DEFAULT_FSTYPE=cpio diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index 38745dd..800ab69 100755 --- a/scripts/runqemu-internal +++ b/scripts/runqemu-internal @@ -59,6 +59,9 @@ else qemuppc) mem_size=256 ;; +qemuppc64) +mem_size=1024 +;; qemush4) mem_size=1024 ;; @@ -280,6 +283,7 @@ case $MACHINE in qemumips64) ;; qemush4) ;; qemuppc) ;; +qemuppc64) ;; qemuarmv6) ;; qemuarmv7) ;; qemux86) ;; @@ -548,6 +552,32 @@ if [ $MACHINE = qemuzynq ]; then fi fi +if [ $MACHINE = qemuppc64 ]; then +QEMU=qemu-system-ppc64 +MACHINE_SUBTYPE=pseries +CPU_SUBTYPE=POWER7 +QEMU_UI_OPTIONS=$QEMU_UI_OPTIONS +if [ $SLIRP_ENABLED = yes ]; then +QEMU_NETWORK_CMD= +else +QEMU_NETWORK_CMD=-net nic,model=e1000 $QEMU_TAP_CMD +fi +if [ ${FSTYPE:0:3} = ext -o $FSTYPE = btrfs ]; then +KERNCMDLINE=root=/dev/sda rw console=ttyS0 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY +QEMUOPTIONS=$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS +fi +if [ $FSTYPE = nfs ]; then +if [ $NFS_SERVER = 192.168.7.1 -a ! -d $NFS_DIR ]; then +echo Error: NFS mount point $ROOTFS doesn't exist +cleanup +return 1 +fi +KERNCMDLINE=root=/dev/nfs console=ttyS0 console=tty nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY +QEMUOPTIONS=$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -no-reboot $QEMU_UI_OPTIONS +fi +fi + + if [ x$RAMFS = xtrue ]; then QEMUOPTIONS=-initrd $ROOTFS -nographic KERNCMDLINE=root=/dev/ram0 console=ttyS0 debugshell -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][Daisy] eglibc: CVE-2014-5119 fix
__gconv_translit_find: Disable function [BZ #17187] This functionality has never worked correctly, and the implementation contained a security vulnerability (CVE-2014-5119). Signed-off-by: Armin Kuster akuster...@gmail.com --- .../eglibc/eglibc-2.19/CVE-2014-5119.patch | 240 + meta/recipes-core/eglibc/eglibc_2.19.bb| 1 + 2 files changed, 241 insertions(+) create mode 100644 meta/recipes-core/eglibc/eglibc-2.19/CVE-2014-5119.patch diff --git a/meta/recipes-core/eglibc/eglibc-2.19/CVE-2014-5119.patch b/meta/recipes-core/eglibc/eglibc-2.19/CVE-2014-5119.patch new file mode 100644 index 000..51c7037 --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.19/CVE-2014-5119.patch @@ -0,0 +1,240 @@ +CVE-2014-5119 + +Signed-off-by: Armin Kuster akuster...@gmail.com + +Upstream commit: + +https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a1a6a401ab0a3c9f15fb7eaebbdcee24192254e8 + + +From a1a6a401ab0a3c9f15fb7eaebbdcee24192254e8 Mon Sep 17 00:00:00 2001 +From: Florian Weimer fwei...@redhat.com +Date: Tue, 26 Aug 2014 19:38:59 +0200 +Subject: [PATCH] __gconv_translit_find: Disable function [BZ #17187] + +This functionality has never worked correctly, and the implementation +contained a security vulnerability (CVE-2014-5119). +--- + ChangeLog |7 ++ + NEWS|9 ++- + iconv/gconv_trans.c | 177 +- + 3 files changed, 19 insertions(+), 174 deletions(-) + +Index: libc/NEWS +=== +--- libc.orig/NEWS libc/NEWS +@@ -26,7 +26,7 @@ Version 2.19 + 16271, 16274, 16283, 16289, 16293, 16314, 16316, 16330, 16337, 16338, + 16356, 16365, 16366, 16369, 16372, 16375, 16379, 16384, 16385, 16386, + 16387, 16390, 16394, 16398, 16400, 16407, 16408, 16414, 16430, 16431, +- 16453, 16474, 16506, 16510, 16529 ++ 16453, 16474, 16506, 16510, 16529, 17187 + + * Slovenian translations for glibc messages have been contributed by the + Translation Project's Slovenian team of translators. +Index: libc/iconv/gconv_trans.c +=== +--- libc.orig/iconv/gconv_trans.c libc/iconv/gconv_trans.c +@@ -241,181 +241,12 @@ __gconv_transliterate (struct __gconv_st + return __GCONV_ILLEGAL_INPUT; + } + +- +-/* Structure to represent results of found (or not) transliteration +- modules. */ +-struct known_trans +-{ +- /* This structure must remain the first member. */ +- struct trans_struct info; +- +- char *fname; +- void *handle; +- int open_count; +-}; +- +- +-/* Tree with results of previous calls to __gconv_translit_find. */ +-static void *search_tree; +- +-/* We modify global data. */ +-__libc_lock_define_initialized (static, lock); +- +- +-/* Compare two transliteration entries. */ +-static int +-trans_compare (const void *p1, const void *p2) +-{ +- const struct known_trans *s1 = (const struct known_trans *) p1; +- const struct known_trans *s2 = (const struct known_trans *) p2; +- +- return strcmp (s1-info.name, s2-info.name); +-} +- +- +-/* Open (maybe reopen) the module named in the struct. Get the function +- and data structure pointers we need. */ +-static int +-open_translit (struct known_trans *trans) +-{ +- __gconv_trans_query_fct queryfct; +- +- trans-handle = __libc_dlopen (trans-fname); +- if (trans-handle == NULL) +-/* Not available. */ +-return 1; +- +- /* Find the required symbol. */ +- queryfct = __libc_dlsym (trans-handle, gconv_trans_context); +- if (queryfct == NULL) +-{ +- /* We cannot live with that. */ +-close_and_out: +- __libc_dlclose (trans-handle); +- trans-handle = NULL; +- return 1; +-} +- +- /* Get the context. */ +- if (queryfct (trans-info.name, trans-info.csnames, trans-info.ncsnames) +- != 0) +-goto close_and_out; +- +- /* Of course we also have to have the actual function. */ +- trans-info.trans_fct = __libc_dlsym (trans-handle, gconv_trans); +- if (trans-info.trans_fct == NULL) +-goto close_and_out; +- +- /* Now the optional functions. */ +- trans-info.trans_init_fct = +-__libc_dlsym (trans-handle, gconv_trans_init); +- trans-info.trans_context_fct = +-__libc_dlsym (trans-handle, gconv_trans_context); +- trans-info.trans_end_fct = +-__libc_dlsym (trans-handle, gconv_trans_end); +- +- trans-open_count = 1; +- +- return 0; +-} +- +- + int + internal_function + __gconv_translit_find (struct trans_struct *trans) + { +- struct known_trans **found; +- const struct path_elem *runp; +- int res = 1; +- +- /* We have to have a name. */ +- assert (trans-name != NULL); +- +- /* Acquire the lock. */ +- __libc_lock_lock (lock); +- +- /* See whether we know this module already. */ +- found = __tfind (trans, search_tree, trans_compare); +- if (found != NULL) +-{ +- /* Is this module available? */ +- if ((*found)-handle
[OE-core] [meta-oe][PATCH 0/2] Update timezone recipes to 2014h
if this has been already submitted, ignore. These are the following changes: Changes affecting past time stamps America/Jamaica's 1974 spring-forward transition was Jan. 6, not Apr. 28. Shanks says Asia/Novokuznetsk switched from LMT (not NMT) on 1924-05-01, not 1920-01-06. The old entry was based on a misinterpretation of Shanks. Some more zones have been turned into links, when they differed from existing zones only for older time stamps. As usual, these changes affect UTC offsets in pre-1970 time stamps only. Their old contents have been moved to the 'backzone' file. The affected zones are: Africa/Blantyre, Africa/Bujumbura, Africa/Gaborone, Africa/Harare, Africa/Kigali, Africa/Lubumbashi, Africa/Lusaka, Africa/Maseru, and Africa/Mbabane. Changes affecting code zdump -V and -v now output gmtoff= values on all platforms, not merely on platforms defining TM_GMTOFF. The tz library's localtime and mktime functions now set tzname to a value appropriate for the requested time stamp, and zdump now uses this on platforms not defining TM_ZONE, fixing a 2014g regression. (Thanks to Tim Parenti for reporting the problem.) The tz library no longer sets tzname if localtime or mktime fails. zdump -c no longer mishandles transitions near year boundaries. (Thanks to Tim Parenti for reporting the problem.) An access to uninitalized data has been fixed. (Thanks to J??rg Richter for reporting the problem.) When THREAD_SAFE is defined, the code ports to the C11 memory model. A memory leak has been fixed if ALL_STATE and THREAD_SAFE are defined and two threads race to initialize data used by gmtime-like functions. (Thanks to Andy Heninger for reporting the problems.) Changes affecting build procedure 'make check' now checks better for properly-sorted data. Changes affecting documentation and commentary zdump's gmtoff=N output is now documented, and its isdst=D output is now documented to possibly output D values other than 0 or 1. zdump -c's treatment of years is now documented to use the Gregorian calendar and Universal Time without leap seconds, and its behavior at cutoff boundaries is now documented better. (Thanks to Arthur David Olson and Tim Parenti for reporting the problems.) Programs are now documented to use the proleptic Gregorian calendar. (Thanks to Alan Barrett for the suggestion.) Fractional-second GMT offsets have been documented for civil time in 19th-century Chennai, Jakarta, and New York. Armin Kuster (2): tzcode-native: update to 2014h tzdata: update to 2014h meta/recipes-extended/tzcode/tzcode-native_2014g.bb | 11 --- meta/recipes-extended/tzcode/tzcode-native_2014h.bb | 11 +++ meta/recipes-extended/tzdata/tzdata_2014g.bb| 6 -- meta/recipes-extended/tzdata/tzdata_2014h.bb| 6 ++ 4 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 meta/recipes-extended/tzcode/tzcode-native_2014g.bb create mode 100644 meta/recipes-extended/tzcode/tzcode-native_2014h.bb delete mode 100644 meta/recipes-extended/tzdata/tzdata_2014g.bb create mode 100644 meta/recipes-extended/tzdata/tzdata_2014h.bb -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [meta-oe][PATCH 2/2] tzdata: update to 2014h
Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/recipes-extended/tzdata/tzdata_2014g.bb | 6 -- meta/recipes-extended/tzdata/tzdata_2014h.bb | 6 ++ 2 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 meta/recipes-extended/tzdata/tzdata_2014g.bb create mode 100644 meta/recipes-extended/tzdata/tzdata_2014h.bb diff --git a/meta/recipes-extended/tzdata/tzdata_2014g.bb b/meta/recipes-extended/tzdata/tzdata_2014g.bb deleted file mode 100644 index e831833..000 --- a/meta/recipes-extended/tzdata/tzdata_2014g.bb +++ /dev/null @@ -1,6 +0,0 @@ -SRC_URI = ftp://ftp.iana.org/tz/releases/tzdata${PV}.tar.gz;name=tzdata; - -SRC_URI[tzdata.md5sum] = f9f59425e55b21d2e52bb3a95fc17b8d -SRC_URI[tzdata.sha256sum] = 5547d5b7a982f7f53fffe68cb2a13692553f591a17d58c8ef15b20679d82a270 - -require tzdata.inc diff --git a/meta/recipes-extended/tzdata/tzdata_2014h.bb b/meta/recipes-extended/tzdata/tzdata_2014h.bb new file mode 100644 index 000..9334a62 --- /dev/null +++ b/meta/recipes-extended/tzdata/tzdata_2014h.bb @@ -0,0 +1,6 @@ +SRC_URI = ftp://ftp.iana.org/tz/releases/tzdata${PV}.tar.gz;name=tzdata; + +SRC_URI[tzdata.md5sum] = ed05111948beba8a0f30956baa46b272 +SRC_URI[tzdata.sha256sum] = e78152f616fb07c1dea124215ffca57d0de66d8897e00896086542e3de30f69e + +require tzdata.inc -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [meta-oe][PATCH 1/2] tzcode-native: update to 2014h
Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/recipes-extended/tzcode/tzcode-native_2014g.bb | 11 --- meta/recipes-extended/tzcode/tzcode-native_2014h.bb | 11 +++ 2 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 meta/recipes-extended/tzcode/tzcode-native_2014g.bb create mode 100644 meta/recipes-extended/tzcode/tzcode-native_2014h.bb diff --git a/meta/recipes-extended/tzcode/tzcode-native_2014g.bb b/meta/recipes-extended/tzcode/tzcode-native_2014g.bb deleted file mode 100644 index 55e591a..000 --- a/meta/recipes-extended/tzcode/tzcode-native_2014g.bb +++ /dev/null @@ -1,11 +0,0 @@ -# note that we allow for us to use data later than our code version -# -SRC_URI = ftp://ftp.iana.org/tz/releases/tzcode${PV}.tar.gz;name=tzcode \ - ftp://ftp.iana.org/tz/releases/tzdata2014g.tar.gz;name=tzdata; - -SRC_URI[tzcode.md5sum] = f154679d48b724fe191efc19b55abd24 -SRC_URI[tzcode.sha256sum] = df555fa4ad57cc7394812941d6d037b8c7ecea55e9916eaf4cd2adcb3403af7a -SRC_URI[tzdata.md5sum] = f9f59425e55b21d2e52bb3a95fc17b8d -SRC_URI[tzdata.sha256sum] = 5547d5b7a982f7f53fffe68cb2a13692553f591a17d58c8ef15b20679d82a270 - -require tzcode-native.inc diff --git a/meta/recipes-extended/tzcode/tzcode-native_2014h.bb b/meta/recipes-extended/tzcode/tzcode-native_2014h.bb new file mode 100644 index 000..87c5f23 --- /dev/null +++ b/meta/recipes-extended/tzcode/tzcode-native_2014h.bb @@ -0,0 +1,11 @@ +# note that we allow for us to use data later than our code version +# +SRC_URI = ftp://ftp.iana.org/tz/releases/tzcode${PV}.tar.gz;name=tzcode \ + ftp://ftp.iana.org/tz/releases/tzdata2014h.tar.gz;name=tzdata; + +SRC_URI[tzcode.md5sum] = 8e7741fc769ebdd94d95e5f2c3adbb60 +SRC_URI[tzcode.sha256sum] = a4d9788a1bb0aa314eae4986ee991425b83ecc47da0e84f626735846be1dbf44 +SRC_URI[tzdata.md5sum] = ed05111948beba8a0f30956baa46b272 +SRC_URI[tzdata.sha256sum] = e78152f616fb07c1dea124215ffca57d0de66d8897e00896086542e3de30f69e + +require tzcode-native.inc -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCH] lz4: update to version r123
Makefile md5sum changed since version is hardcode in it. Added : experimental lz4frame API; special thanks to Takayuki Matsuoka and Christopher Jackson for testings and suggestions Fix : s390x support, thanks to Nobuhiro Iwamatsu Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/recipes-support/lz4/lz4_svn.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/lz4/lz4_svn.bb b/meta/recipes-support/lz4/lz4_svn.bb index bbd5d93..3a74200 100644 --- a/meta/recipes-support/lz4/lz4_svn.bb +++ b/meta/recipes-support/lz4/lz4_svn.bb @@ -3,10 +3,10 @@ DESCRIPTION = LZ4 is a very fast lossless compression algorithm, providing comp LICENSE = BSD LIC_FILES_CHKSUM = file://LICENSE;md5=0b0d063f37a4477b54af2459477dcafd \ -file://Makefile;md5=68938168b5cee826476a13e1b8d1f480 +file://Makefile;md5=7551cc5d31ca66e003ab06e83486524a # Upstream names releases after SVN revs -SRCREV = 122 +SRCREV = 123 PV = r${SRCREV} SRC_URI = svn://lz4.googlecode.com/svn/;module=trunk;protocol=http -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] pinentry: update 0.9
removed some EXTRA_OECONF to fix: WARNING: QA Issue: pinentry: configure was passed unrecognised options: --disable-glibtest --disable-pinentry-gtk --disable-pinentry-qt [unknown-configure-option] Signed-off-by: Armin Kuster akuster...@gmail.com --- .../pinentry/{pinentry_0.8.4.bb = pinentry_0.9.0.bb}| 12 1 file changed, 4 insertions(+), 8 deletions(-) rename meta/recipes-support/pinentry/{pinentry_0.8.4.bb = pinentry_0.9.0.bb} (78%) diff --git a/meta/recipes-support/pinentry/pinentry_0.8.4.bb b/meta/recipes-support/pinentry/pinentry_0.9.0.bb similarity index 78% rename from meta/recipes-support/pinentry/pinentry_0.8.4.bb rename to meta/recipes-support/pinentry/pinentry_0.9.0.bb index acc6992..68d2478 100644 --- a/meta/recipes-support/pinentry/pinentry_0.8.4.bb +++ b/meta/recipes-support/pinentry/pinentry_0.9.0.bb @@ -10,17 +10,13 @@ LIC_FILES_CHKSUM = file://COPYING;md5=cbbd794e2a0a289b9dfcc9f513d1996e inherit autotools-brokensep -SRC_URI = ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2 \ - +SRC_URI = ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2; -SRC_URI[md5sum] = e2b6f94471ba1e978f6e5bf6b275189b -SRC_URI[sha256sum] = 359db3bf46cb743ba0b3aeef259f6107271ca888ba3e22c1cba525c9aca35612 +SRC_URI[md5sum] = 40a05856cb3accf6679987b7899b0f5a +SRC_URI[sha256sum] = 90045a07ab8e1a8e1ecf5d19b51691f195525e579fa5d71d7e92c120b05490ab EXTRA_OECONF = --disable-rpath \ - --disable-dependency-tracking \ - --disable-glibtest \ - --disable-pinentry-gtk \ - --disable-pinentry-qt \ + --disable-dependency-tracking \ PACKAGECONFIG ??= ncurses libcap -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] tzdata: update to 2014j
Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/recipes-extended/tzdata/tzdata_2014i.bb | 6 -- meta/recipes-extended/tzdata/tzdata_2014j.bb | 6 ++ 2 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 meta/recipes-extended/tzdata/tzdata_2014i.bb create mode 100644 meta/recipes-extended/tzdata/tzdata_2014j.bb diff --git a/meta/recipes-extended/tzdata/tzdata_2014i.bb b/meta/recipes-extended/tzdata/tzdata_2014i.bb deleted file mode 100644 index cab9b84..000 --- a/meta/recipes-extended/tzdata/tzdata_2014i.bb +++ /dev/null @@ -1,6 +0,0 @@ -SRC_URI = ftp://ftp.iana.org/tz/releases/tzdata${PV}.tar.gz;name=tzdata; - -SRC_URI[tzdata.md5sum] = 00adeb62a0897aac5ba67da838351adb -SRC_URI[tzdata.sha256sum] = 2af331bdd2b794ec59b8ded7300fb29dc3573a009ec14183f5c9ad38e3886153 - -require tzdata.inc diff --git a/meta/recipes-extended/tzdata/tzdata_2014j.bb b/meta/recipes-extended/tzdata/tzdata_2014j.bb new file mode 100644 index 000..f0388c2 --- /dev/null +++ b/meta/recipes-extended/tzdata/tzdata_2014j.bb @@ -0,0 +1,6 @@ +SRC_URI = ftp://ftp.iana.org/tz/releases/tzdata${PV}.tar.gz;name=tzdata; + +SRC_URI[tzdata.md5sum] = 2d7ea9c309f0d4e162e426e568290ca3 +SRC_URI[tzdata.sha256sum] = a2d870320694d40535df822ac8074dc629a90e92abafa5d3373314f78ddc0e0d + +require tzdata.inc -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] update timezone to 2014j
These are minor changes: Changes affecting current and future time stamps Turks Caicos' switch from US eastern time to UTC-4 year-round did not occur on 2014-11-02 at 02:00. It's currently scheduled for 2015-11-01 at 02:00. (Thanks to Chris Walton.) Changes affecting past time stamps Many pre-1989 time stamps have been corrected for Asia/Seoul and Asia/Pyongyang, based on sources for the Korean-language Wikipedia entry for time in Korea. (Thanks to Sanghyuk Jung.) Also, no longer guess that Pyongyang mimicked Seoul time after World War II, as this is politically implausible. Some more zones have been turned into links, when they differed from existing zones only for older time stamps. As usual, these changes affect UTC offsets in pre-1970 time stamps only. Their old contents have been moved to the 'backzone' file. The affected zones are: Africa/Addis_Ababa, Africa/Asmara, Africa/Dar_es_Salaam, Africa/Djibouti, Africa/Kampala, Africa/Mogadishu, Indian/Antananarivo, Indian/Comoro, and Indian/Mayotte. Changes affecting commentary The commentary is less enthusiastic about Shanks as a source, and is more careful to distinguish UT from UTC. Armin Kuster (2): tzcode: update to 2014j tzdata: update to 2014j meta/recipes-extended/tzcode/tzcode-native_2014i.bb | 10 -- meta/recipes-extended/tzcode/tzcode-native_2014j.bb | 10 ++ meta/recipes-extended/tzdata/tzdata_2014i.bb| 6 -- meta/recipes-extended/tzdata/tzdata_2014j.bb| 6 ++ 4 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 meta/recipes-extended/tzcode/tzcode-native_2014i.bb create mode 100644 meta/recipes-extended/tzcode/tzcode-native_2014j.bb delete mode 100644 meta/recipes-extended/tzdata/tzdata_2014i.bb create mode 100644 meta/recipes-extended/tzdata/tzdata_2014j.bb -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] tzcode: update to 2014j
Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/recipes-extended/tzcode/tzcode-native_2014i.bb | 10 -- meta/recipes-extended/tzcode/tzcode-native_2014j.bb | 10 ++ 2 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 meta/recipes-extended/tzcode/tzcode-native_2014i.bb create mode 100644 meta/recipes-extended/tzcode/tzcode-native_2014j.bb diff --git a/meta/recipes-extended/tzcode/tzcode-native_2014i.bb b/meta/recipes-extended/tzcode/tzcode-native_2014i.bb deleted file mode 100644 index d77dd5d..000 --- a/meta/recipes-extended/tzcode/tzcode-native_2014i.bb +++ /dev/null @@ -1,10 +0,0 @@ -# note that we allow for us to use data later than our code version -# -SRC_URI = ftp://ftp.iana.org/tz/releases/tzcode${PV}.tar.gz;name=tzcode \ - ftp://ftp.iana.org/tz/releases/tzdata2014i.tar.gz;name=tzdata; - -SRC_URI[tzcode.md5sum] = 7fa413158f01a961348aa6a289b6be21 -SRC_URI[tzcode.sha256sum] = 62591075fb0d47459889b71bac3c8487f09b7417b81dfa541d750b4889e84783 -SRC_URI[tzdata.md5sum] = 00adeb62a0897aac5ba67da838351adb -SRC_URI[tzdata.sha256sum] = 2af331bdd2b794ec59b8ded7300fb29dc3573a009ec14183f5c9ad38e3886153 -require tzcode-native.inc diff --git a/meta/recipes-extended/tzcode/tzcode-native_2014j.bb b/meta/recipes-extended/tzcode/tzcode-native_2014j.bb new file mode 100644 index 000..b76aa33 --- /dev/null +++ b/meta/recipes-extended/tzcode/tzcode-native_2014j.bb @@ -0,0 +1,10 @@ +# note that we allow for us to use data later than our code version +# +SRC_URI = ftp://ftp.iana.org/tz/releases/tzcode${PV}.tar.gz;name=tzcode \ + ftp://ftp.iana.org/tz/releases/tzdata2014j.tar.gz;name=tzdata; + +SRC_URI[tzcode.md5sum] = 970119e9765bc5a9320368851c91ecb6 +SRC_URI[tzcode.sha256sum] = 7fd46125464856309fc81fe85a67a61de862b8ab884ce8ca82051f5fa308ede2 +SRC_URI[tzdata.md5sum] = 2d7ea9c309f0d4e162e426e568290ca3 +SRC_URI[tzdata.sha256sum] = a2d870320694d40535df822ac8074dc629a90e92abafa5d3373314f78ddc0e0d +require tzcode-native.inc -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [meta-oe][PATCH] serf: update to 1.3.8 including CVE-2014-3504
Serf 1.3.8 [2014-10-20, from /tags/1.3.8, r] Fix issue #152: CRC calculation error for gzipped http reponses 4GB. Fix issue #153: SSPI CredHandle not freed when APR pool is destroyed. Fix issue #154: Disable SSLv2 and SSLv3 as both or broken. Serf 1.3.7 [2014-08-11, from /tags/1.3.7, r2411] Includes security fix: Handle NUL bytes in fields of an X.509 certificate. (r2393, r2399) - CVE-2014-3504: (Closes: #757965) Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/recipes-support/serf/{serf_1.3.6.bb = serf_1.3.8.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-support/serf/{serf_1.3.6.bb = serf_1.3.8.bb} (74%) diff --git a/meta/recipes-support/serf/serf_1.3.6.bb b/meta/recipes-support/serf/serf_1.3.8.bb similarity index 74% rename from meta/recipes-support/serf/serf_1.3.6.bb rename to meta/recipes-support/serf/serf_1.3.8.bb index 08b04d3..10db122 100644 --- a/meta/recipes-support/serf/serf_1.3.6.bb +++ b/meta/recipes-support/serf/serf_1.3.8.bb @@ -1,8 +1,8 @@ -SRC_URI = http://serf.googlecode.com/svn/src_releases/serf-1.3.6.tar.bz2 \ +SRC_URI = http://serf.googlecode.com/svn/src_releases/serf-${PV}.tar.bz2 \ file://norpath.patch -SRC_URI[md5sum] = 7fe38fa6eab078e0beabf291d8e4995d -SRC_URI[sha256sum] = ca637beb0399797d4fc7ffa85e801733cd9c876997fac4a4fd12e9afe86563f2 +SRC_URI[md5sum] = 2e4efe57ff28cb3202a112e90f0c2889 +SRC_URI[sha256sum] = e0500be065dbbce490449837bb2ab624e46d64fc0b090474d9acaa87c82b2590 LICENSE = Apache-2.0 LIC_FILES_CHKSUM = file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/6] Dizzy Next
Please consider the these changes for Dizzy next. The following changes since commit 6dcaf44d8c28c466ff271d5f5585a84632bf8769: subversion: Security Advisory - subversion - CVE-2014-3522 (2014-11-11 09:04:57 -0800) are available in the git repository at: git://git.yoctoproject.org/poky-contrib akuster/dizzy-next http://git.yoctoproject.org/cgit.cgi//log/?h=akuster/dizzy-next Armin Kuster (2): tzcode: update to 2014j tzdata: update to 2014j Chong Lu (3): curl: Security Advisory - curl - CVE-2014-3613 curl: Security Advisory - curl - CVE-2014-3620 nss: CVE-2014-1568 Yue Tao (1): subversion: Security Advisory - subversion - CVE-2014-3528 .../subversion/subversion-CVE-2014-3528.patch | 29 + .../subversion/subversion_1.6.15.bb| 1 + .../subversion/subversion_1.8.9.bb | 1 + .../recipes-extended/tzcode/tzcode-native_2014j.bb | 10 + meta/recipes-extended/tzdata/tzdata_2014j.bb | 6 + meta/recipes-support/curl/curl/CVE-2014-3613.patch | 269 + meta/recipes-support/curl/curl/CVE-2014-3620.patch | 69 +++ meta/recipes-support/curl/curl_7.37.1.bb | 2 + .../nss/files/nss-CVE-2014-1568.patch | 670 + meta/recipes-support/nss/nss.inc | 1 + 10 files changed, 1058 insertions(+) create mode 100644 meta/recipes-devtools/subversion/subversion/subversion-CVE-2014-3528.patch create mode 100644 meta/recipes-extended/tzcode/tzcode-native_2014j.bb create mode 100644 meta/recipes-extended/tzdata/tzdata_2014j.bb create mode 100644 meta/recipes-support/curl/curl/CVE-2014-3613.patch create mode 100644 meta/recipes-support/curl/curl/CVE-2014-3620.patch create mode 100644 meta/recipes-support/nss/files/nss-CVE-2014-1568.patch -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/6] subversion: Security Advisory - subversion - CVE-2014-3528
From: Yue Tao yue@windriver.com Apache Subversion 1.0.0 through 1.7.x before 1.7.17 and 1.8.x before 1.8.10 uses an MD5 hash of the URL and authentication realm to store cached credentials, which makes it easier for remote servers to obtain the credentials via a crafted authentication realm. http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-3528 (From OE-Core rev: e0dc0432b13f38d16f642bdadf8ebc78b7a74806) Signed-off-by: Yue Tao yue@windriver.com Signed-off-by: Jackie Huang jackie.hu...@windriver.com Signed-off-by: Ross Burton ross.bur...@intel.com Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org Signed-off-by: Armin Kuster akuster...@gmail.com --- .../subversion/subversion-CVE-2014-3528.patch | 29 ++ .../subversion/subversion_1.6.15.bb| 1 + .../subversion/subversion_1.8.9.bb | 1 + 3 files changed, 31 insertions(+) create mode 100644 meta/recipes-devtools/subversion/subversion/subversion-CVE-2014-3528.patch diff --git a/meta/recipes-devtools/subversion/subversion/subversion-CVE-2014-3528.patch b/meta/recipes-devtools/subversion/subversion/subversion-CVE-2014-3528.patch new file mode 100644 index 000..23e738e --- /dev/null +++ b/meta/recipes-devtools/subversion/subversion/subversion-CVE-2014-3528.patch @@ -0,0 +1,29 @@ +Upstream-Status: Backport + +Signed-off-by: Yue Tao yue@windriver.com + +diff --git a/subversion/libsvn_subr/config_auth.c.old b/subversion/libsvn_subr/config_auth.c +index ff50270..c511d04 100644 +--- a/subversion/libsvn_subr/config_auth.c.old b/subversion/libsvn_subr/config_auth.c +@@ -85,6 +85,7 @@ svn_config_read_auth_data(apr_hash_t **hash, + if (kind == svn_node_file) + { + svn_stream_t *stream; ++ svn_string_t *stored_realm; + + SVN_ERR_W(svn_stream_open_readonly(stream, auth_path, pool, pool), + _(Unable to open auth file for reading)); +@@ -95,6 +96,12 @@ svn_config_read_auth_data(apr_hash_t **hash, + apr_psprintf(pool, _(Error parsing '%s'), + svn_path_local_style(auth_path, pool))); + ++ stored_realm = apr_hash_get(*hash, SVN_CONFIG_REALMSTRING_KEY, ++ APR_HASH_KEY_STRING); ++ ++ if (!stored_realm || strcmp(stored_realm-data, realmstring) != 0) ++*hash = NULL; /* Hash collision, or somebody tampering with storage */ ++ + SVN_ERR(svn_stream_close(stream)); + } + diff --git a/meta/recipes-devtools/subversion/subversion_1.6.15.bb b/meta/recipes-devtools/subversion/subversion_1.6.15.bb index 6680ab6..b135bb7 100644 --- a/meta/recipes-devtools/subversion/subversion_1.6.15.bb +++ b/meta/recipes-devtools/subversion/subversion_1.6.15.bb @@ -19,6 +19,7 @@ SRC_URI = http://subversion.tigris.org/downloads/${BPN}-${PV}.tar.bz2 \ file://subversion-CVE-2013-1847-CVE-2013-1846.patch \ file://subversion-CVE-2013-4277.patch \ file://subversion-CVE-2014-3522.patch \ + file://subversion-CVE-2014-3528.patch \ SRC_URI[md5sum] = 113fca1d9e4aa389d7dc2b210010fa69 diff --git a/meta/recipes-devtools/subversion/subversion_1.8.9.bb b/meta/recipes-devtools/subversion/subversion_1.8.9.bb index e1ab945..1ef59a0 100644 --- a/meta/recipes-devtools/subversion/subversion_1.8.9.bb +++ b/meta/recipes-devtools/subversion/subversion_1.8.9.bb @@ -13,6 +13,7 @@ SRC_URI = ${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://libtool2.patch \ file://disable_macos.patch \ file://subversion-CVE-2014-3522.patch;striplevel=0 \ + file://subversion-CVE-2014-3528.patch \ SRC_URI[md5sum] = bd495517a760ddd764ce449a891971db SRC_URI[sha256sum] = 45d708a5c3ffbef4b2a1044c4716a053e680763743d1f7ba99d0369f6da49e33 -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/6] nss: CVE-2014-1568
From: Chong Lu chong...@windriver.com the patch comes from: http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-1568 https://bugzilla.mozilla.org/show_bug.cgi?id=1064636 nss ng log: = changeset: 11252:ad411fb64046 user:Kai Engert k...@kuix.de date:Tue Sep 23 19:28:34 2014 +0200 summary: Fix bug 1064636, patch part 2, r=rrelyea = changeset: 11253:4e90910ad2f9 user:Kai Engert k...@kuix.de date:Tue Sep 23 19:28:45 2014 +0200 summary: Fix bug1064636, patch part 3, r=rrelyea = changeset: 11254:fb7208e91ae8 user:Kai Engert k...@kuix.de date:Tue Sep 23 19:28:52 2014 +0200 summary: Fix bug1064636, patch part 1, r=rrelyea = changeset: 11255:8dd6c6ac977d user:Kai Engert k...@kuix.de date:Tue Sep 23 19:39:40 2014 +0200 summary: Bug 1064636, follow up commit to fix Windows build bustage Signed-off-by: Li Wang li.w...@windriver.com Signed-off-by: Chong Lu chong...@windriver.com Signed-off-by: Armin Kuster akuster...@gmail.com --- .../nss/files/nss-CVE-2014-1568.patch | 670 + meta/recipes-support/nss/nss.inc | 1 + 2 files changed, 671 insertions(+) create mode 100644 meta/recipes-support/nss/files/nss-CVE-2014-1568.patch diff --git a/meta/recipes-support/nss/files/nss-CVE-2014-1568.patch b/meta/recipes-support/nss/files/nss-CVE-2014-1568.patch new file mode 100644 index 000..dbdb00c --- /dev/null +++ b/meta/recipes-support/nss/files/nss-CVE-2014-1568.patch @@ -0,0 +1,670 @@ +nss: CVE-2014-1568 + +the patch comes from: +http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-1568 +https://bugzilla.mozilla.org/show_bug.cgi?id=1064636 +nss ng log: += +changeset: 11252:ad411fb64046 +user:Kai Engert k...@kuix.de +date:Tue Sep 23 19:28:34 2014 +0200 +summary: Fix bug 1064636, patch part 2, r=rrelyea += +changeset: 11253:4e90910ad2f9 +user:Kai Engert k...@kuix.de +date:Tue Sep 23 19:28:45 2014 +0200 +summary: Fix bug1064636, patch part 3, r=rrelyea += +changeset: 11254:fb7208e91ae8 +user:Kai Engert k...@kuix.de +date:Tue Sep 23 19:28:52 2014 +0200 +summary: Fix bug1064636, patch part 1, r=rrelyea += +changeset: 11255:8dd6c6ac977d +user:Kai Engert k...@kuix.de +date:Tue Sep 23 19:39:40 2014 +0200 +summary: Bug 1064636, follow up commit to fix Windows build bustage + +Upstream-Status: Backport +Signed-off-by: Li Wang li.w...@windriver.com +--- + nss/lib/cryptohi/secvfy.c | 202 +++- + nss/lib/softoken/pkcs11c.c | 69 +++ + nss/lib/util/manifest.mn |2 + + nss/lib/util/nssutil.def |6 ++ + nss/lib/util/pkcs1sig.c| 169 + nss/lib/util/pkcs1sig.h| 30 +++ + 6 files changed, 360 insertions(+), 118 deletions(-) + create mode 100644 nss/lib/util/pkcs1sig.c + create mode 100644 nss/lib/util/pkcs1sig.h + +diff --git a/nss/lib/cryptohi/secvfy.c b/nss/lib/cryptohi/secvfy.c +index c1ac39b..0a20672 100644 +--- a/nss/lib/cryptohi/secvfy.c b/nss/lib/cryptohi/secvfy.c +@@ -12,78 +12,111 @@ + #include secasn1.h + #include secoid.h + #include pk11func.h ++#include pkcs1sig.h + #include secdig.h + #include secerr.h + #include keyi.h + + /* +-** Decrypt signature block using public key +-** Store the hash algorithm oid tag in *tagp +-** Store the digest in the digest buffer +-** Store the digest length in *digestlen ++** Recover the DigestInfo from an RSA PKCS#1 signature. ++** ++** If givenDigestAlg != SEC_OID_UNKNOWN, copy givenDigestAlg to digestAlgOut. ++** Otherwise, parse the DigestInfo structure and store the decoded digest ++** algorithm into digestAlgOut. ++** ++** Store the encoded DigestInfo into digestInfo. ++** Store the DigestInfo length into digestInfoLen. ++** ++** This function does *not* verify that the AlgorithmIdentifier in the ++** DigestInfo identifies givenDigestAlg or that the DigestInfo is encoded ++** correctly; verifyPKCS1DigestInfo does that. ++** + ** XXX this is assuming that the signature algorithm has WITH_RSA_ENCRYPTION + */ + static SECStatus +-DecryptSigBlock(SECOidTag *tagp, unsigned char *digest, +- unsigned int *digestlen, unsigned int maxdigestlen, +- SECKEYPublicKey *key, const SECItem *sig, char *wincx) ++recoverPKCS1DigestInfo(SECOidTag givenDigestAlg, ++ /*out*/ SECOidTag* digestAlgOut, ++ /*out*/ unsigned char** digestInfo, ++ /*out*/ unsigned int* digestInfoLen, ++ SECKEYPublicKey* key, ++ const SECItem* sig, void* wincx) + { +-SGNDigestInfo *di = NULL; +-unsigned char *buf = NULL; +-SECStatus rv; +-SECOidTag tag; +-SECItemit; +- +-if (key == NULL) goto loser; +- ++SGNDigestInfo* di = NULL; ++SECItem
[OE-core] [PATCH 5/6] tzcode: update to 2014j
(From OE-Core rev: 2f8940e8b2a0537f131a6d5410e85bba07a8c116) Signed-off-by: Armin Kuster akuster...@gmail.com Signed-off-by: Ross Burton ross.bur...@intel.com Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/recipes-extended/tzcode/tzcode-native_2014j.bb | 10 ++ 1 file changed, 10 insertions(+) create mode 100644 meta/recipes-extended/tzcode/tzcode-native_2014j.bb diff --git a/meta/recipes-extended/tzcode/tzcode-native_2014j.bb b/meta/recipes-extended/tzcode/tzcode-native_2014j.bb new file mode 100644 index 000..b76aa33 --- /dev/null +++ b/meta/recipes-extended/tzcode/tzcode-native_2014j.bb @@ -0,0 +1,10 @@ +# note that we allow for us to use data later than our code version +# +SRC_URI = ftp://ftp.iana.org/tz/releases/tzcode${PV}.tar.gz;name=tzcode \ + ftp://ftp.iana.org/tz/releases/tzdata2014j.tar.gz;name=tzdata; + +SRC_URI[tzcode.md5sum] = 970119e9765bc5a9320368851c91ecb6 +SRC_URI[tzcode.sha256sum] = 7fd46125464856309fc81fe85a67a61de862b8ab884ce8ca82051f5fa308ede2 +SRC_URI[tzdata.md5sum] = 2d7ea9c309f0d4e162e426e568290ca3 +SRC_URI[tzdata.sha256sum] = a2d870320694d40535df822ac8074dc629a90e92abafa5d3373314f78ddc0e0d +require tzcode-native.inc -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/6] curl: Security Advisory - curl - CVE-2014-3613
From: Chong Lu chong...@windriver.com By not detecting and rejecting domain names for partial literal IP addresses properly when parsing received HTTP cookies, libcurl can be fooled to both sending cookies to wrong sites and into allowing arbitrary sites to set cookies for others. (From OE-Core rev: 985ef933208da1dd1f17645613ce08e6ad27e2c1) Signed-off-by: Chong Lu chong...@windriver.com Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/recipes-support/curl/curl/CVE-2014-3613.patch | 269 + meta/recipes-support/curl/curl_7.37.1.bb | 1 + 2 files changed, 270 insertions(+) create mode 100644 meta/recipes-support/curl/curl/CVE-2014-3613.patch diff --git a/meta/recipes-support/curl/curl/CVE-2014-3613.patch b/meta/recipes-support/curl/curl/CVE-2014-3613.patch new file mode 100644 index 000..3e2fee0 --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2014-3613.patch @@ -0,0 +1,269 @@ +From 545e322cc8c383ccdfb4ad85a1634c2b719a1adf Mon Sep 17 00:00:00 2001 +From: Tim Ruehsen tim.rueh...@gmx.de +Date: Tue, 19 Aug 2014 21:01:28 +0200 +Subject: [PATCH] cookies: only use full host matches for hosts used as IP + address + +By not detecting and rejecting domain names for partial literal IP +addresses properly when parsing received HTTP cookies, libcurl can be +fooled to both send cookies to wrong sites and to allow arbitrary sites +to set cookies for others. + +CVE-2014-3613 + +Bug: http://curl.haxx.se/docs/adv_20140910A.html + +Upstream-Status: Backport + +Signed-off-by: Chong Lu chong...@windriver.com +--- + lib/cookie.c| 50 ++-- + tests/data/test1105 | 3 +-- + tests/data/test31 | 55 +++-- + tests/data/test8| 3 ++- + 4 files changed, 71 insertions(+), 40 deletions(-) + +diff --git a/lib/cookie.c b/lib/cookie.c +index 0590643..46904ac 100644 +--- a/lib/cookie.c b/lib/cookie.c +@@ -93,10 +93,11 @@ Example set of cookies: + #include curl_memory.h + #include share.h + #include strtoofft.h + #include rawstr.h + #include curl_memrchr.h ++#include inet_pton.h + + /* The last #include file should be: */ + #include memdebug.h + + static void freecookie(struct Cookie *co) +@@ -317,10 +318,32 @@ static void remove_expired(struct CookieInfo *cookies) + } + co = nx; + } + } + ++/* ++ * Return true if the given string is an IP(v4|v6) address. ++ */ ++static bool isip(const char *domain) ++{ ++ struct in_addr addr; ++#ifdef ENABLE_IPV6 ++ struct in6_addr addr6; ++#endif ++ ++ if(Curl_inet_pton(AF_INET, domain, addr) ++#ifdef ENABLE_IPV6 ++ || Curl_inet_pton(AF_INET6, domain, addr6) ++#endif ++) { ++/* domain name given as IP address */ ++return TRUE; ++ } ++ ++ return FALSE; ++} ++ + / + * + * Curl_cookie_add() + * + * Add a single cookie line to the cookie keeping object. +@@ -437,28 +460,31 @@ Curl_cookie_add(struct SessionHandle *data, + badcookie = TRUE; /* out of memory bad */ + break; + } + } + else if(Curl_raw_equal(domain, name)) { ++ bool is_ip; ++ + /* Now, we make sure that our host is within the given domain, + or the given domain is not valid and thus cannot be set. */ + + if('.' == whatptr[0]) + whatptr++; /* ignore preceding dot */ + +- if(!domain || tailmatch(whatptr, domain)) { +-const char *tailptr=whatptr; +-if(tailptr[0] == '.') +- tailptr++; +-strstore(co-domain, tailptr); /* don't prefix w/dots +- internally */ ++ is_ip = isip(domain ? domain : whatptr); ++ ++ if(!domain ++ || (is_ip !strcmp(whatptr, domain)) ++ || (!is_ip tailmatch(whatptr, domain))) { ++strstore(co-domain, whatptr); + if(!co-domain) { + badcookie = TRUE; + break; + } +-co-tailmatch=TRUE; /* we always do that if the domain name was +- given */ ++if(!is_ip) ++ co-tailmatch=TRUE; /* we always do that if the domain name was ++ given */ + } + else { + /* we did not get a tailmatch and then the attempted set domain +is not a domain to which the current host belongs. Mark as +bad. */ +@@ -966,17 +992,21 @@ struct Cookie *Curl_cookie_getlist(struct CookieInfo *c, + struct Cookie *newco; + struct Cookie *co; + time_t now = time(NULL); + struct Cookie *mainco=NULL; + size_t matches = 0; ++ bool is_ip; + + if(!c || !c-cookies) + return NULL; /* no cookie struct or no cookies in the struct */ + + /* at first
[OE-core] [PATCH 6/6] tzdata: update to 2014j
(From OE-Core rev: 3ab9dfb703835fee21fd73c4e5cbad1c34c6a163) Signed-off-by: Armin Kuster akuster...@gmail.com Signed-off-by: Ross Burton ross.bur...@intel.com Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/recipes-extended/tzdata/tzdata_2014j.bb | 6 ++ 1 file changed, 6 insertions(+) create mode 100644 meta/recipes-extended/tzdata/tzdata_2014j.bb diff --git a/meta/recipes-extended/tzdata/tzdata_2014j.bb b/meta/recipes-extended/tzdata/tzdata_2014j.bb new file mode 100644 index 000..f0388c2 --- /dev/null +++ b/meta/recipes-extended/tzdata/tzdata_2014j.bb @@ -0,0 +1,6 @@ +SRC_URI = ftp://ftp.iana.org/tz/releases/tzdata${PV}.tar.gz;name=tzdata; + +SRC_URI[tzdata.md5sum] = 2d7ea9c309f0d4e162e426e568290ca3 +SRC_URI[tzdata.sha256sum] = a2d870320694d40535df822ac8074dc629a90e92abafa5d3373314f78ddc0e0d + +require tzdata.inc -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/6] curl: Security Advisory - curl - CVE-2014-3620
From: Chong Lu chong...@windriver.com libcurl wrongly allows cookies to be set for Top Level Domains (TLDs), thus making them apply broader than cookies are allowed. This can allow arbitrary sites to set cookies that then would get sent to a different and unrelated site or domain. (From OE-Core rev: ddbaade8afbc9767583728bfdc220639203d6853) Signed-off-by: Chong Lu chong...@windriver.com Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/recipes-support/curl/curl/CVE-2014-3620.patch | 69 ++ meta/recipes-support/curl/curl_7.37.1.bb | 1 + 2 files changed, 70 insertions(+) create mode 100644 meta/recipes-support/curl/curl/CVE-2014-3620.patch diff --git a/meta/recipes-support/curl/curl/CVE-2014-3620.patch b/meta/recipes-support/curl/curl/CVE-2014-3620.patch new file mode 100644 index 000..d11f190 --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2014-3620.patch @@ -0,0 +1,69 @@ +From fd7ae600adf23a9a1ed619165c5058bdec216e9c Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg dan...@haxx.se +Date: Tue, 19 Aug 2014 21:11:20 +0200 +Subject: [PATCH] cookies: reject incoming cookies set for TLDs + +Test 61 was modified to verify this. + +CVE-2014-3620 + +Reported-by: Tim Ruehsen +URL: http://curl.haxx.se/docs/adv_20140910B.html + +Upstream-Status: Backport + +Signed-off-by: Chong Lu chong...@windriver.com +--- + lib/cookie.c | 6 ++ + tests/data/test61 | 1 + + 2 files changed, 7 insertions(+) + +diff --git a/lib/cookie.c b/lib/cookie.c +index 46904ac..375485f 100644 +--- a/lib/cookie.c b/lib/cookie.c +@@ -461,19 +461,25 @@ Curl_cookie_add(struct SessionHandle *data, + break; + } + } + else if(Curl_raw_equal(domain, name)) { + bool is_ip; ++ const char *dotp; + + /* Now, we make sure that our host is within the given domain, + or the given domain is not valid and thus cannot be set. */ + + if('.' == whatptr[0]) + whatptr++; /* ignore preceding dot */ + + is_ip = isip(domain ? domain : whatptr); + ++ /* check for more dots */ ++ dotp = strchr(whatptr, '.'); ++ if(!dotp) ++domain=:; ++ + if(!domain + || (is_ip !strcmp(whatptr, domain)) + || (!is_ip tailmatch(whatptr, domain))) { + strstore(co-domain, whatptr); + if(!co-domain) { +diff --git a/tests/data/test61 b/tests/data/test61 +index d2de279..e6dbbb9 100644 +--- a/tests/data/test61 b/tests/data/test61 +@@ -21,10 +21,11 @@ Set-Cookie: test=yes; httponly; domain=foo.com; expires=Fri Feb 2 11:56:27 GMT 2 + SET-COOKIE: test2=yes; domain=host.foo.com; expires=Fri Feb 2 11:56:27 GMT 2035 + Set-Cookie: test3=maybe; domain=foo.com; path=/moo; secure + Set-Cookie: test4=no; domain=nope.foo.com; path=/moo; secure + Set-Cookie: test5=name; domain=anything.com; path=/ ; secure + Set-Cookie: fake=fooledyou; domain=..com; path=/; ++Set-Cookie: supercookie=fooledyou; domain=.com; path=/;^M + Content-Length: 4 + + boo + /data + /reply +-- +2.1.0 + diff --git a/meta/recipes-support/curl/curl_7.37.1.bb b/meta/recipes-support/curl/curl_7.37.1.bb index 1147675..8b854d7 100644 --- a/meta/recipes-support/curl/curl_7.37.1.bb +++ b/meta/recipes-support/curl/curl_7.37.1.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e66 SRC_URI = http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://pkgconfig_fix.patch \ file://CVE-2014-3613.patch \ + file://CVE-2014-3620.patch \ # curl likes to set -g0 in CFLAGS, so we stop it -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 01/11] wic: Don't allow mkfs to fail silently in partition command
From: Tom Zanussi tom.zanu...@linux.intel.com The return code from the mkfs command used by the partition creation command was being ignored, allowing it to silently fail and leaving users mystified as to why the resulting filesystem was corrupted. This became obvious when failures occurred when creating large e.g. sdk filesystems [YOCTO #6863]. (From OE-Core rev: 8cef3b06f7e9f9d922673f430ddb3170d2fac000) Signed-off-by: Tom Zanussi tom.zanu...@linux.intel.com Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org Signed-off-by: Armin Kuster akuster...@gmail.com --- .../lib/wic/kickstart/custom_commands/partition.py | 22 -- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/scripts/lib/wic/kickstart/custom_commands/partition.py b/scripts/lib/wic/kickstart/custom_commands/partition.py index 8b0ace6..3950b43 100644 --- a/scripts/lib/wic/kickstart/custom_commands/partition.py +++ b/scripts/lib/wic/kickstart/custom_commands/partition.py @@ -241,8 +241,10 @@ class Wic_PartData(Mic_PartData): mkfs_cmd = mkfs.%s -F %s %s -d %s % \ (self.fstype, extra_imagecmd, rootfs, image_rootfs) -exec_native_cmd(pseudo + mkfs_cmd, native_sysroot) - +(rc, out) = exec_native_cmd(pseudo + mkfs_cmd, native_sysroot) +if rc: +print rootfs_dir: %s % rootfs_dir +msger.error(ERROR: mkfs.%s returned '%s' instead of 0 (which you probably don't want to ignore, use --debug for details) when creating filesystem from rootfs directory: %s % (self.fstype, rc, rootfs_dir)) # get the rootfs size in the right units for kickstart (Mb) du_cmd = du -Lbms %s % rootfs @@ -284,7 +286,9 @@ class Wic_PartData(Mic_PartData): mkfs_cmd = mkfs.%s -b %d -r %s %s % \ (self.fstype, rootfs_size * 1024, image_rootfs, rootfs) -exec_native_cmd(pseudo + mkfs_cmd, native_sysroot) +(rc, out) = exec_native_cmd(pseudo + mkfs_cmd, native_sysroot) +if rc: +msger.error(ERROR: mkfs.%s returned '%s' instead of 0 (which you probably don't want to ignore, use --debug for details) when creating filesystem from rootfs directory: %s % (self.fstype, rc, rootfs_dir)) # get the rootfs size in the right units for kickstart (Mb) du_cmd = du -Lbms %s % rootfs @@ -396,7 +400,9 @@ class Wic_PartData(Mic_PartData): extra_imagecmd = -i 8192 mkfs_cmd = mkfs.%s -F %s %s % (self.fstype, extra_imagecmd, fs) -exec_native_cmd(mkfs_cmd, native_sysroot) +(rc, out) = exec_native_cmd(mkfs_cmd, native_sysroot) +if rc: +msger.error(ERROR: mkfs.%s returned '%s' instead of 0 (which you probably don't want to ignore, use --debug for details) % (self.fstype, rc)) self.source_file = fs @@ -414,10 +420,14 @@ class Wic_PartData(Mic_PartData): exec_cmd(dd_cmd) mkfs_cmd = mkfs.%s -b %d %s % (self.fstype, self.size * 1024, rootfs) -exec_native_cmd(mkfs_cmd, native_sysroot) +(rc, out) = exec_native_cmd(mkfs_cmd, native_sysroot) +if rc: +msger.error(ERROR: mkfs.%s returned '%s' instead of 0 (which you probably don't want to ignore, use --debug for details) % (self.fstype, rc)) mkfs_cmd = mkfs.%s -F %s %s % (self.fstype, extra_imagecmd, fs) -exec_native_cmd(mkfs_cmd, native_sysroot) +(rc, out) = exec_native_cmd(mkfs_cmd, native_sysroot) +if rc: +msger.error(ERROR: mkfs.%s returned '%s' instead of 0 (which you probably don't want to ignore, use --debug for details) % (self.fstype, rc)) self.source_file = fs -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 06/11] babeltrace: Backport fix for unaligned integer
From: Saul Wold s...@linux.intel.com [YOCTO #6464] Signed-off-by: Saul Wold s...@linux.intel.com Signed-off-by: Armin Kuster akuster...@gmail.com --- ...n-t-perform-unaligned-integer-read-writes.patch | 252 + meta/recipes-kernel/lttng/babeltrace_1.2.1.bb | 1 + 2 files changed, 253 insertions(+) create mode 100644 meta/recipes-kernel/lttng/babeltrace/0001-Fix-don-t-perform-unaligned-integer-read-writes.patch diff --git a/meta/recipes-kernel/lttng/babeltrace/0001-Fix-don-t-perform-unaligned-integer-read-writes.patch b/meta/recipes-kernel/lttng/babeltrace/0001-Fix-don-t-perform-unaligned-integer-read-writes.patch new file mode 100644 index 000..ea0aad6 --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace/0001-Fix-don-t-perform-unaligned-integer-read-writes.patch @@ -0,0 +1,252 @@ +From 6a0b6cd5133db9e3c72914d4e5dd7fc792360934 Mon Sep 17 00:00:00 2001 +From: Mathieu Desnoyers mathieu.desnoy...@efficios.com +Date: Wed, 16 Jul 2014 10:58:48 -0400 +Subject: [PATCH] Fix: don't perform unaligned integer read/writes + +Signed-off-by: Mathieu Desnoyers mathieu.desnoy...@efficios.com + +Upstream-Status: Backport +Signed-off-by: Saul Wold s...@linux.intel.com + +--- + formats/ctf/types/integer.c | 108 + 1 file changed, 70 insertions(+), 38 deletions(-) + +diff --git a/formats/ctf/types/integer.c b/formats/ctf/types/integer.c +index 189943e..85931be 100644 +--- a/formats/ctf/types/integer.c b/formats/ctf/types/integer.c +@@ -62,7 +62,7 @@ int _aligned_integer_read(struct bt_stream_pos *ppos, + { + uint8_t v; + +- v = *(const uint8_t *) ctf_get_pos_addr(pos); ++ memcpy(v, ctf_get_pos_addr(pos), sizeof(v)); + integer_definition-value._unsigned = v; + break; + } +@@ -70,7 +70,7 @@ int _aligned_integer_read(struct bt_stream_pos *ppos, + { + uint16_t v; + +- v = *(const uint16_t *) ctf_get_pos_addr(pos); ++ memcpy(v, ctf_get_pos_addr(pos), sizeof(v)); + integer_definition-value._unsigned = + rbo ? GUINT16_SWAP_LE_BE(v) : v; + break; +@@ -79,7 +79,7 @@ int _aligned_integer_read(struct bt_stream_pos *ppos, + { + uint32_t v; + +- v = *(const uint32_t *) ctf_get_pos_addr(pos); ++ memcpy(v, ctf_get_pos_addr(pos), sizeof(v)); + integer_definition-value._unsigned = + rbo ? GUINT32_SWAP_LE_BE(v) : v; + break; +@@ -88,7 +88,7 @@ int _aligned_integer_read(struct bt_stream_pos *ppos, + { + uint64_t v; + +- v = *(const uint64_t *) ctf_get_pos_addr(pos); ++ memcpy(v, ctf_get_pos_addr(pos), sizeof(v)); + integer_definition-value._unsigned = + rbo ? GUINT64_SWAP_LE_BE(v) : v; + break; +@@ -102,7 +102,7 @@ int _aligned_integer_read(struct bt_stream_pos *ppos, + { + int8_t v; + +- v = *(const int8_t *) ctf_get_pos_addr(pos); ++ memcpy(v, ctf_get_pos_addr(pos), sizeof(v)); + integer_definition-value._signed = v; + break; + } +@@ -110,7 +110,7 @@ int _aligned_integer_read(struct bt_stream_pos *ppos, + { + int16_t v; + +- v = *(const int16_t *) ctf_get_pos_addr(pos); ++ memcpy(v, ctf_get_pos_addr(pos), sizeof(v)); + integer_definition-value._signed = + rbo ? (int16_t) GUINT16_SWAP_LE_BE(v) : v; + break; +@@ -119,7 +119,7 @@ int _aligned_integer_read(struct bt_stream_pos *ppos, + { + int32_t v; + +- v = *(const int32_t *) ctf_get_pos_addr(pos); ++ memcpy(v, ctf_get_pos_addr(pos), sizeof(v)); + integer_definition-value._signed = + rbo ? (int32_t) GUINT32_SWAP_LE_BE(v) : v; + break; +@@ -128,7 +128,7 @@ int _aligned_integer_read(struct bt_stream_pos *ppos, + { + int64_t v; + +- v = *(const int64_t *) ctf_get_pos_addr(pos); ++ memcpy(v, ctf_get_pos_addr(pos), sizeof(v)); + integer_definition-value._signed = + rbo ? (int64_t) GUINT64_SWAP_LE_BE(v) : v; + break; +@@ -163,48 +163,80 @@ int _aligned_integer_write(struct bt_stream_pos *ppos, + if (pos-dummy) + goto end
[OE-core] [PATCH 07/11] shadow-securetty: add ttyAM[0-3] serial ports
From: Javier Viguera javier.vigu...@digi.com Old version of the ARM AMBA serial port driver creates those device nodes. (From OE-Core rev: fa17b9ea435f5c49e3bea56524152b21d915d464) Signed-off-by: Javier Viguera javier.vigu...@digi.com Signed-off-by: Ross Burton ross.bur...@intel.com Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/recipes-extended/shadow/files/securetty | 4 1 file changed, 4 insertions(+) diff --git a/meta/recipes-extended/shadow/files/securetty b/meta/recipes-extended/shadow/files/securetty index 7fecda1..ecc246f 100644 --- a/meta/recipes-extended/shadow/files/securetty +++ b/meta/recipes-extended/shadow/files/securetty @@ -9,6 +9,10 @@ ttyS2 ttyS3 # ARM AMBA SoCs +ttyAM0 +ttyAM1 +ttyAM2 +ttyAM3 ttyAMA0 ttyAMA1 ttyAMA2 -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 08/11] python: Fix CVE-2014-7185
From: Wenzong Fan wenzong@windriver.com Integer overflow in bufferobject.c in Python before 2.7.8 allows context-dependent attackers to obtain sensitive information from process memory via a large size and offset in a buffer function. This back-ported patch fixes CVE-2014-7185 (From OE-Core rev: 49ceed974e39ab8ac4be410e5caa5e1ef7a646d9) Signed-off-by: Wenzong Fan wenzong@windriver.com Signed-off-by: Ross Burton ross.bur...@intel.com Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org Signed-off-by: Armin Kuster akuster...@gmail.com Conflicts: meta/recipes-devtools/python/python_2.7.3.bb hand merged bb file since I did not take previous patch. --- .../python/python/python-2.7.3-CVE-2014-7185.patch | 75 ++ meta/recipes-devtools/python/python_2.7.3.bb | 1 + 2 files changed, 76 insertions(+) create mode 100644 meta/recipes-devtools/python/python/python-2.7.3-CVE-2014-7185.patch diff --git a/meta/recipes-devtools/python/python/python-2.7.3-CVE-2014-7185.patch b/meta/recipes-devtools/python/python/python-2.7.3-CVE-2014-7185.patch new file mode 100644 index 000..60ef145 --- /dev/null +++ b/meta/recipes-devtools/python/python/python-2.7.3-CVE-2014-7185.patch @@ -0,0 +1,75 @@ +From 104eb318283dde5203aa6cf7384287bef181e308 Mon Sep 17 00:00:00 2001 +From: Wenzong Fan wenzong@windriver.com +Date: Wed, 12 Nov 2014 01:58:02 -0500 +Subject: [PATCH] python: fix CVE-2014-7185 + +Reference: http://bugs.python.org/issue21831 + +CVE-2014-7185: Integer overflow in bufferobject.c in Python before +2.7.8 allows context-dependent attackers to obtain sensitive +information from process memory via a large size and offset in a +buffer function. + +Upstream-Status: Backport + +Signed-off-by: Wenzong Fan wenzong@windriver.com +--- + Lib/test/test_buffer.py |6 ++ + Misc/NEWS |3 +++ + Objects/bufferobject.c |2 +- + 3 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/Lib/test/test_buffer.py b/Lib/test/test_buffer.py +index 6bdc34d..3ac1f8c 100644 +--- a/Lib/test/test_buffer.py b/Lib/test/test_buffer.py +@@ -4,6 +4,7 @@ For now, tests just new or changed functionality. + + + ++import sys + import unittest + from test import test_support + +@@ -21,6 +22,11 @@ class BufferTests(unittest.TestCase): + self.assertEqual(b[start:stop:step], + s[start:stop:step]) + ++def test_large_buffer_size_and_offset(self): ++data = bytearray('hola mundo') ++buf = buffer(data, sys.maxsize, sys.maxsize) ++self.assertEqual(buf[:4096], ) ++ + + def test_main(): + with test_support.check_py3k_warnings((buffer.. not supported, +diff --git a/Misc/NEWS b/Misc/NEWS +index e8778ad..77396c5 100644 +--- a/Misc/NEWS b/Misc/NEWS +@@ -1896,6 +1896,9 @@ What's New in Python 2.7 Release Candidate 1? + Core and Builtins + - + ++- Issue #21831: Avoid integer overflow when large sizes and offsets are given to ++ the buffer type. CVE-2014-7185. ++ + - Issue #8271: during the decoding of an invalid UTF-8 byte sequence, only the + start byte and the continuation byte(s) are now considered invalid, instead + of the number of bytes specified by the start byte. +diff --git a/Objects/bufferobject.c b/Objects/bufferobject.c +index c52f0bc..c542506 100644 +--- a/Objects/bufferobject.c b/Objects/bufferobject.c +@@ -88,7 +88,7 @@ get_buf(PyBufferObject *self, void **ptr, Py_ssize_t *size, + *size = count; + else + *size = self-b_size; +-if (offset + *size count) ++if (*size count - offset) + *size = count - offset; + } + return 1; +-- +1.7.9.5 + diff --git a/meta/recipes-devtools/python/python_2.7.3.bb b/meta/recipes-devtools/python/python_2.7.3.bb index cc92ebc..2547ea4 100644 --- a/meta/recipes-devtools/python/python_2.7.3.bb +++ b/meta/recipes-devtools/python/python_2.7.3.bb @@ -38,6 +38,7 @@ SRC_URI += \ file://python-2.7.3-CVE-2014-1912.patch \ file://json-flaw-fix.patch \ file://posix_close.patch \ + file://python-2.7.3-CVE-2014-7185.patch \ S = ${WORKDIR}/Python-${PV} -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 05/11] wic: Update bootimg-partition to use bootimg_dir
From: Tom Zanussi tom.zanu...@linux.intel.com Update bootimg-partition to use bootimg_dir instead of img_deploy_dir, to match similar usage in other plugins. As mentioned elsewhere, plugins should use the passed-in value for bootimg_dir directly if non-null, which corresponds to a user-assigned value specified via a -b command-line param, and only fetch the value from bitbake if that value is null. (From OE-Core rev: 3822f8a7b33da56ecd9144b4bcae50734fb1af81) Signed-off-by: Tom Zanussi tom.zanu...@linux.intel.com Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org Signed-off-by: Armin Kuster akuster...@gmail.com --- scripts/lib/wic/plugins/source/bootimg-partition.py | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/lib/wic/plugins/source/bootimg-partition.py b/scripts/lib/wic/plugins/source/bootimg-partition.py index cc72b2f..abf2494 100644 --- a/scripts/lib/wic/plugins/source/bootimg-partition.py +++ b/scripts/lib/wic/plugins/source/bootimg-partition.py @@ -71,8 +71,13 @@ class BootimgPartitionPlugin(SourcePlugin): install_cmd = install -d %s % hdddir exec_cmd(install_cmd) +if not bootimg_dir: +bootimg_dir = get_bitbake_var(DEPLOY_DIR_IMAGE) +if not bootimg_dir: +msger.error(Couldn't find DEPLOY_DIR_IMAGE, exiting\n) + msger.debug('Bootimg dir: %s' % bootimg_dir) -img_deploy_dir = get_bitbake_var(DEPLOY_DIR_IMAGE) + boot_files = get_bitbake_var(IMAGE_BOOT_FILES) if not boot_files: @@ -93,7 +98,7 @@ class BootimgPartitionPlugin(SourcePlugin): for deploy_entry in deploy_files: src, dst = deploy_entry -src_path = os.path.join(img_deploy_dir, src) +src_path = os.path.join(bootimg_dir, src) dst_path = os.path.join(hdddir, dst) msger.debug('Install %s as %s' % (os.path.basename(src_path), -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 04/11] wic: Remove special-case bootimg_dir
From: Tom Zanussi tom.zanu...@linux.intel.com The first iterations of wic very shortsightedly catered to two specific use-cases and added special-purpose params for those cases so that they could be directly given their corresponding boot artifacts. (hdddir and staging_data_dir). As more use-cases are added, it becomes rather obvious that such a scheme doens't scale, and additionally causes confusion for plugin writers. This removes those special cases and states explicitly in the help text that plugins are responsible for locating their own boot artifacts. (From OE-Core rev: 6ba3eb5ff7c47aee6b3419fb3a348a634fe74ac9) Signed-off-by: Tom Zanussi tom.zanu...@linux.intel.com Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org Signed-off-by: Armin Kuster akuster...@gmail.com --- scripts/lib/image/engine.py | 37 ++-- scripts/lib/image/help.py| 2 +- scripts/lib/wic/imager/direct.py | 5 +--- scripts/lib/wic/plugins/imager/direct_plugin.py | 20 + scripts/lib/wic/plugins/source/bootimg-efi.py| 5 ++-- scripts/lib/wic/plugins/source/bootimg-pcbios.py | 3 +- scripts/wic | 12 7 files changed, 27 insertions(+), 57 deletions(-) diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py index f1df8b4..e794545 100644 --- a/scripts/lib/image/engine.py +++ b/scripts/lib/image/engine.py @@ -67,7 +67,7 @@ def find_artifacts(image_name): bitbake_env_lines = get_bitbake_env_lines() -rootfs_dir = kernel_dir = hdddir = staging_data_dir = native_sysroot = +rootfs_dir = kernel_dir = bootimg_dir = native_sysroot = for line in bitbake_env_lines.split('\n'): if (get_line_val(line, IMAGE_ROOTFS)): @@ -76,17 +76,11 @@ def find_artifacts(image_name): if (get_line_val(line, STAGING_KERNEL_DIR)): kernel_dir = get_line_val(line, STAGING_KERNEL_DIR) continue -if (get_line_val(line, HDDDIR)): -hdddir = get_line_val(line, HDDDIR) -continue -if (get_line_val(line, STAGING_DATADIR)): -staging_data_dir = get_line_val(line, STAGING_DATADIR) -continue if (get_line_val(line, STAGING_DIR_NATIVE)): native_sysroot = get_line_val(line, STAGING_DIR_NATIVE) continue -return (rootfs_dir, kernel_dir, hdddir, staging_data_dir, native_sysroot) +return (rootfs_dir, kernel_dir, bootimg_dir, native_sysroot) CANNED_IMAGE_DIR = lib/image/canned-wks # relative to scripts @@ -185,18 +179,15 @@ def list_source_plugins(): def wic_create(args, wks_file, rootfs_dir, bootimg_dir, kernel_dir, - native_sysroot, hdddir, staging_data_dir, scripts_path, - image_output_dir, debug, properties_file, properties=None): - -Create image + native_sysroot, scripts_path, image_output_dir, debug, + properties_file, properties=None): +Create image wks_file - user-defined OE kickstart file rootfs_dir - absolute path to the build's /rootfs dir bootimg_dir - absolute path to the build's boot artifacts directory kernel_dir - absolute path to the build's kernel directory native_sysroot - absolute path to the build's native sysroots dir -hdddir - absolute path to the build's HDDDIR dir -staging_data_dir - absolute path to the build's STAGING_DATA_DIR dir scripts_path - absolute path to /scripts dir image_output_dir - dirname to create for image properties_file - use values from this file if nonempty i.e no prompting @@ -211,22 +202,14 @@ def wic_create(args, wks_file, rootfs_dir, bootimg_dir, kernel_dir, rootfs_dir:IMAGE_ROOTFS kernel_dir:STAGING_KERNEL_DIR native_sysroot:STAGING_DIR_NATIVE -hdddir:HDDDIR -staging_data_dir: STAGING_DATA_DIR -In the above case, bootimg_dir remains unset and the image -creation code determines which of the passed-in directories to -use. +In the above case, bootimg_dir remains unset and the +plugin-specific image creation code is responsible for finding the +bootimg artifacts. In the case where the values are passed in explicitly i.e 'wic -e' is not used but rather the individual 'wic' options are used to -explicitly specify these values, hdddir and staging_data_dir will -be unset, but bootimg_dir must be explicit i.e. explicitly set to -either hdddir or staging_data_dir, depending on the image being -generated. The other values (rootfs_dir, kernel_dir, and -native_sysroot) correspond to the same values found above via -'bitbake -e'). - +explicitly specify these values. try: oe_builddir = os.environ[BUILDDIR] @@ -242,8 +225,6 @@ def wic_create(args, wks_file, rootfs_dir, bootimg_dir, kernel_dir, direct_args.insert(0, bootimg_dir
[OE-core] [PATCH 02/11] wic: Update the help text to include -D (--debug)
From: Tom Zanussi tom.zanu...@linux.intel.com The --debug option is missing from the wic help text; this adds it and at the same time rearranges the usage into a more logical arrangement. (From OE-Core rev: cf5144ef241d8f4ccaa3461ae5c9f89c2cf2f8d1) Signed-off-by: Tom Zanussi tom.zanu...@linux.intel.com Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org Signed-off-by: Armin Kuster akuster...@gmail.com --- scripts/lib/image/help.py | 21 +++-- 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/scripts/lib/image/help.py b/scripts/lib/image/help.py index 080795e..0963532 100644 --- a/scripts/lib/image/help.py +++ b/scripts/lib/image/help.py @@ -109,8 +109,9 @@ wic_create_usage = usage: wic create wks file or image name [-o DIRNAME | --outdir DIRNAME] [-i JSON PROPERTY FILE | --infile JSON PROPERTY_FILE] -[-e | --image-name] [-r, --rootfs-dir] [-b, --bootimg-dir] -[-k, --kernel-dir] [-n, --native-sysroot] [-s, --skip-build-check] +[-e | --image-name] [-s, --skip-build-check] [-D, --debug] +[-r, --rootfs-dir] [-b, --bootimg-dir] +[-k, --kernel-dir] [-n, --native-sysroot] This command creates an OpenEmbedded image based on the 'OE kickstart commands' found in the wks file. @@ -129,8 +130,9 @@ NAME SYNOPSIS wic create wks file or image name [-o DIRNAME | --outdir DIRNAME] [-i JSON PROPERTY FILE | --infile JSON PROPERTY_FILE] -[-e | --image-name] [-r, --rootfs-dir] [-b, --bootimg-dir] -[-k, --kernel-dir] [-n, --native-sysroot] [-s, --skip-build-check] +[-e | --image-name] [-s, --skip-build-check] [-D, --debug] +[-r, --rootfs-dir] [-b, --bootimg-dir] +[-k, --kernel-dir] [-n, --native-sysroot] DESCRIPTION This command creates an OpenEmbedded image based on the 'OE @@ -172,6 +174,12 @@ DESCRIPTION explicitly, 'wic' assumes the user knows what he or she is doing and skips the build check. +The -D option is used to display debug information detailing +exactly what happens behind the scenes when a create request is +fulfilled (or not, as the case may be). It enumerates and +displays the command sequence used, and should be included in any +bug report describing unexpected results. + When 'wic -e' is used, the locations for the build artifacts values are determined by 'wic -e' from the output of the 'bitbake -e' command given an image name e.g. 'core-image-minimal' and a @@ -519,8 +527,9 @@ DESCRIPTION usage: wic create wks file or image name [-o DIRNAME | ...] [-i JSON PROPERTY FILE | --infile JSON PROPERTY_FILE] -[-e | --image-name] [-r, --rootfs-dir] [-b, --bootimg-dir] -[-k, --kernel-dir] [-n, --native-sysroot] [-s, --skip-build-check] +[-e | --image-name] [-s, --skip-build-check] [-D, --debug] +[-r, --rootfs-dir] [-b, --bootimg-dir] +[-k, --kernel-dir] [-n, --native-sysroot] This command creates an OpenEmbedded image based on the 'OE kickstart commands' found in the wks file. -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 03/11] Revert wic: set bootimg_dir when using image-name artifacts
From: Tom Zanussi tom.zanu...@linux.intel.com This reverts commit 7ce1dc13f91df70e8a2f420e7c3eba51cbc4bd48. This patch broke the assumption that a non-null boot_dir means a user-assigned (-b command-line param) value. Reverting doesn't break anything, since the case it was added for doesn't use the boot_dir for anything except debugging anyhow. Fixes [YOCTO #6290] (From OE-Core rev: db90f10bf31dec8d7d7bb2d3680d50e133662850) Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org Signed-off-by: Armin Kuster akuster...@gmail.com --- scripts/lib/image/engine.py | 9 ++--- scripts/wic | 7 +++ 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py index 3813fec..f1df8b4 100644 --- a/scripts/lib/image/engine.py +++ b/scripts/lib/image/engine.py @@ -67,8 +67,7 @@ def find_artifacts(image_name): bitbake_env_lines = get_bitbake_env_lines() -rootfs_dir = kernel_dir = bootimg_dir = -hdddir = staging_data_dir = native_sysroot = +rootfs_dir = kernel_dir = hdddir = staging_data_dir = native_sysroot = for line in bitbake_env_lines.split('\n'): if (get_line_val(line, IMAGE_ROOTFS)): @@ -86,12 +85,8 @@ def find_artifacts(image_name): if (get_line_val(line, STAGING_DIR_NATIVE)): native_sysroot = get_line_val(line, STAGING_DIR_NATIVE) continue -if (get_line_val(line, DEPLOY_DIR_IMAGE)): -bootimg_dir = get_line_val(line, DEPLOY_DIR_IMAGE) -continue -return (rootfs_dir, kernel_dir, bootimg_dir, hdddir, staging_data_dir, \ -native_sysroot) +return (rootfs_dir, kernel_dir, hdddir, staging_data_dir, native_sysroot) CANNED_IMAGE_DIR = lib/image/canned-wks # relative to scripts diff --git a/scripts/wic b/scripts/wic index 7314810..15cc9b3 100755 --- a/scripts/wic +++ b/scripts/wic @@ -134,8 +134,8 @@ def wic_create_subcommand(args, usage_str): bootimg_dir = staging_data_dir = hdddir = if options.image_name: -(rootfs_dir, kernel_dir, bootimg_dir, hdddir, \ - staging_data_dir, native_sysroot) = find_artifacts(options.image_name) +(rootfs_dir, kernel_dir, hdddir, staging_data_dir, native_sysroot) = \ +find_artifacts(options.image_name) wks_file = args[0] @@ -172,8 +172,7 @@ def wic_create_subcommand(args, usage_str): not_found = not_found_dir = if not os.path.isdir(rootfs_dir): (not_found, not_found_dir) = (rootfs-dir, rootfs_dir) -elif not os.path.isdir(bootimg_dir) and not os.path.isdir(hdddir) \ - and not os.path.isdir(staging_data_dir): +elif not os.path.isdir(hdddir) and not os.path.isdir(staging_data_dir): (not_found, not_found_dir) = (bootimg-dir, bootimg_dir) elif not os.path.isdir(kernel_dir): (not_found, not_found_dir) = (kernel-dir, kernel_dir) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 00/11] Dizzy next #2
Please consider these changes for the next Dizzy. The following changes since commit 85b8abe50482deaa1af62f265e82f53a54bbcd77: nss: define MP_USE_UINT_DIGIT when compile mpi_x86.s (2014-11-24 16:38:18 -0800) are available in the git repository at: git://git.yoctoproject.org/poky-contrib akuster/dizzy-next http://git.yoctoproject.org/cgit.cgi//log/?h=akuster/dizzy-next Andrei Gherzan (1): xkeyboard-config: Inherit gettext AnÃbal Limón (1): package_manager: DpkgPM fix populate_sdk Javier Viguera (1): shadow-securetty: add ttyAM[0-3] serial ports Robert Yang (1): qemu: disable the build for mips Saul Wold (1): babeltrace: Backport fix for unaligned integer Tom Zanussi (5): wic: Don't allow mkfs to fail silently in partition command wic: Update the help text to include -D (--debug) Revert wic: set bootimg_dir when using image-name artifacts wic: Remove special-case bootimg_dir wic: Update bootimg-partition to use bootimg_dir Wenzong Fan (1): python: Fix CVE-2014-7185 meta/lib/oe/package_manager.py | 2 +- .../python/python/python-2.7.3-CVE-2014-7185.patch | 75 ++ meta/recipes-devtools/python/python_2.7.3.bb | 1 + meta/recipes-devtools/qemu/qemu_2.1.0.bb | 1 + meta/recipes-devtools/qemu/qemu_git.bb | 1 + meta/recipes-extended/shadow/files/securetty | 4 + .../xorg-lib/xkeyboard-config_2.12.bb | 2 +- ...n-t-perform-unaligned-integer-read-writes.patch | 252 + meta/recipes-kernel/lttng/babeltrace_1.2.1.bb | 1 + scripts/lib/image/engine.py| 42 +--- scripts/lib/image/help.py | 23 +- scripts/lib/wic/imager/direct.py | 5 +- .../lib/wic/kickstart/custom_commands/partition.py | 22 +- scripts/lib/wic/plugins/imager/direct_plugin.py| 20 +- scripts/lib/wic/plugins/source/bootimg-efi.py | 5 +- .../lib/wic/plugins/source/bootimg-partition.py| 9 +- scripts/lib/wic/plugins/source/bootimg-pcbios.py | 3 +- scripts/wic| 13 +- 18 files changed, 402 insertions(+), 79 deletions(-) create mode 100644 meta/recipes-devtools/python/python/python-2.7.3-CVE-2014-7185.patch create mode 100644 meta/recipes-kernel/lttng/babeltrace/0001-Fix-don-t-perform-unaligned-integer-read-writes.patch -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 10/11] xkeyboard-config: Inherit gettext
From: Andrei Gherzan and...@gherzan.ro In a GPLv3-free build we have two different versions of gettext in sysroot due to GPLv3 restrictions. In this case we need gettext-native too so we can have the needed macros and avoid errors like: error: possibly undefined macro: AM_GNU_GETTEXT The needed dependency is added by gettext class which is prefered because it takes care of NLS flags too. (From OE-Core rev: 23d8a4d64e9ff126d6460a69e6d086b1c86e87a9) Signed-off-by: Andrei Gherzan andrei.gher...@windriver.com Signed-off-by: Ross Burton ross.bur...@intel.com Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/recipes-graphics/xorg-lib/xkeyboard-config_2.12.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.12.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.12.bb index 61e3847..adac0ee 100644 --- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.12.bb +++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.12.bb @@ -23,7 +23,7 @@ EXTRA_OECONF = --with-xkb-rules-symlink=xorg --disable-runtime-deps FILES_${PN} += ${datadir}/X11/xkb -inherit autotools pkgconfig +inherit autotools pkgconfig gettext do_install_append () { install -d ${D}${datadir}/X11/xkb/compiled -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 09/11] package_manager: DpkgPM fix populate_sdk
From: AnÃbal Limón anibal.li...@linux.intel.com DpkgPM change all_arch_list variable set from PACKAGE_ARCHS to passed archs variable because is different when is executed from rootfs.py and sdk.py. Credits to: Ricardo Ribalda ricardo.riba...@gmail.com (From OE-Core rev: f6fb8c16f49fd9a2b124ad55f5c4fed82d7e6dca) Signed-off-by: AnÃbal Limón anibal.li...@linux.intel.com Signed-off-by: Ross Burton ross.bur...@intel.com Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/lib/oe/package_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 27fdf26..19895e5 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -1477,7 +1477,7 @@ class DpkgPM(PackageManager): self.apt_args = d.getVar(APT_ARGS, True) -self.all_arch_list = self.d.getVar('PACKAGE_ARCHS', True).split() +self.all_arch_list = archs.split() all_mlb_pkg_arch_list = (self.d.getVar('ALL_MULTILIB_PACKAGE_ARCHS', True) or ).replace('-', '_').split() self.all_arch_list.extend(arch for arch in all_mlb_pkg_arch_list if arch not in self.all_arch_list) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 11/11] qemu: disable the build for mips
From: Robert Yang liezhi.y...@windriver.com Disable it since ICE on mips with wr toolchain only: translate.c:7838:1: internal compiler error: Segmentation fault Signed-off-by: Robert Yang liezhi.y...@windriver.com Signed-off-by: Mark Hatle mark.ha...@windriver.com Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/recipes-devtools/qemu/qemu_2.1.0.bb | 1 + meta/recipes-devtools/qemu/qemu_git.bb | 1 + 2 files changed, 2 insertions(+) diff --git a/meta/recipes-devtools/qemu/qemu_2.1.0.bb b/meta/recipes-devtools/qemu/qemu_2.1.0.bb index a82d052..e58829e 100644 --- a/meta/recipes-devtools/qemu/qemu_2.1.0.bb +++ b/meta/recipes-devtools/qemu/qemu_2.1.0.bb @@ -13,6 +13,7 @@ SRC_URI[md5sum] = 6726977292b448cbc7f89998fac6983b SRC_URI[sha256sum] = 397e23184f4bf613589a8fe0c6542461dc2afdf17ed337e97e6fd2f31e8f8802 COMPATIBLE_HOST_class-target_mips64 = null +COMPATIBLE_HOST_class-target_mips = null do_sanitize_sources() { # These .git files point to a nonexistent path ../.git/modules and will confuse git diff --git a/meta/recipes-devtools/qemu/qemu_git.bb b/meta/recipes-devtools/qemu/qemu_git.bb index a30932a..cefed90 100644 --- a/meta/recipes-devtools/qemu/qemu_git.bb +++ b/meta/recipes-devtools/qemu/qemu_git.bb @@ -13,3 +13,4 @@ S = ${WORKDIR}/git DEFAULT_PREFERENCE = -1 COMPATIBLE_HOST_class-target_mips64 = null +COMPATIBLE_HOST_class-target_mips = null -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] Dizzy-next merge request
Please consider these changes for Dizzy. The following changes since commit 9e8bb322154e67e521e8c982d20d46dda20c024b: babeltrace: Backport fix for unaligned integer (2014-11-26 17:05:47 +) are available in the git repository at: git://git.yoctoproject.org/poky-contrib akuster/dizzy-next http://git.yoctoproject.org/cgit.cgi//log/?h=akuster/dizzy-next Roy Li (1): gst-ffmpeg: fixes for CVE-2014-8548 and CVE-2014-8541 Tom Zanussi (1): wic: Use overhead factor when creating partitions from rootfs directories .../0001-avcodec-smc-fix-off-by-1-error.patch | 32 ++ ...egdec-check-bits-per-pixel-for-changes-si.patch | 68 ++ .../gstreamer/gst-ffmpeg_0.10.13.bb| 2 + .../lib/wic/kickstart/custom_commands/partition.py | 2 + scripts/lib/wic/utils/oe/misc.py | 1 + 5 files changed, 105 insertions(+) create mode 100644 meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-avcodec-smc-fix-off-by-1-error.patch create mode 100644 meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0002-avcodec-mjpegdec-check-bits-per-pixel-for-changes-si.patch -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] wic: Use overhead factor when creating partitions from rootfs directories
From: Tom Zanussi tom.zanu...@linux.intel.com When creating partitions sized to given rootfs directories, filesystem creation could fail in cases where the calculated target partition size was too small to contain the filesystem created using mkfs. This occurred in particular when creating partitions to contain very large filesystems such as those containing sdk image artifacts. This same limition is present in the oe-core image creation classes, which can be readily see by changing IMAGE_OVERHEAD_FACTOR from the default 1.3 to 1.0 and building a sato-sdk image. It should be possible to calculate required sizes exactly given the source rootfs and target filesystem types, but for now, to address the specific problem users are hitting in such situations, we'll just do exactly what oe-core does and define and use an IMAGE_OVERHEAD_FACTOR or 1.3 in those cases. Fixes [YOCTO #6863]. (From OE-Core rev: bbaef3ff5833fc1d97b7b028d7770834f62789da) Signed-off-by: Tom Zanussi tom.zanu...@linux.intel.com Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org Signed-off-by: Armin Kuster akuster...@gmail.com --- scripts/lib/wic/kickstart/custom_commands/partition.py | 2 ++ scripts/lib/wic/utils/oe/misc.py | 1 + 2 files changed, 3 insertions(+) diff --git a/scripts/lib/wic/kickstart/custom_commands/partition.py b/scripts/lib/wic/kickstart/custom_commands/partition.py index 3950b43..54a494e 100644 --- a/scripts/lib/wic/kickstart/custom_commands/partition.py +++ b/scripts/lib/wic/kickstart/custom_commands/partition.py @@ -229,6 +229,7 @@ class Wic_PartData(Mic_PartData): extra_blocks = IMAGE_EXTRA_SPACE rootfs_size = actual_rootfs_size + extra_blocks +rootfs_size *= IMAGE_OVERHEAD_FACTOR msger.debug(Added %d extra blocks to %s to get to %d total blocks % \ (extra_blocks, self.mountpoint, rootfs_size)) @@ -276,6 +277,7 @@ class Wic_PartData(Mic_PartData): extra_blocks = IMAGE_EXTRA_SPACE rootfs_size = actual_rootfs_size + extra_blocks +rootfs_size *= IMAGE_OVERHEAD_FACTOR msger.debug(Added %d extra blocks to %s to get to %d total blocks % \ (extra_blocks, self.mountpoint, rootfs_size)) diff --git a/scripts/lib/wic/utils/oe/misc.py b/scripts/lib/wic/utils/oe/misc.py index aa9b235..b0b5baa 100644 --- a/scripts/lib/wic/utils/oe/misc.py +++ b/scripts/lib/wic/utils/oe/misc.py @@ -123,6 +123,7 @@ def add_wks_var(key, val): BOOTDD_EXTRA_SPACE = 16384 IMAGE_EXTRA_SPACE = 10240 +IMAGE_OVERHEAD_FACTOR = 1.3 __bitbake_env_lines = -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] gst-ffmpeg: fixes for CVE-2014-8548 and CVE-2014-8541
From: Roy Li rongqing...@windriver.com Issue: LIN7-1755 Issue: LIN7-1739 http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-8541 libavcodec/mjpegdec.c in FFmpeg before 2.4.2 considers only dimension differences, and not bits-per-pixel differences, when determining whether an image size has changed, which allows remote attackers to cause a denial of service (out-of-bounds access) or possibly have unspecified other impact via crafted MJPEG data. http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-8548 Off-by-one error in libavcodec/smc.c in FFmpeg before 2.4.2 allows remote attackers to cause a denial of service (out-of-bounds access) or possibly have unspecified other impact via crafted Quicktime Graphics (aka SMC) video data. (From OE-Core rev: 4bd50c5a967af2b8f0fe77b8f9c100169e4fc531) Signed-off-by: Roy Li rongqing...@windriver.com Signed-off-by: Mark Hatle mark.ha...@windriver.com Signed-off-by: Ross Burton ross.bur...@intel.com Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org Signed-off-by: Armin Kuster akuster...@gmail.com --- .../0001-avcodec-smc-fix-off-by-1-error.patch | 32 ++ ...egdec-check-bits-per-pixel-for-changes-si.patch | 68 ++ .../gstreamer/gst-ffmpeg_0.10.13.bb| 2 + 3 files changed, 102 insertions(+) create mode 100644 meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-avcodec-smc-fix-off-by-1-error.patch create mode 100644 meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0002-avcodec-mjpegdec-check-bits-per-pixel-for-changes-si.patch diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-avcodec-smc-fix-off-by-1-error.patch b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-avcodec-smc-fix-off-by-1-error.patch new file mode 100644 index 000..3ca6fc4 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-avcodec-smc-fix-off-by-1-error.patch @@ -0,0 +1,32 @@ +From c17a0ad1df15a94d0b1239adc2afb593bdf0a153 Mon Sep 17 00:00:00 2001 +From: Michael Niedermayer michae...@gmx.at +Date: Fri, 3 Oct 2014 22:50:45 +0200 +Subject: [PATCH 1/2] avcodec/smc: fix off by 1 error + +Upstream-Status: Backport + +Fixes out of array access +Fixes: asan_heap-oob_1685bf0_5_asan_heap-oob_1f35116_430_smc.mov + +Found-by: Mateusz j00ru Jurczyk and Gynvael Coldwind +Signed-off-by: Michael Niedermayer michae...@gmx.at +--- + libavcodec/smc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gst-libs/ext/libav/libavcodec/smc.c b/gst-libs/ext/libav/libavcodec/smc.c +index 3cd5e53..dec9f71 100644 +--- a/gst-libs/ext/libav/libavcodec/smc.c b/gst-libs/ext/libav/libavcodec/smc.c +@@ -69,7 +69,7 @@ typedef struct SmcContext { + row_ptr += stride * 4; \ + } \ + total_blocks--; \ +-if (total_blocks 0) \ ++if (total_blocks 0 + !!n_blocks) \ + { \ + av_log(s-avctx, AV_LOG_INFO, warning: block counter just went negative (this should not happen)\n); \ + return; \ +-- +2.1.0 + diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0002-avcodec-mjpegdec-check-bits-per-pixel-for-changes-si.patch b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0002-avcodec-mjpegdec-check-bits-per-pixel-for-changes-si.patch new file mode 100644 index 000..c8bafd5 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0002-avcodec-mjpegdec-check-bits-per-pixel-for-changes-si.patch @@ -0,0 +1,68 @@ +From 6043c431c97d55173f339fafbd033d3c0642e2e9 Mon Sep 17 00:00:00 2001 +From: Michael Niedermayer michae...@gmx.at +Date: Fri, 3 Oct 2014 01:50:27 +0200 +Subject: [PATCH 2/2] avcodec/mjpegdec: check bits per pixel for changes + similar to dimensions + +Upstream-Status: Backport + +Fixes out of array accesses +Fixes: asan_heap-oob_16668e9_2_asan_heap-oob_16668e9_346_miss_congeniality_pegasus_mjpg.avi + +Found-by: Mateusz j00ru Jurczyk and Gynvael Coldwind +Signed-off-by: Michael Niedermayer michae...@gmx.at + +Conflicts: + libavcodec/mjpegdec.c +--- + libavcodec/mjpegdec.c | 15 --- + 1 file changed, 8 insertions(+), 7 deletions(-) + +diff --git a/gst-libs/ext/libav/libavcodec/mjpegdec.c b/gst-libs/ext/libav/libavcodec/mjpegdec.c +index 84343c0..c0137d8 100644 +--- a/gst-libs/ext/libav/libavcodec/mjpegdec.c b/gst-libs/ext/libav/libavcodec/mjpegdec.c +@@ -210,16 +210,16 @@ int ff_mjpeg_decode_dht(MJpegDecodeContext *s) + + int ff_mjpeg_decode_sof(MJpegDecodeContext *s) + { +-int len, nb_components, i, width, height, pix_fmt_id; ++int len, nb_components, i, bits, width, height, pix_fmt_id; + + /* XXX: verify len field validity */ + len = get_bits(s-gb, 16); +-s-bits= get_bits(s-gb, 8); ++bits= get_bits(s-gb, 8); + +-if(s-pegasus_rct) s-bits=9; +-if(s-bits==9 !s-pegasus_rct) s-rct=1;//FIXME ugly ++if(s-pegasus_rct) bits=9; ++if(bits==9 !s-pegasus_rct) s-rct=1;//FIXME ugly + +-if (s-bits != 8 !s-lossless
[OE-core] [PATCH 1/1] kernel.bbclass: Create modules directory even if there is no modules installed
From: He Zhe zhe...@windriver.com During kernel_do_install it needs to make symbol link at ${D}/lib/modules/${KERNEL_VERSION}/build, but there will not be ${D}/lib/modules/${KERNEL_VERSION} if there is no modules installed for current image, which will result in a build failure. Add mkdir -p ${D}/lib/modules/${KERNEL_VERSION} here to avoid this failure and the need of similar changes in other scripts that also expect it to exist. (From OE-Core rev: f2f72f8ff623d24fffbb1b0ad40bc08f05ff31dd) Signed-off-by: He Zhe zhe...@windriver.com Signed-off-by: Ross Burton ross.bur...@intel.com Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/classes/kernel.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index f300fa3..fa06c3a 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -213,6 +213,7 @@ kernel_do_install() { # kerneldir=${D}${KERNEL_SRC_PATH} install -d $kerneldir + mkdir -p ${D}/lib/modules/${KERNEL_VERSION} ln -sf ${KERNEL_SRC_PATH} ${D}/lib/modules/${KERNEL_VERSION}/build # -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] Dizzy-next merge request
one more merge The following changes since commit be128c799489b95b740f2803c16e047a1f307781: gst-ffmpeg: fixes for CVE-2014-8548 and CVE-2014-8541 (2014-12-03 08:01:28 -0800) are available in the git repository at: git://git.yoctoproject.org/poky-contrib akuster/dizzy-next http://git.yoctoproject.org/cgit.cgi//log/?h=akuster/dizzy-next He Zhe (1): kernel.bbclass: Create modules directory even if there is no modules installed meta/classes/kernel.bbclass | 1 + 1 file changed, 1 insertion(+) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [[PATCH] gnutls: upgrade to 3.3.11
this also includes a fix for CVE-2014-8564. see http://www.gnutls.org/security.html for CVE-2014-3566 POODLE statement. Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/recipes-support/gnutls/gnutls_3.3.11.bb | 6 ++ meta/recipes-support/gnutls/gnutls_3.3.5.bb | 7 --- 2 files changed, 6 insertions(+), 7 deletions(-) create mode 100644 meta/recipes-support/gnutls/gnutls_3.3.11.bb delete mode 100644 meta/recipes-support/gnutls/gnutls_3.3.5.bb diff --git a/meta/recipes-support/gnutls/gnutls_3.3.11.bb b/meta/recipes-support/gnutls/gnutls_3.3.11.bb new file mode 100644 index 000..320c510 --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls_3.3.11.bb @@ -0,0 +1,6 @@ +require gnutls.inc + +SRC_URI += file://correct_rpl_gettimeofday_signature.patch \ + +SRC_URI[md5sum] = b657e3010c10cae2244e7ce79ee3d446 +SRC_URI[sha256sum] = aef28d629b6ba824bd435f9b23506525e657e3746d4aa021296b13cbaaa6ae71 diff --git a/meta/recipes-support/gnutls/gnutls_3.3.5.bb b/meta/recipes-support/gnutls/gnutls_3.3.5.bb deleted file mode 100644 index b3daa49..000 --- a/meta/recipes-support/gnutls/gnutls_3.3.5.bb +++ /dev/null @@ -1,7 +0,0 @@ -require gnutls.inc - -SRC_URI += file://correct_rpl_gettimeofday_signature.patch \ - - -SRC_URI[md5sum] = 1f396dcf3c14ea67de7243821006d1a2 -SRC_URI[sha256sum] = 48f34ae032692c498e782e9f1369506572be40ecf7f3f3604b0b00bad1b10477 -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] Dizzy next Dec 15th
Please consider these changes for Dizzy-next This is on top of two previous requests: http://patches.openembedded.org/patch/84363/ http://patches.openembedded.org/patch/84341/ The following changes since commit 60099987b11757ddf940fe4d61cac92c48bcc3e7: cpio: fix bug CVE-2014-9112 for cpio-2.8 (2014-12-15 08:28:35 -0800) are available in the git repository at: http://git.yoctoproject.org/git/poky-contrib akuster/dizzy-next http://git.yoctoproject.org/cgit.cgi//log/?h=akuster/dizzy-next Bian Naimeng (1): cpio: fix bug CVE-2014-9112 for cpio-2.11 Maxin B. John (1): python: fix ssl import error .../python/python-2.7-manifest.inc | 2 +- .../cpio/cpio-2.11/fix-memory-overrun.patch| 220 + meta/recipes-extended/cpio/cpio_2.11.bb| 3 +- scripts/contrib/python/generate-manifest-2.7.py| 2 +- 4 files changed, 224 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-extended/cpio/cpio-2.11/fix-memory-overrun.patch -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] cpio: fix bug CVE-2014-9112 for cpio-2.11
From: Bian Naimeng bia...@cn.fujitsu.com Obtain detain from following URL. http://lists.gnu.org/archive/html/bug-cpio/2014-12/msg0.html http://git.savannah.gnu.org/cgit/cpio.git/commit/?id=746f3ff670dcfcdd28fcc990e79cd6fccc7ae48d (From OE-Core rev: 9a32da05f5a9bc62c592fd2d6057dc052e363261) Signed-off-by: Bian Naimeng bia...@cn.fujitsu.com Signed-off-by: Ross Burton ross.bur...@intel.com Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org Signed-off-by: Armin Kuster akuster...@gmail.com --- .../cpio/cpio-2.11/fix-memory-overrun.patch| 220 + meta/recipes-extended/cpio/cpio_2.11.bb| 3 +- 2 files changed, 222 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/cpio/cpio-2.11/fix-memory-overrun.patch diff --git a/meta/recipes-extended/cpio/cpio-2.11/fix-memory-overrun.patch b/meta/recipes-extended/cpio/cpio-2.11/fix-memory-overrun.patch new file mode 100644 index 000..89cd3cf --- /dev/null +++ b/meta/recipes-extended/cpio/cpio-2.11/fix-memory-overrun.patch @@ -0,0 +1,220 @@ +cpio: Fix memory overrun on reading improperly created link records + +Signed-off-by: Bian Naimeng bia...@cn.fujitsu.com + +http://git.savannah.gnu.org/cgit/cpio.git/commit/?id=746f3ff670dcfcdd28fcc990e79cd6fccc7ae48d + + * src/copyin.c (get_link_name): New function. + (list_file, copyin_link): use get_link_name + + * tests/symlink-bad-length.at: New file. + * tests/symlink-long.at: New file. + * tests/Makefile.am: Add new files. + * tests/testsuite.at: Likewise. + + See http://lists.gnu.org/archive/html/bug-cpio/2014-11/msg7.html + +Upstream-Status: Backport + +Signed-off-by: Sergey Poznyakoff g...@gnu.org.ua + +diff -Nurp cpio-2.11.orig/src/copyin.c cpio-2.11/src/copyin.c +--- cpio-2.11.orig/src/copyin.c2010-02-15 18:02:23.0 +0800 cpio-2.11/src/copyin.c 2014-12-08 13:14:04.355547508 +0800 +@@ -126,6 +126,28 @@ tape_skip_padding (int in_file_des, off_ + } + + ++static char * ++get_link_name (struct cpio_file_stat *file_hdr, int in_file_des) ++{ ++ off_t n = file_hdr-c_filesize + 1; ++ char *link_name; ++ ++ if (n == 0 || n SIZE_MAX) ++{ ++ error (0, 0, _(%s: stored filename length too big), file_hdr-c_name); ++ link_name = NULL; ++} ++ else ++{ ++ link_name = xmalloc (n); ++ tape_buffered_read (link_name, in_file_des, file_hdr-c_filesize); ++ link_name[file_hdr-c_filesize] = '\0'; ++ tape_skip_padding (in_file_des, file_hdr-c_filesize); ++} ++ return link_name; ++} ++ ++ + static void + list_file(struct cpio_file_stat* file_hdr, int in_file_des) + { +@@ -136,21 +158,16 @@ list_file(struct cpio_file_stat* file_hd + { + if (archive_format != arf_tar archive_format != arf_ustar) + { +-char *link_name = NULL; /* Name of hard and symbolic links. */ +- +-link_name = (char *) xmalloc ((unsigned int) file_hdr-c_filesize + 1); +-link_name[file_hdr-c_filesize] = '\0'; +-tape_buffered_read (link_name, in_file_des, file_hdr-c_filesize); +-long_format (file_hdr, link_name); +-free (link_name); +-tape_skip_padding (in_file_des, file_hdr-c_filesize); +-return; ++char *link_name = get_link_name (file_hdr, in_file_des); ++if (link_name) ++ { ++long_format (file_hdr, link_name); ++free (link_name); ++ } + } + else +- { + long_format (file_hdr, file_hdr-c_tar_linkname); +-return; +- } ++return; + } + else + #endif +@@ -650,10 +667,7 @@ copyin_link(struct cpio_file_stat *file_ + + if (archive_format != arf_tar archive_format != arf_ustar) + { +- link_name = (char *) xmalloc ((unsigned int) file_hdr-c_filesize + 1); +- link_name[file_hdr-c_filesize] = '\0'; +- tape_buffered_read (link_name, in_file_des, file_hdr-c_filesize); +- tape_skip_padding (in_file_des, file_hdr-c_filesize); ++ link_name = get_link_name (file_hdr, in_file_des); + } + else + { +diff -Nurp cpio-2.11.orig/tests/Makefile.am cpio-2.11/tests/Makefile.am +--- cpio-2.11.orig/tests/Makefile.am 2010-02-15 18:02:23.0 +0800 cpio-2.11/tests/Makefile.am2014-12-08 13:14:49.931545727 +0800 +@@ -52,6 +52,8 @@ TESTSUITE_AT = \ + setstat04.at\ + setstat05.at\ + symlink.at\ ++ symlink-bad-length.at\ ++ symlink-long.at\ + version.at + + TESTSUITE = $(srcdir)/testsuite +diff -Nurp cpio-2.11.orig/tests/symlink-bad-length.at cpio-2.11/tests/symlink-bad-length.at +--- cpio-2.11.orig/tests/symlink-bad-length.at 1970-01-01 08:00:00.0 +0800 cpio-2.11/tests/symlink-bad-length.at 2014-12-08 13:17:45.979538847 +0800 +@@ -0,0 +1,49 @@ ++# Process this file with autom4te to create testsuite. -*- Autotest -*- ++# Copyright (C) 2014 Free Software Foundation, Inc
[OE-core] [PATCH 2/2] python: fix ssl import error
From: Maxin B. John maxin.j...@enea.com Fix this ssl import error: Python 2.7.3 (default, Dec 5 2014, 16:24:17) [GCC 4.9.1] on linux2 Type help, copyright, credits or license for more information. import ssl Traceback (most recent call last): File stdin, line 1, in module File /usr/lib/python2.7/ssl.py, line 92, in module import base64# for DER-to-PEM translation ImportError: No module named base64 (From OE-Core rev: dfa34e70a4c7543dc67835c2e9a270ccd011ac72) Signed-off-by: Maxin B. John maxin.j...@enea.com Signed-off-by: Ross Burton ross.bur...@intel.com Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/recipes-devtools/python/python-2.7-manifest.inc | 2 +- scripts/contrib/python/generate-manifest-2.7.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/python/python-2.7-manifest.inc b/meta/recipes-devtools/python/python-2.7-manifest.inc index a8afe13..9a514b1 100644 --- a/meta/recipes-devtools/python/python-2.7-manifest.inc +++ b/meta/recipes-devtools/python/python-2.7-manifest.inc @@ -122,7 +122,7 @@ RDEPENDS_${PN}-importlib=${PN}-core FILES_${PN}-importlib=${libdir}/python2.7/importlib SUMMARY_${PN}-io=Python low-level I/O -RDEPENDS_${PN}-io=${PN}-core ${PN}-math ${PN}-textutils +RDEPENDS_${PN}-io=${PN}-core ${PN}-math ${PN}-textutils ${PN}-netclient FILES_${PN}-io=${libdir}/python2.7/lib-dynload/_socket.so ${libdir}/python2.7/lib-dynload/_io.so ${libdir}/python2.7/lib-dynload/_ssl.so ${libdir}/python2.7/lib-dynload/select.so ${libdir}/python2.7/lib-dynload/termios.so ${libdir}/python2.7/lib-dynload/cStringIO.so ${libdir}/python2.7/pipes.* ${libdir}/python2.7/socket.* ${libdir}/python2.7/ssl.* ${libdir}/python2.7/tempfile.* ${libdir}/python2.7/StringIO.* ${libdir}/python2.7/io.* ${libdir}/python2.7/_pyio.* SUMMARY_${PN}-json=Python JSON support diff --git a/scripts/contrib/python/generate-manifest-2.7.py b/scripts/contrib/python/generate-manifest-2.7.py index 65486d8..21b874f 100755 --- a/scripts/contrib/python/generate-manifest-2.7.py +++ b/scripts/contrib/python/generate-manifest-2.7.py @@ -275,7 +275,7 @@ if __name__ == __main__: m.addPackage( ${PN}-image, Python graphical image handling, ${PN}-core, colorsys.* imghdr.* lib-dynload/imageop.so lib-dynload/rgbimg.so ) -m.addPackage( ${PN}-io, Python low-level I/O, ${PN}-core ${PN}-math ${PN}-textutils, +m.addPackage( ${PN}-io, Python low-level I/O, ${PN}-core ${PN}-math ${PN}-textutils ${PN}-netclient, lib-dynload/_socket.so lib-dynload/_io.so lib-dynload/_ssl.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so + pipes.* socket.* ssl.* tempfile.* StringIO.* io.* _pyio.* ) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] cpio: fix bug CVE-2014-9112 for cpio-2.11
From: Bian Naimeng bia...@cn.fujitsu.com Obtain detain from following URL. http://lists.gnu.org/archive/html/bug-cpio/2014-12/msg0.html http://git.savannah.gnu.org/cgit/cpio.git/commit/?id=746f3ff670dcfcdd28fcc990e79cd6fccc7ae48d (From OE-Core rev: 9a32da05f5a9bc62c592fd2d6057dc052e363261) Signed-off-by: Bian Naimeng bia...@cn.fujitsu.com Signed-off-by: Ross Burton ross.bur...@intel.com Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org Signed-off-by: Armin Kuster akuster...@gmail.com --- .../cpio/cpio-2.11/fix-memory-overrun.patch| 220 + meta/recipes-extended/cpio/cpio_2.11.bb| 3 +- 2 files changed, 222 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/cpio/cpio-2.11/fix-memory-overrun.patch diff --git a/meta/recipes-extended/cpio/cpio-2.11/fix-memory-overrun.patch b/meta/recipes-extended/cpio/cpio-2.11/fix-memory-overrun.patch new file mode 100644 index 000..89cd3cf --- /dev/null +++ b/meta/recipes-extended/cpio/cpio-2.11/fix-memory-overrun.patch @@ -0,0 +1,220 @@ +cpio: Fix memory overrun on reading improperly created link records + +Signed-off-by: Bian Naimeng bia...@cn.fujitsu.com + +http://git.savannah.gnu.org/cgit/cpio.git/commit/?id=746f3ff670dcfcdd28fcc990e79cd6fccc7ae48d + + * src/copyin.c (get_link_name): New function. + (list_file, copyin_link): use get_link_name + + * tests/symlink-bad-length.at: New file. + * tests/symlink-long.at: New file. + * tests/Makefile.am: Add new files. + * tests/testsuite.at: Likewise. + + See http://lists.gnu.org/archive/html/bug-cpio/2014-11/msg7.html + +Upstream-Status: Backport + +Signed-off-by: Sergey Poznyakoff g...@gnu.org.ua + +diff -Nurp cpio-2.11.orig/src/copyin.c cpio-2.11/src/copyin.c +--- cpio-2.11.orig/src/copyin.c2010-02-15 18:02:23.0 +0800 cpio-2.11/src/copyin.c 2014-12-08 13:14:04.355547508 +0800 +@@ -126,6 +126,28 @@ tape_skip_padding (int in_file_des, off_ + } + + ++static char * ++get_link_name (struct cpio_file_stat *file_hdr, int in_file_des) ++{ ++ off_t n = file_hdr-c_filesize + 1; ++ char *link_name; ++ ++ if (n == 0 || n SIZE_MAX) ++{ ++ error (0, 0, _(%s: stored filename length too big), file_hdr-c_name); ++ link_name = NULL; ++} ++ else ++{ ++ link_name = xmalloc (n); ++ tape_buffered_read (link_name, in_file_des, file_hdr-c_filesize); ++ link_name[file_hdr-c_filesize] = '\0'; ++ tape_skip_padding (in_file_des, file_hdr-c_filesize); ++} ++ return link_name; ++} ++ ++ + static void + list_file(struct cpio_file_stat* file_hdr, int in_file_des) + { +@@ -136,21 +158,16 @@ list_file(struct cpio_file_stat* file_hd + { + if (archive_format != arf_tar archive_format != arf_ustar) + { +-char *link_name = NULL; /* Name of hard and symbolic links. */ +- +-link_name = (char *) xmalloc ((unsigned int) file_hdr-c_filesize + 1); +-link_name[file_hdr-c_filesize] = '\0'; +-tape_buffered_read (link_name, in_file_des, file_hdr-c_filesize); +-long_format (file_hdr, link_name); +-free (link_name); +-tape_skip_padding (in_file_des, file_hdr-c_filesize); +-return; ++char *link_name = get_link_name (file_hdr, in_file_des); ++if (link_name) ++ { ++long_format (file_hdr, link_name); ++free (link_name); ++ } + } + else +- { + long_format (file_hdr, file_hdr-c_tar_linkname); +-return; +- } ++return; + } + else + #endif +@@ -650,10 +667,7 @@ copyin_link(struct cpio_file_stat *file_ + + if (archive_format != arf_tar archive_format != arf_ustar) + { +- link_name = (char *) xmalloc ((unsigned int) file_hdr-c_filesize + 1); +- link_name[file_hdr-c_filesize] = '\0'; +- tape_buffered_read (link_name, in_file_des, file_hdr-c_filesize); +- tape_skip_padding (in_file_des, file_hdr-c_filesize); ++ link_name = get_link_name (file_hdr, in_file_des); + } + else + { +diff -Nurp cpio-2.11.orig/tests/Makefile.am cpio-2.11/tests/Makefile.am +--- cpio-2.11.orig/tests/Makefile.am 2010-02-15 18:02:23.0 +0800 cpio-2.11/tests/Makefile.am2014-12-08 13:14:49.931545727 +0800 +@@ -52,6 +52,8 @@ TESTSUITE_AT = \ + setstat04.at\ + setstat05.at\ + symlink.at\ ++ symlink-bad-length.at\ ++ symlink-long.at\ + version.at + + TESTSUITE = $(srcdir)/testsuite +diff -Nurp cpio-2.11.orig/tests/symlink-bad-length.at cpio-2.11/tests/symlink-bad-length.at +--- cpio-2.11.orig/tests/symlink-bad-length.at 1970-01-01 08:00:00.0 +0800 cpio-2.11/tests/symlink-bad-length.at 2014-12-08 13:17:45.979538847 +0800 +@@ -0,0 +1,49 @@ ++# Process this file with autom4te to create testsuite. -*- Autotest -*- ++# Copyright (C) 2014 Free Software Foundation, Inc
[OE-core] [PATCH 1/3] cpio: fix bug CVE-2014-9112 for cpio-2.8
From: Bian Naimeng bia...@cn.fujitsu.com Obtain detain from following URL. http://lists.gnu.org/archive/html/bug-cpio/2014-12/msg0.html http://git.savannah.gnu.org/cgit/cpio.git/commit/?id=746f3ff670dcfcdd28fcc990e79cd6fccc7ae48d (From OE-Core rev: 732fc8de55a9c7987608162879959c03423de907) Signed-off-by: Bian Naimeng bia...@cn.fujitsu.com Signed-off-by: Ross Burton ross.bur...@intel.com Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org Signed-off-by: Armin Kuster akuster...@gmail.com --- .../cpio/cpio-2.8/fix-memory-overrun.patch | 217 + meta/recipes-extended/cpio/cpio_2.8.bb | 7 +- 2 files changed, 221 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-extended/cpio/cpio-2.8/fix-memory-overrun.patch diff --git a/meta/recipes-extended/cpio/cpio-2.8/fix-memory-overrun.patch b/meta/recipes-extended/cpio/cpio-2.8/fix-memory-overrun.patch new file mode 100644 index 000..0148e70 --- /dev/null +++ b/meta/recipes-extended/cpio/cpio-2.8/fix-memory-overrun.patch @@ -0,0 +1,217 @@ +cpio: Fix memory overrun on reading improperly created link records + +Signed-off-by: Bian Naimeng bia...@cn.fujitsu.com + +http://git.savannah.gnu.org/cgit/cpio.git/commit/?id=746f3ff670dcfcdd28fcc990e79cd6fccc7ae48d + + * src/copyin.c (get_link_name): New function. + (list_file, copyin_link): use get_link_name + + * tests/symlink-bad-length.at: New file. + * tests/symlink-long.at: New file. + * tests/Makefile.am: Add new files. + * tests/testsuite.at: Likewise. + + See http://lists.gnu.org/archive/html/bug-cpio/2014-11/msg7.html + +Upstream-Status: Backport + +Signed-off-by: Sergey Poznyakoff g...@gnu.org.ua + +diff -Nurp cpio-2.8.orig/src/copyin.c cpio-2.8/src/copyin.c +--- cpio-2.8.orig/src/copyin.c 2007-06-07 19:58:03.0 +0800 cpio-2.8/src/copyin.c 2014-12-08 11:30:01.159791484 +0800 +@@ -126,6 +126,28 @@ tape_skip_padding (int in_file_des, int + } + + ++static char * ++get_link_name (struct cpio_file_stat *file_hdr, int in_file_des) ++{ ++ off_t n = file_hdr-c_filesize + 1; ++ char *link_name; ++ ++ if (n == 0 || n SIZE_MAX) ++{ ++ error (0, 0, _(%s: stored filename length too big), file_hdr-c_name); ++ link_name = NULL; ++} ++ else ++{ ++ link_name = xmalloc (n); ++ tape_buffered_read (link_name, in_file_des, file_hdr-c_filesize); ++ link_name[file_hdr-c_filesize] = '\0'; ++ tape_skip_padding (in_file_des, file_hdr-c_filesize); ++} ++ return link_name; ++} ++ ++ + static void + list_file(struct cpio_file_stat* file_hdr, int in_file_des) + { +@@ -136,21 +158,16 @@ list_file(struct cpio_file_stat* file_hd + { + if (archive_format != arf_tar archive_format != arf_ustar) + { +-char *link_name = NULL; /* Name of hard and symbolic links. */ +- +-link_name = (char *) xmalloc ((unsigned int) file_hdr-c_filesize + 1); +-link_name[file_hdr-c_filesize] = '\0'; +-tape_buffered_read (link_name, in_file_des, file_hdr-c_filesize); +-long_format (file_hdr, link_name); +-free (link_name); +-tape_skip_padding (in_file_des, file_hdr-c_filesize); +-return; ++char *link_name = get_link_name (file_hdr, in_file_des); ++if (link_name) ++ { ++long_format (file_hdr, link_name); ++free (link_name); ++ } + } + else +- { + long_format (file_hdr, file_hdr-c_tar_linkname); +-return; +- } ++return; + } + else + #endif +@@ -732,10 +749,7 @@ copyin_link(struct cpio_file_stat *file_ + + if (archive_format != arf_tar archive_format != arf_ustar) + { +- link_name = (char *) xmalloc ((unsigned int) file_hdr-c_filesize + 1); +- link_name[file_hdr-c_filesize] = '\0'; +- tape_buffered_read (link_name, in_file_des, file_hdr-c_filesize); +- tape_skip_padding (in_file_des, file_hdr-c_filesize); ++ link_name = get_link_name (file_hdr, in_file_des); + } + else + { +diff -Nurp cpio-2.8.orig/tests/Makefile.am cpio-2.8/tests/Makefile.am +--- cpio-2.8.orig/tests/Makefile.am2006-10-24 18:32:13.0 +0800 cpio-2.8/tests/Makefile.am 2014-12-08 11:30:52.387789482 +0800 +@@ -45,6 +45,8 @@ TESTSUITE_AT = \ + testsuite.at\ + inout.at\ + symlink.at\ ++ symlink-bad-length.at\ ++ symlink-long.at\ + version.at + + TESTSUITE = $(srcdir)/testsuite +diff -Nurp cpio-2.8.orig/tests/symlink-bad-length.at cpio-2.8/tests/symlink-bad-length.at +--- cpio-2.8.orig/tests/symlink-bad-length.at 1970-01-01 08:00:00.0 +0800 cpio-2.8/tests/symlink-bad-length.at 2014-12-08 11:33:25.283783507 +0800 +@@ -0,0 +1,49 @@ ++# Process this file with autom4te to create testsuite. -*- Autotest -*- ++# Copyright (C) 2014 Free Software Foundation, Inc. ++ ++# This program is free software
[OE-core] [PATCH 3/3] python: fix ssl import error
From: Maxin B. John maxin.j...@enea.com Fix this ssl import error: Python 2.7.3 (default, Dec 5 2014, 16:24:17) [GCC 4.9.1] on linux2 Type help, copyright, credits or license for more information. import ssl Traceback (most recent call last): File stdin, line 1, in module File /usr/lib/python2.7/ssl.py, line 92, in module import base64# for DER-to-PEM translation ImportError: No module named base64 (From OE-Core rev: dfa34e70a4c7543dc67835c2e9a270ccd011ac72) Signed-off-by: Maxin B. John maxin.j...@enea.com Signed-off-by: Ross Burton ross.bur...@intel.com Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/recipes-devtools/python/python-2.7-manifest.inc | 2 +- scripts/contrib/python/generate-manifest-2.7.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/python/python-2.7-manifest.inc b/meta/recipes-devtools/python/python-2.7-manifest.inc index a8afe13..9a514b1 100644 --- a/meta/recipes-devtools/python/python-2.7-manifest.inc +++ b/meta/recipes-devtools/python/python-2.7-manifest.inc @@ -122,7 +122,7 @@ RDEPENDS_${PN}-importlib=${PN}-core FILES_${PN}-importlib=${libdir}/python2.7/importlib SUMMARY_${PN}-io=Python low-level I/O -RDEPENDS_${PN}-io=${PN}-core ${PN}-math ${PN}-textutils +RDEPENDS_${PN}-io=${PN}-core ${PN}-math ${PN}-textutils ${PN}-netclient FILES_${PN}-io=${libdir}/python2.7/lib-dynload/_socket.so ${libdir}/python2.7/lib-dynload/_io.so ${libdir}/python2.7/lib-dynload/_ssl.so ${libdir}/python2.7/lib-dynload/select.so ${libdir}/python2.7/lib-dynload/termios.so ${libdir}/python2.7/lib-dynload/cStringIO.so ${libdir}/python2.7/pipes.* ${libdir}/python2.7/socket.* ${libdir}/python2.7/ssl.* ${libdir}/python2.7/tempfile.* ${libdir}/python2.7/StringIO.* ${libdir}/python2.7/io.* ${libdir}/python2.7/_pyio.* SUMMARY_${PN}-json=Python JSON support diff --git a/scripts/contrib/python/generate-manifest-2.7.py b/scripts/contrib/python/generate-manifest-2.7.py index 65486d8..21b874f 100755 --- a/scripts/contrib/python/generate-manifest-2.7.py +++ b/scripts/contrib/python/generate-manifest-2.7.py @@ -275,7 +275,7 @@ if __name__ == __main__: m.addPackage( ${PN}-image, Python graphical image handling, ${PN}-core, colorsys.* imghdr.* lib-dynload/imageop.so lib-dynload/rgbimg.so ) -m.addPackage( ${PN}-io, Python low-level I/O, ${PN}-core ${PN}-math ${PN}-textutils, +m.addPackage( ${PN}-io, Python low-level I/O, ${PN}-core ${PN}-math ${PN}-textutils ${PN}-netclient, lib-dynload/_socket.so lib-dynload/_io.so lib-dynload/_ssl.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so + pipes.* socket.* ssl.* tempfile.* StringIO.* io.* _pyio.* ) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] Dizzy next Dec 15th V2
opps, off-by-1 error. Please consider these changes for Dizzy-next This is on top of two previous requests: http://patches.openembedded.org/patch/84363/ http://patches.openembedded.org/patch/84341/ The following changes since commit 618a569d430e88e9a115dcf10f04384f39e28555: kernel.bbclass: Create modules directory even if there is no modules installed (2014-12-03 11:28:43 -0800) are available in the git repository at: http://git.yoctoproject.org/git/poky-contrib akuster/dizzy-next http://git.yoctoproject.org/cgit.cgi//log/?h=akuster/dizzy-next Bian Naimeng (2): cpio: fix bug CVE-2014-9112 for cpio-2.8 cpio: fix bug CVE-2014-9112 for cpio-2.11 Maxin B. John (1): python: fix ssl import error .../python/python-2.7-manifest.inc | 2 +- .../cpio/cpio-2.11/fix-memory-overrun.patch| 220 + .../cpio/cpio-2.8/fix-memory-overrun.patch | 217 meta/recipes-extended/cpio/cpio_2.11.bb| 3 +- meta/recipes-extended/cpio/cpio_2.8.bb | 7 +- scripts/contrib/python/generate-manifest-2.7.py| 2 +- 6 files changed, 445 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-extended/cpio/cpio-2.11/fix-memory-overrun.patch create mode 100644 meta/recipes-extended/cpio/cpio-2.8/fix-memory-overrun.patch -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [meta][PATCH] glibc: CVE 2014-7817 and 2012-3406 fixes
Signed-off-by: Armin Kuster akuster...@gmail.com --- ...-3406-Stack-overflow-in-vfprintf-BZ-16617.patch | 339 + ...4-7817-wordexp-fails-to-honour-WRDE_NOCMD.patch | 215 + meta/recipes-core/glibc/glibc_2.20.bb | 5 + 3 files changed, 559 insertions(+) create mode 100644 meta/recipes-core/glibc/glibc/CVE-2012-3406-Stack-overflow-in-vfprintf-BZ-16617.patch create mode 100644 meta/recipes-core/glibc/glibc/CVE-2014-7817-wordexp-fails-to-honour-WRDE_NOCMD.patch diff --git a/meta/recipes-core/glibc/glibc/CVE-2012-3406-Stack-overflow-in-vfprintf-BZ-16617.patch b/meta/recipes-core/glibc/glibc/CVE-2012-3406-Stack-overflow-in-vfprintf-BZ-16617.patch new file mode 100644 index 000..8cfdbea --- /dev/null +++ b/meta/recipes-core/glibc/glibc/CVE-2012-3406-Stack-overflow-in-vfprintf-BZ-16617.patch @@ -0,0 +1,339 @@ +From a5357b7ce2a2982c5778435704bcdb55ce3667a0 Mon Sep 17 00:00:00 2001 +From: Jeff Law l...@redhat.com +Date: Mon, 15 Dec 2014 10:09:32 +0100 +Subject: [PATCH] CVE-2012-3406: Stack overflow in vfprintf [BZ #16617] + +A larger number of format specifiers coudld cause a stack overflow, +potentially allowing to bypass _FORTIFY_SOURCE format string +protection. +--- + ChangeLog | 9 +++ + NEWS| 13 + + stdio-common/Makefile | 2 +- + stdio-common/bug23-2.c | 70 + + stdio-common/bug23-3.c | 50 +++ + stdio-common/bug23-4.c | 31 ++ + stdio-common/vfprintf.c | 40 ++-- + 7 files changed, 207 insertions(+), 8 deletions(-) + create mode 100644 stdio-common/bug23-2.c + create mode 100644 stdio-common/bug23-3.c + create mode 100644 stdio-common/bug23-4.c + +Index: git/ChangeLog +=== +--- git.orig/ChangeLog git/ChangeLog +@@ -1,3 +1,12 @@ ++2014-12-15 Jeff Law l...@redhat.com ++ ++ [BZ #16617] ++ * stdio-common/vfprintf.c (vfprintf): Allocate large specs array ++ on the heap. (CVE-2012-3406) ++ * stdio-common/bug23-2.c, stdio-common/bug23-3.c: New file. ++ * stdio-common/bug23-4.c: New file. Test case by Joseph Myers. ++ * stdio-common/Makefile (tests): Add bug23-2, bug23-3, bug23-4. ++ + 2014-11-19 Carlos O'Donell car...@redhat.com +Florian Weimer fwei...@redhat.com +Joseph Myers jos...@codesourcery.com +Index: git/NEWS +=== +--- git.orig/NEWS git/NEWS +@@ -13,24 +13,28 @@ Version 2.20 + 15698, 15804, 15894, 15946, 16002, 16064, 16095, 16194, 16198, 16275, + 16284, 16287, 16315, 16348, 16349, 16354, 16357, 16362, 16447, 16516, + 16532, 16539, 16545, 16561, 16562, 16564, 16574, 16599, 16600, 16609, +- 16610, 16611, 16613, 16619, 16623, 16629, 16632, 16634, 16639, 16642, +- 16648, 16649, 16670, 16674, 16677, 16680, 16681, 16683, 16689, 16695, +- 16701, 16706, 16707, 16712, 16713, 16714, 16724, 16731, 16739, 16740, +- 16743, 16754, 16758, 16759, 16760, 16770, 16786, 16789, 16791, 16796, +- 16799, 16800, 16815, 16823, 16824, 16831, 16838, 16839, 16849, 16854, +- 16876, 16877, 16878, 16882, 16885, 16888, 16890, 16892, 16912, 16915, +- 16916, 16917, 16918, 16922, 16927, 16928, 16932, 16943, 16958, 16965, +- 16966, 16967, 16977, 16978, 16984, 16990, 16996, 17009, 17022, 17031, +- 17042, 17048, 17050, 17058, 17061, 17062, 17069, 17075, 17078, 17079, +- 17084, 17086, 17088, 17092, 17097, 17125, 17135, 17137, 17150, 17153, +- 17187, 17213, 17259, 17261, 17262, 17263, 17319, 17325, 17354, 17625. +- ++ 16610, 16611, 16613, 16617, 16619, 16623, 16629, 16632, 16634, 16639, ++ 16642, 16648, 16649, 16670, 16674, 16677, 16680, 16681, 16683, 16689, ++ 16695, 16701, 16706, 16707, 16712, 16713, 16714, 16724, 16731, 16739, ++ 16740, 16743, 16754, 16758, 16759, 16760, 16770, 16786, 16789, 16791, ++ 16796, 16799, 16800, 16815, 16823, 16824, 16831, 16838, 16839, 16849, ++ 16854, 16876, 16877, 16878, 16882, 16885, 16888, 16890, 16892, 16912, ++ 16915, 16916, 16917, 16918, 16922, 16927, 16928, 16932, 16943, 16958, ++ 16965, 16966, 16967, 16977, 16978, 16984, 16990, 16996, 17009, 17022, ++ 17031, 17042, 17048, 17050, 17058, 17061, 17062, 17069, 17075, 17078, ++ 17079, 17084, 17086, 17088, 17092, 17097, 17125, 17135, 17137, 17150, ++ 17153, 17187, 17213, 17259, 17261, 17262, 17263, 17319, 17325, 17354, ++ 17625. ++ + * CVE-2104-7817 The wordexp function could ignore the WRDE_NOCMD flag + under certain input conditions resulting in the execution of a shell for + command substitution when the applicaiton did not request it. The + implementation now checks WRDE_NOCMD immediately before executing the + shell and returns the error WRDE_CMDSUB as expected. + ++* CVE-2012-3406 printf-style functions could run into a stack overflow when ++ processing format strings with a large number of format specifiers
[OE-core] [PATCH 0/5] [RFC] Move packages from meta-oe to core for X11
Please consider moving xterm, xclock, twm and libxaw from meta-openembedded/recipes-graphics to OE-core. This fixes 'core-image-x11' image dependancy on meta-oe packages since xinit requires xterm, xclock and twm to 'startx'. if approved and commited, I will post patches to remove those packages from meta-oe. Armin Kuster (5): xclock: move from meta-oe to core. twm: move from meta-oe to core. libxaw: move from meta-oe to core. xterm: move from meta-oe to core. xinit: fix depends issue meta/recipes-graphics/xorg-app/twm_1.0.8.bb | 20 +++ meta/recipes-graphics/xorg-app/xclock_1.0.5.bb | 15 +++ meta/recipes-graphics/xorg-app/xinit_1.3.3.bb | 8 +- meta/recipes-graphics/xorg-app/xterm_313.bb | 1 + meta/recipes-graphics/xorg-lib/libxaw_1.0.10.bb | 33 + 5 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/xorg-app/twm_1.0.8.bb create mode 100644 meta/recipes-graphics/xorg-app/xclock_1.0.5.bb create mode 12 meta/recipes-graphics/xorg-app/xterm_313.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxaw_1.0.10.bb -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [[PATCH 3/5] libxaw: move from meta-oe to core.
xinit, xterm and xclock depend on libxaw so move to to core too. add x11 to required DISTRO_FEATURES check Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/recipes-graphics/xorg-lib/libxaw_1.0.10.bb | 33 + 1 file changed, 33 insertions(+) create mode 100644 meta/recipes-graphics/xorg-lib/libxaw_1.0.10.bb diff --git a/meta/recipes-graphics/xorg-lib/libxaw_1.0.10.bb b/meta/recipes-graphics/xorg-lib/libxaw_1.0.10.bb new file mode 100644 index 000..807717c --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxaw_1.0.10.bb @@ -0,0 +1,33 @@ +require recipes-graphics/xorg-lib/xorg-lib-common.inc +SUMMARY = X Athena Widget Set +DEPENDS += xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxau xmlto-native + +LIC_FILES_CHKSUM = file://COPYING;md5=1c65719d42900bb81b83e8293c20a364 + +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = x11 + +PE = 1 +PR = r2 + +SRC_URI[md5sum] = f1ea52debce7a18cc26b21647a00ad8b +SRC_URI[sha256sum] = 2d96bcf92638b8ec5c91d379f5ec2e7b15133adeb2ba22066d48bf3239ee1bdd + +do_install_append () { +ln -sf libXaw6.so.6 ${D}${libdir}/libXaw.so.6 +ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so.7 +ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so +} + +inherit distro_features_check + +PACKAGES =+ libxaw6 libxaw7 libxaw8 + +FILES_libxaw6 = ${libdir}/libXaw*.so.6* +FILES_libxaw7 = ${libdir}/libXaw*.so.7* +FILES_libxaw8 = ${libdir}/libXaw8.so.8* + +# Avoid dependency on libxaw as it is not build +RDEPENDS_${PN}-dev = + +XORG_PN = libXaw -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [[PATCH 2/5] twm: move from meta-oe to core.
core xinit package has a dependency to twm so move it from meta-oe to core. core image core-image-x11 includes xinit. Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/recipes-graphics/xorg-app/twm_1.0.8.bb | 20 1 file changed, 20 insertions(+) create mode 100644 meta/recipes-graphics/xorg-app/twm_1.0.8.bb diff --git a/meta/recipes-graphics/xorg-app/twm_1.0.8.bb b/meta/recipes-graphics/xorg-app/twm_1.0.8.bb new file mode 100644 index 000..cc8808b --- /dev/null +++ b/meta/recipes-graphics/xorg-app/twm_1.0.8.bb @@ -0,0 +1,20 @@ +require recipes-graphics/xorg-app/xorg-app-common.inc +SUMMARY = tiny window manager +DEPENDS += libxext libxt libxmu bison-native + +LICENSE = MIT +LIC_FILES_CHKSUM = file://COPYING;md5=4c6d42ef60e8166aa26606524c0b9586 + +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = x11 + +SRC_URI[md5sum] = 4b28317d4a9f7ca61bef8462e132bd4c +SRC_URI[sha256sum] = 7660352353d632127ff50390991706aa660b28a4ada816c2582ac02720722e44 + +inherit distro_features_check + +FILES_${PN} += ${datadir}/X11/twm/system.twmrc +ALTERNATIVE_NAME = x-window-manager +ALTERNATIVE_PATH = ${bindir}/twm +ALTERNATIVE_LINK = ${bindir}/x-window-manager +ALTERNATIVE_PRIORITY = 1 -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [[PATCH 5/5] xinit: fix depends issue
xinit.cpp in xinit package calls xterm, xclock and twm so add depends for those packages. Added X11 distro check. Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/recipes-graphics/xorg-app/xinit_1.3.3.bb | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/recipes-graphics/xorg-app/xinit_1.3.3.bb b/meta/recipes-graphics/xorg-app/xinit_1.3.3.bb index 583ea87..874756d 100644 --- a/meta/recipes-graphics/xorg-app/xinit_1.3.3.bb +++ b/meta/recipes-graphics/xorg-app/xinit_1.3.3.bb @@ -10,11 +10,17 @@ then terminate. LIC_FILES_CHKSUM = file://COPYING;md5=18f01e7b39807bebe2b8df101a039b68 +DEPENDS = twm xterm xclock +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = x11 + PE = 1 SRC_URI[md5sum] = 3b8da0e6237aee9828cc809c647510a7 SRC_URI[sha256sum] = 74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af +inherit distro_features_check + EXTRA_OECONF = ac_cv_path_MCOOKIE=${bindir}/mcookie -RDEPENDS_${PN} += util-linux-mcookie +RDEPENDS_${PN} += util-linux-mcookie twm xterm xclock -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [[PATCH 1/5] xclock: move from meta-oe to core.
core xinit package has a dependency to xclock so move it from meta-oe to core. core image core-image-x11 includes xinit. Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/recipes-graphics/xorg-app/xclock_1.0.5.bb | 15 +++ 1 file changed, 15 insertions(+) create mode 100644 meta/recipes-graphics/xorg-app/xclock_1.0.5.bb diff --git a/meta/recipes-graphics/xorg-app/xclock_1.0.5.bb b/meta/recipes-graphics/xorg-app/xclock_1.0.5.bb new file mode 100644 index 000..9573761 --- /dev/null +++ b/meta/recipes-graphics/xorg-app/xclock_1.0.5.bb @@ -0,0 +1,15 @@ +require recipes-graphics/xorg-app/xorg-app-common.inc + +SUMMARY = analog / digital clock for X +LICENSE = MIT +LIC_FILES_CHKSUM = file://COPYING;md5=857759ade8f2ddde5c7b32ef7356ea36 + +DEPENDS += libxaw libxrender libxft libxkbfile libxt + +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = x11 + +SRC_URI[md5sum] = eaf124bbc9d13e1a12a29faaa2ed3612 +SRC_URI[sha256sum] = 53a9169e24f3814fbfcfee3ca0b98637840a3156ed7c7e36ae03940fabae4c9a + +inherit distro_features_check -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [[PATCH 4/5] xterm: move from meta-oe to core.
core xinit package has a dependency to xterm so move it from meta-oe to core. core image core-image-x11 includes xinit. Updated to latest verison Updated SRC_URI to us Debian. Old one was flakey. Added X11 distro check. Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/recipes-graphics/xorg-app/xterm_313.bb | 1 + 1 file changed, 1 insertion(+) create mode 12 meta/recipes-graphics/xorg-app/xterm_313.bb diff --git a/meta/recipes-graphics/xorg-app/xterm_313.bb b/meta/recipes-graphics/xorg-app/xterm_313.bb new file mode 12 index 000..7193661 --- /dev/null +++ b/meta/recipes-graphics/xorg-app/xterm_313.bb @@ -0,0 +1 @@ +/home/akuster/oss/mylayers/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_303.bb \ No newline at end of file -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core