Re: [OE-core] [PATCH 1/8] bitbake.conf: set CONFFILES by default
On 01/15/2016 02:27 PM, Mike Looijmans wrote: How about /etc/init.d and /etc/rcS.d? Are these now suddenly CONFFILES too? For /etc/init.d/*, yes, and I think that they should be CONFFILES. For /etc/rcS.d/*, they are symlinks which are not owned by pkg, but created by update-rc.d. // Robert On 15-01-16 03:29, Robert Yang wrote: There are a lot of binary packages have files in /etc/, but only a few of them have set CONFFILES, more than 180 packages are not set in a world build. So treat all the files in /etc/ as CONFFILES as Debian does: - All the files in /etc/ are CONFFILES - Move the file out of /etc/ if it is not a conffile - If /etc/foo can't be moved out, and is changed during runtime, then create a symlink /etc/foo -> /var/foo [YOCTO #8436] Signed-off-by: Robert Yang --- meta/conf/bitbake.conf |1 + 1 file changed, 1 insertion(+) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 2fe6b24..f0e4b3a 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -271,6 +271,7 @@ PACKAGE_BEFORE_PN ?= "" PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}" PACKAGES_DYNAMIC = "^${PN}-locale-.*" FILES = "" +CONFFILES = "${sysconfdir}/*" FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ Kind regards, Mike Looijmans System Expert TOPIC Embedded Products Eindhovenseweg 32-C, NL-5683 KH Best Postbus 440, NL-5680 AK Best Telefoon: +31 (0) 499 33 69 79 E-mail: mike.looijm...@topicproducts.com Website: www.topicproducts.com Please consider the environment before printing this e-mail -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/8] bitbake.conf: set CONFFILES by default
How about /etc/init.d and /etc/rcS.d? Are these now suddenly CONFFILES too? On 15-01-16 03:29, Robert Yang wrote: There are a lot of binary packages have files in /etc/, but only a few of them have set CONFFILES, more than 180 packages are not set in a world build. So treat all the files in /etc/ as CONFFILES as Debian does: - All the files in /etc/ are CONFFILES - Move the file out of /etc/ if it is not a conffile - If /etc/foo can't be moved out, and is changed during runtime, then create a symlink /etc/foo -> /var/foo [YOCTO #8436] Signed-off-by: Robert Yang --- meta/conf/bitbake.conf |1 + 1 file changed, 1 insertion(+) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 2fe6b24..f0e4b3a 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -271,6 +271,7 @@ PACKAGE_BEFORE_PN ?= "" PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}" PACKAGES_DYNAMIC = "^${PN}-locale-.*" FILES = "" +CONFFILES = "${sysconfdir}/*" FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ Kind regards, Mike Looijmans System Expert TOPIC Embedded Products Eindhovenseweg 32-C, NL-5683 KH Best Postbus 440, NL-5680 AK Best Telefoon: +31 (0) 499 33 69 79 E-mail: mike.looijm...@topicproducts.com Website: www.topicproducts.com Please consider the environment before printing this e-mail -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] ncurses: 5.9 0 -> 6.0
Drop it , use the newer patch, because I specifiy the error remote. Sorry for inconvenience. On 2016年01月15日 11:07, Dengke Du wrote: To be compatible with ncurses 5, add option '--with-abi-version=5' to EXTRA_OECONF Signed-off-by: Dengke Du --- .../recipes-core/ncurses/{ncurses-5.9 => ncurses-6.0}/config.cache | 0 .../ncurses/{ncurses-5.9 => ncurses-6.0}/tic-hang.patch| 0 meta/recipes-core/ncurses/ncurses.inc | 1 - meta/recipes-core/ncurses/{ncurses_5.9.bb => ncurses_6.0.bb} | 7 +++ 4 files changed, 3 insertions(+), 5 deletions(-) rename meta/recipes-core/ncurses/{ncurses-5.9 => ncurses-6.0}/config.cache (100%) rename meta/recipes-core/ncurses/{ncurses-5.9 => ncurses-6.0}/tic-hang.patch (100%) rename meta/recipes-core/ncurses/{ncurses_5.9.bb => ncurses_6.0.bb} (59%) diff --git a/meta/recipes-core/ncurses/ncurses-5.9/config.cache b/meta/recipes-core/ncurses/ncurses-6.0/config.cache similarity index 100% rename from meta/recipes-core/ncurses/ncurses-5.9/config.cache rename to meta/recipes-core/ncurses/ncurses-6.0/config.cache diff --git a/meta/recipes-core/ncurses/ncurses-5.9/tic-hang.patch b/meta/recipes-core/ncurses/ncurses-6.0/tic-hang.patch similarity index 100% rename from meta/recipes-core/ncurses/ncurses-5.9/tic-hang.patch rename to meta/recipes-core/ncurses/ncurses-6.0/tic-hang.patch diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index 27815b8..fbe74d5 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc SECTION = "libs" DEPENDS = "ncurses-native" DEPENDS_class-native = "" -INC_PR = "r15" BINCONFIG = "${bindir}/ncurses5-config ${bindir}/ncursesw5-config" diff --git a/meta/recipes-core/ncurses/ncurses_5.9.bb b/meta/recipes-core/ncurses/ncurses_6.0.bb similarity index 59% rename from meta/recipes-core/ncurses/ncurses_5.9.bb rename to meta/recipes-core/ncurses/ncurses_6.0.bb index 22c6230..8587287 100644 --- a/meta/recipes-core/ncurses/ncurses_5.9.bb +++ b/meta/recipes-core/ncurses/ncurses_6.0.bb @@ -1,12 +1,11 @@ require ncurses.inc -REVISION = "20150329" - -PR = "${INC_PR}.1" +REVISION = "20151024" SRC_URI += "file://tic-hang.patch \ file://config.cache \ " # commit id corresponds to the above listed REVISION -SRCREV = "6286e14dac28811dbfd325b8d4c23f0d4e37eaf0" +SRCREV = "c6b034b4d69f8c9092c2a1b5d5bb718282b2a522" S = "${WORKDIR}/git" +EXTRA_OECONF += "--with-abi-version=5" -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] ncurses: 5.9 0 -> 6.0
The following changes since commit 92cc02fe517bad0af4e493fda3331738cbcc9a26: linux-yocto: Update Genericx86* BSPs to 4.1.15 (2016-01-14 15:18:46 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib dengke/upgrade-ncurses http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=dengke/upgrade-ncurses Dengke Du (1): ncurses: 5.9 0 -> 6.0 .../recipes-core/ncurses/{ncurses-5.9 => ncurses-6.0}/config.cache | 0 .../ncurses/{ncurses-5.9 => ncurses-6.0}/tic-hang.patch| 0 meta/recipes-core/ncurses/ncurses.inc | 1 - meta/recipes-core/ncurses/{ncurses_5.9.bb => ncurses_6.0.bb} | 7 +++ 4 files changed, 3 insertions(+), 5 deletions(-) rename meta/recipes-core/ncurses/{ncurses-5.9 => ncurses-6.0}/config.cache (100%) rename meta/recipes-core/ncurses/{ncurses-5.9 => ncurses-6.0}/tic-hang.patch (100%) rename meta/recipes-core/ncurses/{ncurses_5.9.bb => ncurses_6.0.bb} (59%) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] ncurses: 5.9 0 -> 6.0
To be compatible with ncurses 5, add option '--with-abi-version=5' to EXTRA_OECONF Signed-off-by: Dengke Du --- .../recipes-core/ncurses/{ncurses-5.9 => ncurses-6.0}/config.cache | 0 .../ncurses/{ncurses-5.9 => ncurses-6.0}/tic-hang.patch| 0 meta/recipes-core/ncurses/ncurses.inc | 1 - meta/recipes-core/ncurses/{ncurses_5.9.bb => ncurses_6.0.bb} | 7 +++ 4 files changed, 3 insertions(+), 5 deletions(-) rename meta/recipes-core/ncurses/{ncurses-5.9 => ncurses-6.0}/config.cache (100%) rename meta/recipes-core/ncurses/{ncurses-5.9 => ncurses-6.0}/tic-hang.patch (100%) rename meta/recipes-core/ncurses/{ncurses_5.9.bb => ncurses_6.0.bb} (59%) diff --git a/meta/recipes-core/ncurses/ncurses-5.9/config.cache b/meta/recipes-core/ncurses/ncurses-6.0/config.cache similarity index 100% rename from meta/recipes-core/ncurses/ncurses-5.9/config.cache rename to meta/recipes-core/ncurses/ncurses-6.0/config.cache diff --git a/meta/recipes-core/ncurses/ncurses-5.9/tic-hang.patch b/meta/recipes-core/ncurses/ncurses-6.0/tic-hang.patch similarity index 100% rename from meta/recipes-core/ncurses/ncurses-5.9/tic-hang.patch rename to meta/recipes-core/ncurses/ncurses-6.0/tic-hang.patch diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index 27815b8..fbe74d5 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc SECTION = "libs" DEPENDS = "ncurses-native" DEPENDS_class-native = "" -INC_PR = "r15" BINCONFIG = "${bindir}/ncurses5-config ${bindir}/ncursesw5-config" diff --git a/meta/recipes-core/ncurses/ncurses_5.9.bb b/meta/recipes-core/ncurses/ncurses_6.0.bb similarity index 59% rename from meta/recipes-core/ncurses/ncurses_5.9.bb rename to meta/recipes-core/ncurses/ncurses_6.0.bb index 22c6230..8587287 100644 --- a/meta/recipes-core/ncurses/ncurses_5.9.bb +++ b/meta/recipes-core/ncurses/ncurses_6.0.bb @@ -1,12 +1,11 @@ require ncurses.inc -REVISION = "20150329" - -PR = "${INC_PR}.1" +REVISION = "20151024" SRC_URI += "file://tic-hang.patch \ file://config.cache \ " # commit id corresponds to the above listed REVISION -SRCREV = "6286e14dac28811dbfd325b8d4c23f0d4e37eaf0" +SRCREV = "c6b034b4d69f8c9092c2a1b5d5bb718282b2a522" S = "${WORKDIR}/git" +EXTRA_OECONF += "--with-abi-version=5" -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] ncurses: 5.9 0 -> 6.0
To be compatible with ncurses 5, add option '--with-abi-version=5' to EXTRA_OECONF Signed-off-by: Dengke Du --- .../recipes-core/ncurses/{ncurses-5.9 => ncurses-6.0}/config.cache | 0 .../ncurses/{ncurses-5.9 => ncurses-6.0}/tic-hang.patch| 0 meta/recipes-core/ncurses/ncurses.inc | 1 - meta/recipes-core/ncurses/{ncurses_5.9.bb => ncurses_6.0.bb} | 7 +++ 4 files changed, 3 insertions(+), 5 deletions(-) rename meta/recipes-core/ncurses/{ncurses-5.9 => ncurses-6.0}/config.cache (100%) rename meta/recipes-core/ncurses/{ncurses-5.9 => ncurses-6.0}/tic-hang.patch (100%) rename meta/recipes-core/ncurses/{ncurses_5.9.bb => ncurses_6.0.bb} (59%) diff --git a/meta/recipes-core/ncurses/ncurses-5.9/config.cache b/meta/recipes-core/ncurses/ncurses-6.0/config.cache similarity index 100% rename from meta/recipes-core/ncurses/ncurses-5.9/config.cache rename to meta/recipes-core/ncurses/ncurses-6.0/config.cache diff --git a/meta/recipes-core/ncurses/ncurses-5.9/tic-hang.patch b/meta/recipes-core/ncurses/ncurses-6.0/tic-hang.patch similarity index 100% rename from meta/recipes-core/ncurses/ncurses-5.9/tic-hang.patch rename to meta/recipes-core/ncurses/ncurses-6.0/tic-hang.patch diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index 27815b8..fbe74d5 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc SECTION = "libs" DEPENDS = "ncurses-native" DEPENDS_class-native = "" -INC_PR = "r15" BINCONFIG = "${bindir}/ncurses5-config ${bindir}/ncursesw5-config" diff --git a/meta/recipes-core/ncurses/ncurses_5.9.bb b/meta/recipes-core/ncurses/ncurses_6.0.bb similarity index 59% rename from meta/recipes-core/ncurses/ncurses_5.9.bb rename to meta/recipes-core/ncurses/ncurses_6.0.bb index 22c6230..8587287 100644 --- a/meta/recipes-core/ncurses/ncurses_5.9.bb +++ b/meta/recipes-core/ncurses/ncurses_6.0.bb @@ -1,12 +1,11 @@ require ncurses.inc -REVISION = "20150329" - -PR = "${INC_PR}.1" +REVISION = "20151024" SRC_URI += "file://tic-hang.patch \ file://config.cache \ " # commit id corresponds to the above listed REVISION -SRCREV = "6286e14dac28811dbfd325b8d4c23f0d4e37eaf0" +SRCREV = "c6b034b4d69f8c9092c2a1b5d5bb718282b2a522" S = "${WORKDIR}/git" +EXTRA_OECONF += "--with-abi-version=5" -- 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] ncurses: 5.9 0 -> 6.0
The following changes since commit 92cc02fe517bad0af4e493fda3331738cbcc9a26: linux-yocto: Update Genericx86* BSPs to 4.1.15 (2016-01-14 15:18:46 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib dengke/upgrade-ncurses http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dengke/upgrade-ncurses Dengke Du (1): ncurses: 5.9 0 -> 6.0 .../recipes-core/ncurses/{ncurses-5.9 => ncurses-6.0}/config.cache | 0 .../ncurses/{ncurses-5.9 => ncurses-6.0}/tic-hang.patch| 0 meta/recipes-core/ncurses/ncurses.inc | 1 - meta/recipes-core/ncurses/{ncurses_5.9.bb => ncurses_6.0.bb} | 7 +++ 4 files changed, 3 insertions(+), 5 deletions(-) rename meta/recipes-core/ncurses/{ncurses-5.9 => ncurses-6.0}/config.cache (100%) rename meta/recipes-core/ncurses/{ncurses-5.9 => ncurses-6.0}/tic-hang.patch (100%) rename meta/recipes-core/ncurses/{ncurses_5.9.bb => ncurses_6.0.bb} (59%) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 8/8] recipes-multimedia/sato/support: cleanup CONFFILES
The ${sysconfdir}/* are CONFFILES by default. [YOCTO #8436] Signed-off-by: Robert Yang --- meta/recipes-multimedia/pulseaudio/pulseaudio.inc |8 .../pulseaudio-client-conf-sato_1.bb |1 - .../ca-certificates/ca-certificates_20150426.bb|4 3 files changed, 13 deletions(-) diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index ec73526..21853b5 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -124,14 +124,6 @@ FILES_${PN}-misc = "${bindir}/* ${libdir}/pulseaudio/libpulsedsp.so" # Allow the pulseaudio package to be created empty as a placeholder (-dbg and -dev depend on it) ALLOW_EMPTY_${PN} = "1" -CONFFILES_libpulse = "${sysconfdir}/pulse/client.conf" - -CONFFILES_pulseaudio-server = "\ - ${sysconfdir}/pulse/default.pa \ - ${sysconfdir}/pulse/daemon.conf \ - ${sysconfdir}/pulse/system.pa \ - " - pkg_postinst_${PN}-server() { if [ -z "$D" ] && [ -e ${sysconfdir}/init.d/populate-volatile.sh ] ; then ${sysconfdir}/init.d/populate-volatile.sh update diff --git a/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb b/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb index e27339f..2ccda38 100644 --- a/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb +++ b/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb @@ -14,4 +14,3 @@ do_install() { } FILES_${PN} = "${sysconfdir}/pulse/client.conf.d/50-sato.conf" -CONFFILES_${PN} = "${sysconfdir}/pulse/client.conf.d/50-sato.conf" diff --git a/meta/recipes-support/ca-certificates/ca-certificates_20150426.bb b/meta/recipes-support/ca-certificates/ca-certificates_20150426.bb index 716e3df..aca34a4 100644 --- a/meta/recipes-support/ca-certificates/ca-certificates_20150426.bb +++ b/meta/recipes-support/ca-certificates/ca-certificates_20150426.bb @@ -65,10 +65,6 @@ pkg_postinst_${PN} () { SYSROOT="$D" update-ca-certificates } -CONFFILES_${PN} += "${sysconfdir}/ca-certificates.conf" - -# Postinsts don't seem to be run for nativesdk packages when populating SDKs. -CONFFILES_${PN}_append_class-nativesdk = " ${sysconfdir}/ssl/certs/ca-certificates.crt" do_install_append_class-nativesdk () { SYSROOT="${D}${SDKPATHNATIVE}" update-ca-certificates } -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/8] recipes-core: cleanup CONFFILES
The ${sysconfdir}/* are CONFFILES by default. [YOCTO #8436] Signed-off-by: Robert Yang --- meta/recipes-core/base-files/base-files_3.0.14.bb |4 meta/recipes-core/busybox/busybox.inc |3 --- meta/recipes-core/dbus/dbus_1.8.20.bb |2 -- meta/recipes-core/glibc/glibc-package.inc |1 - .../init-ifupdown/init-ifupdown_1.0.bb |1 - meta/recipes-core/initscripts/initscripts_1.0.bb |2 -- meta/recipes-core/netbase/netbase_5.3.bb |2 -- meta/recipes-core/readline/readline.inc|2 -- meta/recipes-core/systemd/systemd_228.bb |7 --- .../sysvinit/sysvinit-inittab_2.88dsf.bb |1 - meta/recipes-core/udev/udev-extraconf_1.1.bb |1 - 11 files changed, 26 deletions(-) diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb index d391707..d61b58b 100644 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb @@ -174,7 +174,3 @@ FILES_${PN} = "/" FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses" PACKAGE_ARCH = "${MACHINE_ARCH}" - -CONFFILES_${PN} = "${sysconfdir}/fstab ${@['', '${sysconfdir}/hostname'][(d.getVar('hostname', True) != '')]} ${sysconfdir}/shells" -CONFFILES_${PN} += "${sysconfdir}/motd ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile" - diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 9541123..858468a 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -42,9 +42,6 @@ INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" SYSTEMD_PACKAGES = "${PN}-syslog" SYSTEMD_SERVICE_${PN}-syslog = "busybox-syslog.service" -CONFFILES_${PN}-syslog = "${sysconfdir}/syslog-startup.conf.${BPN}" -CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf" - RRECOMMENDS_${PN} = "${PN}-syslog ${PN}-udhcpc" inherit cml1 systemd update-rc.d ptest diff --git a/meta/recipes-core/dbus/dbus_1.8.20.bb b/meta/recipes-core/dbus/dbus_1.8.20.bb index 0c7f6b1..9063273 100644 --- a/meta/recipes-core/dbus/dbus_1.8.20.bb +++ b/meta/recipes-core/dbus/dbus_1.8.20.bb @@ -39,8 +39,6 @@ USERADD_PARAM_${PN} = "--system --home ${localstatedir}/lib/dbus \ --no-create-home --shell /bin/false \ --user-group messagebus" -CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf" - DEBIANNAME_${PN} = "dbus-1" PACKAGES =+ "${PN}-lib" diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index bad6424..c7d44af 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -208,7 +208,6 @@ pkg_postinst_nscd () { fi fi } -CONFFILES_nscd="${sysconfdir}/nscd.conf" SYSTEMD_PACKAGES = "nscd" SYSTEMD_SERVICE_nscd = "nscd.service" diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb b/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb index 733ae41..e8d87be 100644 --- a/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb +++ b/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb @@ -38,4 +38,3 @@ PACKAGE_ARCH_qemuall = "${MACHINE_ARCH}" RDEPENDS_${PN} = "netbase" RCONFLICTS_${PN} = "netbase (< 1:5.0)" -CONFFILES_${PN} = "${sysconfdir}/network/interfaces" diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb index f90de6e..bd3795f 100644 --- a/meta/recipes-core/initscripts/initscripts_1.0.bb +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb @@ -178,5 +178,3 @@ pkg_postinst_${PN} () { rm -f "/etc/volatile.cache" fi } - -CONFFILES_${PN} += "${sysconfdir}/init.d/checkroot.sh" diff --git a/meta/recipes-core/netbase/netbase_5.3.bb b/meta/recipes-core/netbase/netbase_5.3.bb index ccd89ff..7cff754 100644 --- a/meta/recipes-core/netbase/netbase_5.3.bb +++ b/meta/recipes-core/netbase/netbase_5.3.bb @@ -20,5 +20,3 @@ do_install () { install -m 0644 etc-protocols ${D}${sysconfdir}/protocols install -m 0644 etc-services ${D}${sysconfdir}/services } - -CONFFILES_${PN} = "${sysconfdir}/hosts" diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc index 35df8b4..f4fd077 100644 --- a/meta/recipes-core/readline/readline.inc +++ b/meta/recipes-core/readline/readline.inc @@ -38,5 +38,3 @@ do_install_append () { } BBCLASSEXTEND = "native nativesdk" - -CONFFILES_${PN} += "${sysconfdir}/inputrc" diff --git a/meta/recipes-core/systemd/systemd_228.bb b/meta/recipes-core/systemd/systemd_228.bb index aa2e846..cbad8b8 100644 --- a/meta/recipes-core/systemd/systemd_228.bb +++ b/meta/recipes-core/systemd/systemd_228.bb @@ -280,13 +280,6 @@ RRECOMMENDS_${PN}-binfmt = "kernel-module-binfmt-misc" RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps" -CON
[OE-core] [PATCH 4/8] recipes-extended: cleanup CONFFILES
The ${sysconfdir}/* are CONFFILES by default. [YOCTO #8436] Signed-off-by: Robert Yang --- meta/recipes-extended/cronie/cronie_1.5.0.bb |1 - meta/recipes-extended/cups/cups.inc|1 - meta/recipes-extended/lighttpd/lighttpd_1.4.38.bb |2 -- meta/recipes-extended/logrotate/logrotate_3.9.1.bb |3 +-- meta/recipes-extended/pam/libpam_1.2.1.bb |5 - meta/recipes-extended/procps/procps_3.3.11.bb |2 -- meta/recipes-extended/sudo/sudo.inc|2 -- meta/recipes-extended/sysklogd/sysklogd.inc|1 - meta/recipes-extended/tzdata/tzdata_2015g.bb |3 --- meta/recipes-extended/xinetd/xinetd_2.3.15.bb |2 -- 10 files changed, 1 insertion(+), 21 deletions(-) diff --git a/meta/recipes-extended/cronie/cronie_1.5.0.bb b/meta/recipes-extended/cronie/cronie_1.5.0.bb index 697501a..922ba00 100644 --- a/meta/recipes-extended/cronie/cronie_1.5.0.bb +++ b/meta/recipes-extended/cronie/cronie_1.5.0.bb @@ -78,4 +78,3 @@ do_install_append () { } FILES_${PN} += "${sysconfdir}/cron*" -CONFFILES_${PN} += "${sysconfdir}/crontab" diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index 5aa365d..bc8f19a 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -116,7 +116,6 @@ FILES_${PN} += "${datadir}/doc/cups/images \ ${datadir}/doc/cups/*.css \ ${datadir}/icons/ \ " -CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf" SYSROOT_PREPROCESS_FUNCS += "cups_sysroot_preprocess" cups_sysroot_preprocess () { diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.38.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.38.bb index 7cfc141..6f6a14e 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.38.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.38.bb @@ -67,8 +67,6 @@ do_install_append() { FILES_${PN} += "${sysconfdir} /www" -CONFFILES_${PN} = "${sysconfdir}/lighttpd.conf" - PACKAGES_DYNAMIC += "^lighttpd-module-.*" python populate_packages_prepend () { diff --git a/meta/recipes-extended/logrotate/logrotate_3.9.1.bb b/meta/recipes-extended/logrotate/logrotate_3.9.1.bb index 5f1a601..6688d8e 100644 --- a/meta/recipes-extended/logrotate/logrotate_3.9.1.bb +++ b/meta/recipes-extended/logrotate/logrotate_3.9.1.bb @@ -27,8 +27,7 @@ PACKAGECONFIG ?= "\ PACKAGECONFIG[acl] = ",,acl" PACKAGECONFIG[selinux] = ",,libselinux" -CONFFILES_${PN} += "${localstatedir}/lib/logrotate.status \ - ${sysconfdir}/logrotate.conf" +CONFFILES_${PN} += "${localstatedir}/lib/logrotate.status" # If RPM_OPT_FLAGS is unset, it adds -g itself rather than obeying our # optimization variables, so use it rather than EXTRA_CFLAGS. diff --git a/meta/recipes-extended/pam/libpam_1.2.1.bb b/meta/recipes-extended/pam/libpam_1.2.1.bb index 3e69f11..cc5cb0f 100644 --- a/meta/recipes-extended/pam/libpam_1.2.1.bb +++ b/meta/recipes-extended/pam/libpam_1.2.1.bb @@ -163,8 +163,3 @@ addtask pam_sanity before do_configure BBCLASSEXTEND = "nativesdk native" -CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-session" -CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-auth" -CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-password" -CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-session-noninteractive" -CONFFILES_${PN}-runtime += "${sysconfdir}/pam.d/common-account" diff --git a/meta/recipes-extended/procps/procps_3.3.11.bb b/meta/recipes-extended/procps/procps_3.3.11.bb index c6dccc6..e842e47 100644 --- a/meta/recipes-extended/procps/procps_3.3.11.bb +++ b/meta/recipes-extended/procps/procps_3.3.11.bb @@ -42,8 +42,6 @@ do_install_append () { fi } -CONFFILES_${PN} = "${sysconfdir}/sysctl.conf" - bindir_progs = "free pkill pmap pgrep pwdx skill snice top uptime" base_bindir_progs += "kill pidof ps watch" base_sbindir_progs += "sysctl" diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc index a25876b..2862450 100644 --- a/meta/recipes-extended/sudo/sudo.inc +++ b/meta/recipes-extended/sudo/sudo.inc @@ -19,8 +19,6 @@ inherit autotools PACKAGECONFIG ??= "" PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" -CONFFILES_${PN} = "${sysconfdir}/sudoers" - EXTRA_OECONF = "--with-editor=/bin/vi --with-env-editor" EXTRA_OECONF_append_libc-musl = " --disable-hardening " diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc index 85b3cdc..aed4412 100644 --- a/meta/recipes-extended/sysklogd/sysklogd.inc +++ b/meta/recipes-extended/sysklogd/sysklogd.inc @@ -22,7 +22,6 @@ SRC_URI = "http://www.infodrom.org/projects/sysklogd/download/sysklogd-${PV}.tar SRC_URI_append_e500v2 = " file://no-vectorization.patch" INITSCRIPT_NAME = "syslog" -CONFFILES_${PN} = "${sysconfdir}/syslog.conf.${BPN}" CFLAGS_append = " -DSYSV" diff --git a/meta/recipes-extended/tzdata/tzdata_2015g.bb
[OE-core] [PATCH 2/8] recipes-bsp: cleanup CONFFILES
The ${sysconfdir}/* are CONFFILES by default. [YOCTO #8436] Signed-off-by: Robert Yang --- meta/recipes-bsp/alsa-state/alsa-state.bb|1 - meta/recipes-bsp/pcmciautils/pcmciautils.inc |2 -- 2 files changed, 3 deletions(-) diff --git a/meta/recipes-bsp/alsa-state/alsa-state.bb b/meta/recipes-bsp/alsa-state/alsa-state.bb index d0f7bb3..ce59d33 100644 --- a/meta/recipes-bsp/alsa-state/alsa-state.bb +++ b/meta/recipes-bsp/alsa-state/alsa-state.bb @@ -52,7 +52,6 @@ RRECOMMENDS_alsa-state = "alsa-states" RDEPENDS_${PN} = "alsa-utils-alsactl" FILES_${PN} = "${sysconfdir}/init.d ${sysconfdir}/asound.conf" -CONFFILES_${PN} = "${sysconfdir}/asound.conf" FILES_alsa-states = "${localstatedir}/lib/alsa/*.state" diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils.inc b/meta/recipes-bsp/pcmciautils/pcmciautils.inc index 9d1c55b..0bf0620 100644 --- a/meta/recipes-bsp/pcmciautils/pcmciautils.inc +++ b/meta/recipes-bsp/pcmciautils/pcmciautils.inc @@ -28,5 +28,3 @@ EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs' 'LEX=flex'" do_install () { oe_runmake 'DESTDIR=${D}' install } - -CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts" -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/8] recipes-devtools: cleanup CONFFILES
The ${sysconfdir}/* are CONFFILES by default. [YOCTO #8436] Signed-off-by: Robert Yang --- meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb |2 -- meta/recipes-devtools/opkg/opkg_0.3.1.bb |1 - 2 files changed, 3 deletions(-) diff --git a/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb b/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb index ace3de4..861f011 100644 --- a/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb +++ b/meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb @@ -28,8 +28,6 @@ do_install () { FILES_${PN} = "${sysconfdir}/opkg/ " -CONFFILES_${PN} += "${sysconfdir}/opkg/arch.conf" - RREPLACES_${PN} = "opkg-config-base" RCONFLICTS_${PN} = "opkg-config-base" RPROVIDES_${PN} = "opkg-config-base" diff --git a/meta/recipes-devtools/opkg/opkg_0.3.1.bb b/meta/recipes-devtools/opkg/opkg_0.3.1.bb index 577f495..345b555 100644 --- a/meta/recipes-devtools/opkg/opkg_0.3.1.bb +++ b/meta/recipes-devtools/opkg/opkg_0.3.1.bb @@ -72,4 +72,3 @@ FILES_${PN} += "${systemd_unitdir}/system/" BBCLASSEXTEND = "native nativesdk" -CONFFILES_${PN} = "${sysconfdir}/opkg/opkg.conf" -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/8] recipes-graphics: cleanup CONFFILES
The ${sysconfdir}/* are CONFFILES by default. [YOCTO #8436] Signed-off-by: Robert Yang --- .../xinput-calibrator/pointercal-xinput_0.0.bb |1 - .../xorg-xserver/xserver-xf86-config_0.1.bb|3 --- 2 files changed, 4 deletions(-) diff --git a/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb b/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb index 65348c3..9b52505 100644 --- a/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb +++ b/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb @@ -17,4 +17,3 @@ do_install() { } PACKAGE_ARCH = "${MACHINE_ARCH}" -CONFFILES_${PN} = "${sysconfdir}/pointercal.xinput" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb index e07c204..aa5099c 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb @@ -13,9 +13,6 @@ SRC_URI_append_libc-musl = "\ S = "${WORKDIR}" -CONFFILES_${PN} = "${sysconfdir}/X11/xorg.conf" -CONFFILES_${PN}_append_libc-musl = " ${sysconfdir}/X11/xorg.conf.d/10-preload-modules.conf" - PACKAGE_ARCH = "${MACHINE_ARCH}" ALLOW_EMPTY_${PN} = "1" -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/8] bitbake.conf: set CONFFILES by default
There are a lot of binary packages have files in /etc/, but only a few of them have set CONFFILES, more than 180 packages are not set in a world build. So treat all the files in /etc/ as CONFFILES as Debian does: - All the files in /etc/ are CONFFILES - Move the file out of /etc/ if it is not a conffile - If /etc/foo can't be moved out, and is changed during runtime, then create a symlink /etc/foo -> /var/foo [YOCTO #8436] Signed-off-by: Robert Yang --- meta/conf/bitbake.conf |1 + 1 file changed, 1 insertion(+) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 2fe6b24..f0e4b3a 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -271,6 +271,7 @@ PACKAGE_BEFORE_PN ?= "" PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN}" PACKAGES_DYNAMIC = "^${PN}-locale-.*" FILES = "" +CONFFILES = "${sysconfdir}/*" FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/8] recipes-connectivity: cleanup CONFFILES
The ${sysconfdir}/* are CONFFILES by default. [YOCTO #8436] Signed-off-by: Robert Yang --- meta/recipes-connectivity/avahi/avahi.inc |2 -- meta/recipes-connectivity/bind/bind_9.10.3-P2.bb | 11 --- .../nfs-utils/nfs-utils_1.3.3.bb |2 +- meta/recipes-connectivity/openssh/openssh_7.1p1.bb |3 --- meta/recipes-connectivity/ppp/ppp_2.4.7.bb |1 - .../wpa-supplicant/wpa-supplicant_2.5.bb |1 - 6 files changed, 1 insertion(+), 19 deletions(-) diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index 825197d..966dfe0 100644 --- a/meta/recipes-connectivity/avahi/avahi.inc +++ b/meta/recipes-connectivity/avahi/avahi.inc @@ -113,8 +113,6 @@ RRECOMMENDS_avahi-dev_append_libc-glibc = " gettext-dev" RRECOMMENDS_avahi-dev[nodeprrecs] = "1" -CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" - INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd" INITSCRIPT_NAME_avahi-daemon = "avahi-daemon" INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19" diff --git a/meta/recipes-connectivity/bind/bind_9.10.3-P2.bb b/meta/recipes-connectivity/bind/bind_9.10.3-P2.bb index 875a0c8..06165b1 100644 --- a/meta/recipes-connectivity/bind/bind_9.10.3-P2.bb +++ b/meta/recipes-connectivity/bind/bind_9.10.3-P2.bb @@ -93,14 +93,3 @@ do_install_append() { install -m 0644 ${WORKDIR}/bind9 ${D}${sysconfdir}/default } -CONFFILES_${PN} = " \ - ${sysconfdir}/bind/named.conf \ - ${sysconfdir}/bind/named.conf.local \ - ${sysconfdir}/bind/named.conf.options \ - ${sysconfdir}/bind/db.0 \ - ${sysconfdir}/bind/db.127 \ - ${sysconfdir}/bind/db.empty \ - ${sysconfdir}/bind/db.local \ - ${sysconfdir}/bind/db.root \ - " - diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.3.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.3.bb index 2e0c8b1..30f068d 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.3.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.3.bb @@ -75,7 +75,7 @@ CONFFILES_${PN}-client += "${localstatedir}/lib/nfs/etab \ ${localstatedir}/lib/nfs/rmtab \ ${localstatedir}/lib/nfs/xtab \ ${localstatedir}/lib/nfs/statd/state \ - ${sysconfdir}/nfsmount.conf" + " FILES_${PN}-client = "${base_sbindir}/*mount.nfs* ${sbindir}/*statd \ ${sbindir}/rpc.idmapd ${sbindir}/sm-notify \ diff --git a/meta/recipes-connectivity/openssh/openssh_7.1p1.bb b/meta/recipes-connectivity/openssh/openssh_7.1p1.bb index d81127c..cf0bd71 100644 --- a/meta/recipes-connectivity/openssh/openssh_7.1p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_7.1p1.bb @@ -149,9 +149,6 @@ RCONFLICTS_${PN} = "dropbear" RCONFLICTS_${PN}-sshd = "dropbear" RCONFLICTS_${PN}-keygen = "ssh-keygen" -CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config" -CONFFILES_${PN}-ssh = "${sysconfdir}/ssh/ssh_config" - ALTERNATIVE_PRIORITY = "90" ALTERNATIVE_${PN}-scp = "scp" ALTERNATIVE_${PN}-ssh = "ssh" diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb index 5f06034..0a1063e 100644 --- a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb +++ b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb @@ -75,7 +75,6 @@ do_install_append () { chmod u+s ${D}${sbindir}/pppd } -CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options" PACKAGES =+ "${PN}-oa ${PN}-oe ${PN}-radius ${PN}-winbind ${PN}-minconn ${PN}-password ${PN}-l2tp ${PN}-tools" FILES_${PN}= "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd ${systemd_unitdir}/system/ppp@.service" FILES_${PN}-oa = "${libdir}/pppd/${PV}/pppoatm.so" diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.5.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.5.bb index 2126377..111429a 100644 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.5.bb +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.5.bb @@ -34,7 +34,6 @@ PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli " FILES_wpa-supplicant-passphrase = "${bindir}/wpa_passphrase" FILES_wpa-supplicant-cli = "${sbindir}/wpa_cli" FILES_${PN} += "${datadir}/dbus-1/system-services/*" -CONFFILES_${PN} += "${sysconfdir}/wpa_supplicant.conf" do_configure () { ${MAKE} -C wpa_supplicant clean -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/8] bitbake.conf: set CONFFILES by default
The following changes since commit 541315d6c56df6448f64c262f99d43d5c1e9400b: update_font_cache: only scan system font directories (2016-01-11 23:23:18 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/conf http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/conf Robert Yang (8): bitbake.conf: set CONFFILES by default recipes-bsp: cleanup CONFFILES recipes-connectivity: cleanup CONFFILES recipes-extended: cleanup CONFFILES recipes-core: cleanup CONFFILES recipes-devtools: cleanup CONFFILES recipes-graphics: cleanup CONFFILES recipes-multimedia/sato/support: cleanup CONFFILES meta/conf/bitbake.conf |1 + meta/recipes-bsp/alsa-state/alsa-state.bb |1 - meta/recipes-bsp/pcmciautils/pcmciautils.inc |2 -- meta/recipes-connectivity/avahi/avahi.inc |2 -- meta/recipes-connectivity/bind/bind_9.10.3-P2.bb | 11 --- .../nfs-utils/nfs-utils_1.3.3.bb |2 +- meta/recipes-connectivity/openssh/openssh_7.1p1.bb |3 --- meta/recipes-connectivity/ppp/ppp_2.4.7.bb |1 - .../wpa-supplicant/wpa-supplicant_2.5.bb |1 - meta/recipes-core/base-files/base-files_3.0.14.bb |4 meta/recipes-core/busybox/busybox.inc |3 --- meta/recipes-core/dbus/dbus_1.8.20.bb |2 -- meta/recipes-core/glibc/glibc-package.inc |1 - .../init-ifupdown/init-ifupdown_1.0.bb |1 - meta/recipes-core/initscripts/initscripts_1.0.bb |2 -- meta/recipes-core/netbase/netbase_5.3.bb |2 -- meta/recipes-core/readline/readline.inc|2 -- meta/recipes-core/systemd/systemd_228.bb |7 --- .../sysvinit/sysvinit-inittab_2.88dsf.bb |1 - meta/recipes-core/udev/udev-extraconf_1.1.bb |1 - meta/recipes-devtools/opkg/opkg-arch-config_1.0.bb |2 -- meta/recipes-devtools/opkg/opkg_0.3.1.bb |1 - meta/recipes-extended/cronie/cronie_1.5.0.bb |1 - meta/recipes-extended/cups/cups.inc|1 - meta/recipes-extended/lighttpd/lighttpd_1.4.38.bb |2 -- meta/recipes-extended/logrotate/logrotate_3.9.1.bb |3 +-- meta/recipes-extended/pam/libpam_1.2.1.bb |5 - meta/recipes-extended/procps/procps_3.3.11.bb |2 -- meta/recipes-extended/sudo/sudo.inc|2 -- meta/recipes-extended/sysklogd/sysklogd.inc|1 - meta/recipes-extended/tzdata/tzdata_2015g.bb |3 --- meta/recipes-extended/xinetd/xinetd_2.3.15.bb |2 -- .../xinput-calibrator/pointercal-xinput_0.0.bb |1 - .../xorg-xserver/xserver-xf86-config_0.1.bb|3 --- meta/recipes-multimedia/pulseaudio/pulseaudio.inc |8 .../pulseaudio-client-conf-sato_1.bb |1 - .../ca-certificates/ca-certificates_20150426.bb|4 37 files changed, 3 insertions(+), 89 deletions(-) -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] insane.bbclass: make package_qa_walk() can print all the messages
* If more than one files have the same QA issue, package_qa_walk() can only print the last one, others are overrided, for example: messages["host-user-contaminated"] = "foo1" messages["host-user-contaminated"] = "foo2" Only foo2 will be printed, this patch fixes the issue. * Remove unused parameter "path" from package_qa_walk() The path is a useless parameter in package_qa_walk() since it has been redined inside. [YOCTO #8436] Signed-off-by: Robert Yang --- meta/classes/insane.bbclass | 20 +--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index bf6a598..bb58f79 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -753,8 +753,15 @@ def package_qa_check_staged(path,d): return sane +# Merge src dict's content into dest +def package_qa_merge_dict(dest, src): +if len(dest) == len(src) and dest != src: +for w in src: +if dest[w] != src[w]: +dest[w] = src[w] + '\n' + dest[w] + # Walk over all files in a directory and call func -def package_qa_walk(path, warnfuncs, errorfuncs, skip, package, d): +def package_qa_walk(warnfuncs, errorfuncs, skip, package, d): import oe.qa #if this will throw an exception, then fix the dict above @@ -770,9 +777,17 @@ def package_qa_walk(path, warnfuncs, errorfuncs, skip, package, d): except: elf = None for func in warnfuncs: +warnings_orig = warnings.copy() func(path, package, d, elf, warnings) +# warnings[foo] = "foo1" might be overrided by +# warnings [foo] = "foo2", check and merge. +package_qa_merge_dict(warnings, warnings_orig) for func in errorfuncs: +errors_orig = errors.copy() func(path, package, d, elf, errors) +# errors[foo] = "foo1" might be overrided by +# errors [foo] = "foo2", check and merge. +package_qa_merge_dict(errors, errors_orig) for w in warnings: package_qa_handle_error(w, warnings[w], d) @@ -1098,8 +1113,7 @@ python do_package_qa () { package_qa_handle_error("pkgname", "%s doesn't match the [a-z0-9.+-]+ regex" % package, d) -path = "%s/%s" % (pkgdest, package) -if not package_qa_walk(path, warnchecks, errorchecks, skip, package, d): +if not package_qa_walk(warnchecks, errorchecks, skip, package, d): walk_sane = False if not package_qa_check_rdepends(package, pkgdest, skip, taskdeps, packages, d): rdepends_sane = False -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] insane.bbclass: make package_qa_walk() can print all the messages
The following changes since commit 541315d6c56df6448f64c262f99d43d5c1e9400b: update_font_cache: only scan system font directories (2016-01-11 23:23:18 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/qa http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/qa Robert Yang (1): insane.bbclass: make package_qa_walk() can print all the messages meta/classes/insane.bbclass | 20 +--- 1 file changed, 17 insertions(+), 3 deletions(-) -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] e2fsprogs: 1.42.9 -> 1.43-WIP
The following changes since commit 541315d6c56df6448f64c262f99d43d5c1e9400b: update_font_cache: only scan system font directories (2016-01-11 23:23:18 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/e2fsprogs http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/e2fsprogs Robert Yang (1): e2fsprogs: 1.42.9 -> 1.43-WIP meta/recipes-devtools/e2fsprogs/e2fsprogs.inc |8 +- ...1-e2fsprogs-fix-cross-compilation-problem.patch | 55 --- ...-fix-potential-buffer-overflow-in-closefs.patch | 59 --- ...the-ability-to-copy-files-from-a-given-di.patch | 98 ...isc-create_inode.c-copy-files-recursively.patch | 135 -- ...3-misc-create_inode.c-create-special-file.patch | 103 .../0004-misc-create_inode.c-create-symlink.patch | 63 --- ...005-misc-create_inode.c-copy-regular-file.patch | 224 - ...0006-misc-create_inode.c-create-directory.patch | 62 --- ..._inode.c-set-owner-mode-time-for-the-inod.patch | 81 ...8-mke2fs.c-add-an-option-d-root-directory.patch | 168 --- ...0009-misc-create_inode.c-handle-hardlinks.patch | 210 - ...-use-the-functions-in-misc-create_inode.c.patch | 496 ...s.8.in-update-the-manual-for-the-d-option.patch | 43 -- .../e2fsprogs/0012-Fix-musl-build-failures.patch | 54 --- .../e2fsprogs/e2fsprogs/CVE-2015-0247.patch| 58 --- .../e2fsprogs/e2fsprogs/cache_inode.patch | 52 -- ...ate-hardlinks-with-the-correct-directory-.patch | 81 .../e2fsprogs/e2fsprogs/fix-icache.patch | 65 --- ...c-return-error-when-failed-to-populate-fs.patch | 37 -- .../e2fsprogs/e2fsprogs/mkdir.patch| 32 +- .../e2fsprogs/e2fsprogs/ptest.patch| 35 +- .../{e2fsprogs_1.42.9.bb => e2fsprogs_git.bb} | 44 +- 23 files changed, 43 insertions(+), 2220 deletions(-) delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsprogs-fix-cross-compilation-problem.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-potential-buffer-overflow-in-closefs.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-mke2fs-add-the-ability-to-copy-files-from-a-given-di.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0002-misc-create_inode.c-copy-files-recursively.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0003-misc-create_inode.c-create-special-file.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0004-misc-create_inode.c-create-symlink.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0005-misc-create_inode.c-copy-regular-file.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0006-misc-create_inode.c-create-directory.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0007-misc-create_inode.c-set-owner-mode-time-for-the-inod.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0008-mke2fs.c-add-an-option-d-root-directory.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0009-misc-create_inode.c-handle-hardlinks.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0010-debugfs-use-the-functions-in-misc-create_inode.c.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0011-mke2fs.8.in-update-the-manual-for-the-d-option.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0012-Fix-musl-build-failures.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/CVE-2015-0247.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/cache_inode.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/copy-in-create-hardlinks-with-the-correct-directory-.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/fix-icache.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/misc-mke2fs.c-return-error-when-failed-to-populate-fs.patch rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.42.9.bb => e2fsprogs_git.bb} (61%) -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] e2fsprogs: 1.42.9 -> 1.43-WIP
Upgrade to 1.43-WIP to make "mke2fs -d" support xattr, so that the layer which requires xattr such as meta-selinux can populate images easily. * Remove the following patches since they are alredy in the source. 0001-e2fsprogs-fix-cross-compilation-problem.patch 0001-libext2fs-fix-potential-buffer-overflow-in-closefs.patch 0001-mke2fs-add-the-ability-to-copy-files-from-a-given-di.patch 0002-misc-create_inode.c-copy-files-recursively.patch 0003-misc-create_inode.c-create-special-file.patch 0004-misc-create_inode.c-create-symlink.patch 0005-misc-create_inode.c-copy-regular-file.patch 0006-misc-create_inode.c-create-directory.patch 0007-misc-create_inode.c-set-owner-mode-time-for-the-inod.patch 0008-mke2fs.c-add-an-option-d-root-directory.patch 0009-misc-create_inode.c-handle-hardlinks.patch 0010-debugfs-use-the-functions-in-misc-create_inode.c.patch 0011-mke2fs.8.in-update-the-manual-for-the-d-option.patch 0012-Fix-musl-build-failures.patch CVE-2015-0247.patch copy-in-create-hardlinks-with-the-correct-directory-.patch fix-icache.patch misc-mke2fs.c-return-error-when-failed-to-populate-fs.patch * Remove cache_inode.patch since it is not needed any more * Updated mkdir.patch and ptest.patch * Add --enable-libblkid to EXTRA_OECONF since libblkid is not created by default. * Time of core-image-sato-sdk do_rootfs: - Before upgrade real3m18.508s user7m42.088s sys 1m1.984s - After upgrade real3m21.552s user7m38.496s sys 1m0.644s The are nearly the same * The "fsck -fn" shows the image is OK, and also can boot. [YOCTO #8622] Signed-off-by: Robert Yang --- meta/recipes-devtools/e2fsprogs/e2fsprogs.inc |8 +- ...1-e2fsprogs-fix-cross-compilation-problem.patch | 55 --- ...-fix-potential-buffer-overflow-in-closefs.patch | 59 --- ...the-ability-to-copy-files-from-a-given-di.patch | 98 ...isc-create_inode.c-copy-files-recursively.patch | 135 -- ...3-misc-create_inode.c-create-special-file.patch | 103 .../0004-misc-create_inode.c-create-symlink.patch | 63 --- ...005-misc-create_inode.c-copy-regular-file.patch | 224 - ...0006-misc-create_inode.c-create-directory.patch | 62 --- ..._inode.c-set-owner-mode-time-for-the-inod.patch | 81 ...8-mke2fs.c-add-an-option-d-root-directory.patch | 168 --- ...0009-misc-create_inode.c-handle-hardlinks.patch | 210 - ...-use-the-functions-in-misc-create_inode.c.patch | 496 ...s.8.in-update-the-manual-for-the-d-option.patch | 43 -- .../e2fsprogs/0012-Fix-musl-build-failures.patch | 54 --- .../e2fsprogs/e2fsprogs/CVE-2015-0247.patch| 58 --- .../e2fsprogs/e2fsprogs/cache_inode.patch | 52 -- ...ate-hardlinks-with-the-correct-directory-.patch | 81 .../e2fsprogs/e2fsprogs/fix-icache.patch | 65 --- ...c-return-error-when-failed-to-populate-fs.patch | 37 -- .../e2fsprogs/e2fsprogs/mkdir.patch| 32 +- .../e2fsprogs/e2fsprogs/ptest.patch| 35 +- .../{e2fsprogs_1.42.9.bb => e2fsprogs_git.bb} | 44 +- 23 files changed, 43 insertions(+), 2220 deletions(-) delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-e2fsprogs-fix-cross-compilation-problem.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-potential-buffer-overflow-in-closefs.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-mke2fs-add-the-ability-to-copy-files-from-a-given-di.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0002-misc-create_inode.c-copy-files-recursively.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0003-misc-create_inode.c-create-special-file.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0004-misc-create_inode.c-create-symlink.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0005-misc-create_inode.c-copy-regular-file.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0006-misc-create_inode.c-create-directory.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0007-misc-create_inode.c-set-owner-mode-time-for-the-inod.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0008-mke2fs.c-add-an-option-d-root-directory.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0009-misc-create_inode.c-handle-hardlinks.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0010-debugfs-use-the-functions-in-misc-create_inode.c.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0011-mke2fs.8.in-update-the-manual-for-the-d-option.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0012-Fix-musl-build-failures.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/CVE-2015-0247.patch delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/cache_inode.patch
[OE-core] [PATCH v3] net-tools_1.60-26.bb: Error fix
when set PATCHTOOL = "patch" in conf/local.conf,error will occur in the step of do_patch. The error is: "quilt: command not found",so fix it. Signed-off-by: Li Xin --- meta/recipes-extended/net-tools/net-tools_1.60-26.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb index 923d048..632aee7 100644 --- a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb +++ b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb @@ -31,6 +31,7 @@ UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/net-tools/" inherit gettext +do_patch[depends] = "quilt-native:do_populate_sysroot" # The Makefile is lame, no parallel build PARALLEL_MAKE = "" -- 1.8.4.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] u-boot: Update to 2016.01 release
On Friday, January 15, 2016 at 12:42:18 AM, Otavio Salvador wrote: > On Thu, Jan 14, 2016 at 7:41 PM, Marek Vasut wrote: > > On Thursday, January 14, 2016 at 10:37:16 PM, Otavio Salvador wrote: > >> On Thu, Jan 14, 2016 at 7:15 PM, Marek Vasut wrote: > >> ... > >> > >> > Taking a look at u-boot.inc and uboot-config.bbclass makes me wonder > >> > how all that could work at all. It's either a stackpile of legacy > >> > cruft or just poor design. > >> > >> I think it is a mix of both. > >> > >> How would you address this in a clean way? > > > > I would have one U-Boot build per package. Debian doesn't do it that way > > tho, so their rationale might be something to consider here too. > > This is what we do in uboot-config class, isn't it? The class lacks documentation and is written in rather obscure way, so I am not sure about how the result is packaged, sorry. > Without going deep on the minor details, could you describe how you > think it should be done? Can you be more specific about this "it" ? What do you refer to ? Best regards, Marek Vasut -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [jethro]PATCH 00/17] devtool/extensible SDK backports for jethro (cover letter only)
The following changes since commit 901af5a00338fd8f1ace939123484ea91c090a7a: libaio: don't disable linking to the system libraries (2016-01-14 15:18:16 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib paule/jethro-fixes2-oecore http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/jethro-fixes2-oecore Ed Bartosh (1): devtool: use cp instead of shutil.copytree Paul Eggleton (16): classes/populate_sdk_ext: error out of install if buildtools install fails devtool: sdk-update: fix traceback without update server set recipetool: create: handle https://git URLs recipetool: create: avoid traceback on fetch error recipetool: create: fix do_install handling for makefile-only software recipetool: create: prevent attempting to unpack entire DL_DIR recipetool: create: detect when specified URL returns a web page recipetool: create: fix error when extracting source to a specified directory buildhistory: fix not recording SDK information scripts/oe-publish-sdk: add missing call to git update-server-info classes/populate_sdk_ext: fix cascading from preparation failure classes/populate_sdk_ext: disable signature warnings devtool: sdk-update: fix not using updateserver config file option devtool: sdk-update: fix metadata update step devtool: sdk-update: fix error checking devtool: reset: do clean for multiple recipes at once with -a meta/classes/buildhistory.bbclass | 2 +- meta/classes/populate_sdk_ext.bbclass | 6 ++-- scripts/lib/devtool/sdk.py| 54 +++ scripts/lib/devtool/standard.py | 25 +++--- scripts/lib/recipetool/create.py | 28 +--- scripts/lib/recipetool/create_buildsys.py | 2 +- scripts/lib/scriptutils.py| 4 +++ scripts/oe-publish-sdk| 4 +-- 8 files changed, 74 insertions(+), 51 deletions(-) -- 2.5.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] openssh: update to 7.1p2
On 01/14/2016 07:38 AM, Alexander Kanavin wrote: > This fixes a number of security issues. > > Signed-off-by: Alexander Kanavin This should apply to Jethro to as its the same version. - armin > --- > .../openssh/{openssh_7.1p1.bb => openssh_7.1p2.bb}| 4 > ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > rename meta/recipes-connectivity/openssh/{openssh_7.1p1.bb => > openssh_7.1p2.bb} (97%) > > diff --git a/meta/recipes-connectivity/openssh/openssh_7.1p1.bb > b/meta/recipes-connectivity/openssh/openssh_7.1p2.bb > similarity index 97% > rename from meta/recipes-connectivity/openssh/openssh_7.1p1.bb > rename to meta/recipes-connectivity/openssh/openssh_7.1p2.bb > index d81127c..ac824ee 100644 > --- a/meta/recipes-connectivity/openssh/openssh_7.1p1.bb > +++ b/meta/recipes-connectivity/openssh/openssh_7.1p2.bb > @@ -24,8 +24,8 @@ SRC_URI = > "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar. > > PAM_SRC_URI = "file://sshd" > > -SRC_URI[md5sum] = "8709736bc8a8c253bc4eeb4829888ca5" > -SRC_URI[sha256sum] = > "fc0a6d2d1d063d5c66dffd952493d0cda256cad204f681de0f84ef85b2ad8428" > +SRC_URI[md5sum] = "4d8547670e2a220d5ef805ad9e47acf2" > +SRC_URI[sha256sum] = > "dd75f024dcf21e06a0d6421d582690bf987a1f6323e32ad6619392f3bfde6bbd" > > inherit useradd update-rc.d update-alternatives systemd > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] u-boot: Update to 2016.01 release
On Thu, Jan 14, 2016 at 7:41 PM, Marek Vasut wrote: > On Thursday, January 14, 2016 at 10:37:16 PM, Otavio Salvador wrote: >> On Thu, Jan 14, 2016 at 7:15 PM, Marek Vasut wrote: >> ... >> >> > Taking a look at u-boot.inc and uboot-config.bbclass makes me wonder how >> > all that could work at all. It's either a stackpile of legacy cruft or >> > just poor design. >> >> I think it is a mix of both. >> >> How would you address this in a clean way? > > I would have one U-Boot build per package. Debian doesn't do it that way tho, > so their rationale might be something to consider here too. This is what we do in uboot-config class, isn't it? Without going deep on the minor details, could you describe how you think it should be done? -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] ptests: Update references to new ptest-runner2.
classes/ptest.bbclass: Now recommends ptest-runner2 instead of ptest-runner. oeqa/runtime/_ptest.py: Now validate if ptest-runner2 is installed. Signed-off-by: Aníbal Limón --- meta/classes/ptest.bbclass | 2 +- meta/lib/oeqa/runtime/_ptest.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes/ptest.bbclass b/meta/classes/ptest.bbclass index fa3561e..c84ca97 100644 --- a/meta/classes/ptest.bbclass +++ b/meta/classes/ptest.bbclass @@ -12,7 +12,7 @@ PTEST_ENABLED_class-nativesdk = "" PTEST_ENABLED_class-cross-canadian = "" RDEPENDS_${PN}-ptest_class-native = "" RDEPENDS_${PN}-ptest_class-nativesdk = "" -RRECOMMENDS_${PN}-ptest += "ptest-runner" +RRECOMMENDS_${PN}-ptest += "ptest-runner2" PACKAGES =+ "${@bb.utils.contains('PTEST_ENABLED', '1', '${PN}-ptest', '', d)}" diff --git a/meta/lib/oeqa/runtime/_ptest.py b/meta/lib/oeqa/runtime/_ptest.py index 0621028..d1e51a4 100644 --- a/meta/lib/oeqa/runtime/_ptest.py +++ b/meta/lib/oeqa/runtime/_ptest.py @@ -105,10 +105,10 @@ class PtestRunnerTest(oeRuntimeTest): def test_ptestrunner(self): self.add_smart_channel() (runnerstatus, result) = self.target.run('which ptest-runner', 0) -cond = oeRuntimeTest.hasPackage("ptest-runner") and oeRuntimeTest.hasFeature("ptest") and oeRuntimeTest.hasPackage("-ptest") and (runnerstatus != 0) +cond = oeRuntimeTest.hasPackage("ptest-runner2") and oeRuntimeTest.hasFeature("ptest") and oeRuntimeTest.hasPackage("-ptest") and (runnerstatus != 0) if cond: self.install_packages(self.install_complementary("*-ptest")) -self.install_packages(['ptest-runner']) +self.install_packages(['ptest-runner2']) (runnerstatus, result) = self.target.run('/usr/bin/ptest-runner > /tmp/ptest.log 2>&1', 0) #exit code is !=0 even if ptest-runner executes because some ptest tests fail. -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] ptest-runner2: Add new ptest-runner2 recipe.
The ptest-runner2 is C written program for run ptests of Yocto/Openembedded, is fully compatible with previous version of ptest-runner that was a shell script that runs ptests sequencially. The mainly reason for the new ptest-runner in C is because is designed for run in tiny systems also the old shell script version have problems when certain ptest hang it becomes blocked indefinitely. Now the ptest-runner2 support the next features: - Specify the directory for search ptests. - List available ptests. - Specify the timeout for avoid blocking indefinetly. - Only run certain ptests. Proposed features: - Adds support for per ptest output file. - Adds support for run ptests in parallel (review possible colisions in ptests). [YOCTO #8021] Signed-off-by: Aníbal Limón --- .../ptest-runner2/ptest-runner2_0.1.bb | 24 ++ 1 file changed, 24 insertions(+) create mode 100644 meta/recipes-support/ptest-runner2/ptest-runner2_0.1.bb diff --git a/meta/recipes-support/ptest-runner2/ptest-runner2_0.1.bb b/meta/recipes-support/ptest-runner2/ptest-runner2_0.1.bb new file mode 100644 index 000..97c640c --- /dev/null +++ b/meta/recipes-support/ptest-runner2/ptest-runner2_0.1.bb @@ -0,0 +1,24 @@ +SUMMARY = "A C program to run all installed ptests" +DESCRIPTION = "The ptest-runner2 package installs a ptest-runner \ +program which loops through all installed ptest test suites and \ +runs them in sequence." +HOMEPAGE = "https://github.com/alimon/ptest-runner2"; + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" + +SRC_URI = "git://github.com/alimon/ptest-runner2.git;protocol=https;tag=v0.1" +PV = "0.1+git${SRCPV}" +S = "${WORKDIR}/git" + +FILES_${PN} = "${bindir}/ptest-runner" + +RCONFLICTS_${PN} = "ptest-runner" + +do_compile () { + oe_runmake +} + +do_install () { + install -D -m 0755 ${WORKDIR}/git/ptest-runner ${D}${bindir}/ptest-runner +} -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] Update dev-manual to point to the new ptest-runner2.
Signed-off-by: Aníbal Limón --- documentation/dev-manual/dev-manual-common-tasks.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml index dbf493a..767f51c 100644 --- a/documentation/dev-manual/dev-manual-common-tasks.xml +++ b/documentation/dev-manual/dev-manual-common-tasks.xml @@ -7488,8 +7488,8 @@ Running ptest -The ptest-runner package installs a -shell script that loops through all installed ptest test +The ptest-runner2 package installs a +program that loops through all installed ptest test suites and runs them in sequence. Consequently, you might want to add this package to your image. -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] ptest-runner2 C implementation
This is the changes that adds new ptest-runner2 C implementation a detail description exists in the recipe adding. You can review the ptest-runner2 code on [1], i wrote unit tests for all the code using check framework also i used mtrace for found possible memory leaks. Finally i tested the new runner on qemux86, qemuarm, qemumips, qemuppc using core-image-minimal and qemux86/poky-tiny/core-image-minimal. [YOCTO #8021] [1] https://github.com/alimon/ptest-runner2 The following changes since commit 92cc02fe517bad0af4e493fda3331738cbcc9a26: linux-yocto: Update Genericx86* BSPs to 4.1.15 (2016-01-14 15:18:46 +) are available in the git repository at: git://git.yoctoproject.org/poky-contrib alimon/ptest-runner2 http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=alimon/ptest-runner2 Aníbal Limón (3): ptest-runner2: Add new ptest-runner2 recipe. ptests: Update references to new ptest-runner2. Update dev-manual to point to the new ptest-runner2. .../dev-manual/dev-manual-common-tasks.xml | 4 ++-- meta/classes/ptest.bbclass | 2 +- meta/lib/oeqa/runtime/_ptest.py| 4 ++-- .../ptest-runner2/ptest-runner2_0.1.bb | 24 ++ 4 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-support/ptest-runner2/ptest-runner2_0.1.bb -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] u-boot: Update to 2016.01 release
On Thursday, January 14, 2016 at 10:37:16 PM, Otavio Salvador wrote: > On Thu, Jan 14, 2016 at 7:15 PM, Marek Vasut wrote: > ... > > > Taking a look at u-boot.inc and uboot-config.bbclass makes me wonder how > > all that could work at all. It's either a stackpile of legacy cruft or > > just poor design. > > I think it is a mix of both. > > How would you address this in a clean way? I would have one U-Boot build per package. Debian doesn't do it that way tho, so their rationale might be something to consider here too. I would also have exactly one variable to for a machine and it would be the name of the config _WITHOUT_ any _config or _defconfig or _whatever suffix. Best regards, Marek Vasut -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] u-boot: Update to 2016.01 release
On Thu, Jan 14, 2016 at 7:15 PM, Marek Vasut wrote: ... > Taking a look at u-boot.inc and uboot-config.bbclass makes me wonder how all > that could work at all. It's either a stackpile of legacy cruft or just poor > design. I think it is a mix of both. How would you address this in a clean way? -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] u-boot: Update to 2016.01 release
On Thursday, January 14, 2016 at 09:43:24 PM, Otavio Salvador wrote: > On Wed, Jan 13, 2016 at 8:09 PM, Tom Rini wrote: > > On Wed, Jan 13, 2016 at 01:55:56PM -0200, Otavio Salvador wrote: > >> On Wed, Jan 13, 2016 at 1:53 PM, Marek Vasut wrote: > >> > On Wednesday, January 13, 2016 at 04:39:53 PM, Otavio Salvador wrote: > >> >> On Wed, Jan 13, 2016 at 12:34 PM, Marek Vasut wrote: > >> >> > On Wednesday, January 13, 2016 at 01:04:31 PM, Otavio Salvador wrote: > >> >> >> On Wed, Jan 13, 2016 at 1:36 AM, Marek Vasut wrote: > >> >> >> > Upgrade U-Boot to latest version and drop upstreamed patches. > >> >> >> > > >> >> >> > Repair configuration of U-Boot during build. It is no longer > >> >> >> > possible to run "make foomachine" in U-Boot. Instead, it is > >> >> >> > necessary to do "make foomachine_defconfig ; make". Fix this > >> >> >> > in u-boot.inc and u-boot-fw-utils*.bb . > >> >> >> > >> >> >> Please drop this config suffix, from u-boot.inc. The config value > >> >> >> should be used as is and the respective BSP ought to be fixed to > >> >> >> change _config to _defconfig. > >> >> > > >> >> > If I don't have the _defconfig there AND I define UBOOT_MACHINE in > >> >> > my machine file, it will call "make machine", which no longer > >> >> > works. > >> >> > >> >> I know and the right fix is to use the right value to UBOOT_MACHINE > >> >> as we do for KERNEL_DEVICETREE. > >> > > >> > So what is the right value ? UBOOT_MACHINE := "foo_defconfig" ? This > >> > does not sound right at all. > >> > > >> > And what is the right value of UBOOT_CONFIG then ? > >> > >> foo_defconfig. > >> > >> This is what we pass for make to configure the board and should be the > >> given value. > >> > >> As we does for device tree, where we pass for KERNEL_DEVICETREE: > >> > >> foo-bar.dtb > >> > >> and this is also given for the make, for the kernel. > > > > This is not the same thing in my view. In the kernel you're also > > getting that as the output file. > > > > What we should do, and I've wanted to do for ages but always never get > > around to it is: > > > > do_configure() { > > > > oe_runmake ${UBOOT_MACHINE}_config > > > > } > > > > do_compile() { > > > > oe_runmake > > > > } > > > > As _config has worked for forever. And modify the above as-needed for > > the env recipes and so forth. > > Any change like this need to be proposed as another patch; please > split this patch in upgrade and logic change. So we review and test > them separated. The change would be more involved, because the u-boot build scripts are seriously misdesigned and for example somehow expect that you can invoke do_compile() and expect it to produce multiple u-boot binaries for different configurations. Taking a look at u-boot.inc and uboot-config.bbclass makes me wonder how all that could work at all. It's either a stackpile of legacy cruft or just poor design. Best regards, Marek Vasut -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] Use TUNE_CCARGS for target compilation
On 1/14/16 3:24 PM, Andre McCurdy wrote: > Hi Peter, > > On Thu, Jan 14, 2016 at 1:04 PM, Peter Seebach > wrote: >> The initial gcc configuration is using TARGET_CFLAGS, but this is >> probably not what is intended, because TARGET_CFLAGS doesn't include >> any architecture-specific flags. > > I think the current behaviour is deliberate, in order to try to make > it possible to reuse gcc binaries across builds for machines with > different CPU tuning flags. > > See the comments associated with this commit from 2014, which > effectively makes all ARM toolchains default to soft float (instead of > defaulting to fpu calling convention of the target machine). > > > http://git.openembedded.org/openembedded-core/commit/?id=ce1f3fd20d81545d6d5dfc68f86f9fddf8ac9bbf > >> For PPC64, it's possible to end up with gcc configured to pass -a64 to >> the assembler, but be itself getting invoked without -m64, which can result >> in alignment problems in generated code. Solution: Instead of setting >> CFLAGS_FOR_TARGET to TARGET_CFLAGS, set it to TARGET_CFLAGS + TUNE_CCARGS. > > Could that PPC64 issue be solved in the same way that the default arch > is set in gcc-configure-common.inc for the various MIPS targets? > > EXTRA_OECONF_append_mips64 = " --with-abi=64 --with-arch-64=mips64 > --with-tune-64=mips64" > EXTRA_OECONF_append_mips64el = " --with-abi=64 --with-arch-64=mips64 > --with-tune-64=mips64" > EXTRA_OECONF_append_mips64n32 = " --with-abi=64 > --with-arch-64=mips64 --with-tune-64=mips64" > EXTRA_OECONF_append_mips64eln32 = " --with-abi=64 > --with-arch-64=mips64 --with-tune-64=mips64" The issue Peter was working on is specific to building something that runs on the host. (or the hostsdk machine). The problem is, if you are building for a target that say needs -mpowerpc. That won't work when you pass it to the compiler building an x86_64 target binary. So in the crosssdk case (host to -sdk- target) we clear the TUNE_*ARGS since they are not relevant. Then int he main gcc setup, we manually setup the target CCFLAGS to include the tune elements so when NOT in the crosssdk, they will be properly included and build the -target- pieces with the correct options. (target pieces such as the .o files gcc needs to produce.) --Mark > >> However, for crosssdk cases, we need to prevent that from having any >> effect; this can be done by emptying out the TUNE_*ARGS flags in the >> crosssdk bbclass, because there is no "target tune" in crosssdk cases. >> >> Signed-off-by: Peter Seebach >> --- >> meta/classes/crosssdk.bbclass | 4 >> meta/recipes-devtools/gcc/gcc-configure-common.inc | 2 +- >> meta/recipes-devtools/gcc/gcc-cross.inc| 2 +- >> 3 files changed, 6 insertions(+), 2 deletions(-) >> >> diff --git a/meta/classes/crosssdk.bbclass b/meta/classes/crosssdk.bbclass >> index 7315c38..ccff3ce 100644 >> --- a/meta/classes/crosssdk.bbclass >> +++ b/meta/classes/crosssdk.bbclass >> @@ -6,6 +6,10 @@ PACKAGE_ARCH = "${SDK_ARCH}" >> python () { >> # set TUNE_PKGARCH to SDK_ARCH >> d.setVar('TUNE_PKGARCH', d.getVar('SDK_ARCH', True)) >> + # We're not running a 'target', so clear these... >> + d.setVar('TUNE_CCARGS', '') >> + d.setVar('TUNE_LDARGS', '') >> + d.setVar('TUNE_ASARGS', '') >> } >> >> STAGING_DIR_TARGET = >> "${STAGING_DIR}/${SDK_ARCH}-${SDKPKGSUFFIX}${SDK_VENDOR}-${SDK_OS}" >> diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc >> b/meta/recipes-devtools/gcc/gcc-configure-common.inc >> index 45b3f15..4b4d91d 100644 >> --- a/meta/recipes-devtools/gcc/gcc-configure-common.inc >> +++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc >> @@ -120,7 +120,7 @@ do_configure () { >> export CPPFLAGS_FOR_BUILD="${BUILD_CPPFLAGS}" >> export CXXFLAGS_FOR_BUILD="${BUILD_CXXFLAGS}" >> export LDFLAGS_FOR_BUILD="${BUILD_LDFLAGS}" >> - export CFLAGS_FOR_TARGET="${TARGET_CFLAGS}" >> + export CFLAGS_FOR_TARGET="${TARGET_CFLAGS} ${TUNE_CCARGS}" >> export CPPFLAGS_FOR_TARGET="${TARGET_CPPFLAGS}" >> export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}" >> export LDFLAGS_FOR_TARGET="${TARGET_LDFLAGS}" >> diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc >> b/meta/recipes-devtools/gcc/gcc-cross.inc >> index aa10633..b6020a4 100644 >> --- a/meta/recipes-devtools/gcc/gcc-cross.inc >> +++ b/meta/recipes-devtools/gcc/gcc-cross.inc >> @@ -43,7 +43,7 @@ do_compile () { >> export LD_FOR_TARGET="${TARGET_SYS}-ld" >> export NM_FOR_TARGET="${TARGET_SYS}-nm" >> export CC_FOR_TARGET="${CCACHE} ${TARGET_SYS}-gcc" >> - export CFLAGS_FOR_TARGET="${TARGET_CFLAGS}" >> + export CFLAGS_FOR_TARGET="${TARGET_CFLAGS} ${TUNE_CCARGS}" >> export CPPFLAGS_FOR_TARGET="${TARGET_CPPFLAGS}" >> export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}" >> export LDFLAGS_FOR_TARGET="${TARGET_LDFLAGS}" >> -- >> 2.3.1 >> >> -- >>
Re: [OE-core] [PATCH 1/1] Use TUNE_CCARGS for target compilation
On Thu, 14 Jan 2016 13:24:22 -0800 Andre McCurdy wrote: > Could that PPC64 issue be solved in the same way that the default arch > is set in gcc-configure-common.inc for the various MIPS targets? Huh. That might be a better choice. I hadn't noticed that default arch selection thing. It would make sense to use that. I'll give it a look and see whether it works. -s -- Listen, get this. Nobody with a good compiler needs to be justified. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] Use TUNE_CCARGS for target compilation
Hi Peter, On Thu, Jan 14, 2016 at 1:04 PM, Peter Seebach wrote: > The initial gcc configuration is using TARGET_CFLAGS, but this is > probably not what is intended, because TARGET_CFLAGS doesn't include > any architecture-specific flags. I think the current behaviour is deliberate, in order to try to make it possible to reuse gcc binaries across builds for machines with different CPU tuning flags. See the comments associated with this commit from 2014, which effectively makes all ARM toolchains default to soft float (instead of defaulting to fpu calling convention of the target machine). http://git.openembedded.org/openembedded-core/commit/?id=ce1f3fd20d81545d6d5dfc68f86f9fddf8ac9bbf > For PPC64, it's possible to end up with gcc configured to pass -a64 to > the assembler, but be itself getting invoked without -m64, which can result > in alignment problems in generated code. Solution: Instead of setting > CFLAGS_FOR_TARGET to TARGET_CFLAGS, set it to TARGET_CFLAGS + TUNE_CCARGS. Could that PPC64 issue be solved in the same way that the default arch is set in gcc-configure-common.inc for the various MIPS targets? EXTRA_OECONF_append_mips64 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" EXTRA_OECONF_append_mips64el = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" EXTRA_OECONF_append_mips64n32 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" EXTRA_OECONF_append_mips64eln32 = " --with-abi=64 --with-arch-64=mips64 --with-tune-64=mips64" > However, for crosssdk cases, we need to prevent that from having any > effect; this can be done by emptying out the TUNE_*ARGS flags in the > crosssdk bbclass, because there is no "target tune" in crosssdk cases. > > Signed-off-by: Peter Seebach > --- > meta/classes/crosssdk.bbclass | 4 > meta/recipes-devtools/gcc/gcc-configure-common.inc | 2 +- > meta/recipes-devtools/gcc/gcc-cross.inc| 2 +- > 3 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/meta/classes/crosssdk.bbclass b/meta/classes/crosssdk.bbclass > index 7315c38..ccff3ce 100644 > --- a/meta/classes/crosssdk.bbclass > +++ b/meta/classes/crosssdk.bbclass > @@ -6,6 +6,10 @@ PACKAGE_ARCH = "${SDK_ARCH}" > python () { > # set TUNE_PKGARCH to SDK_ARCH > d.setVar('TUNE_PKGARCH', d.getVar('SDK_ARCH', True)) > + # We're not running a 'target', so clear these... > + d.setVar('TUNE_CCARGS', '') > + d.setVar('TUNE_LDARGS', '') > + d.setVar('TUNE_ASARGS', '') > } > > STAGING_DIR_TARGET = > "${STAGING_DIR}/${SDK_ARCH}-${SDKPKGSUFFIX}${SDK_VENDOR}-${SDK_OS}" > diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc > b/meta/recipes-devtools/gcc/gcc-configure-common.inc > index 45b3f15..4b4d91d 100644 > --- a/meta/recipes-devtools/gcc/gcc-configure-common.inc > +++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc > @@ -120,7 +120,7 @@ do_configure () { > export CPPFLAGS_FOR_BUILD="${BUILD_CPPFLAGS}" > export CXXFLAGS_FOR_BUILD="${BUILD_CXXFLAGS}" > export LDFLAGS_FOR_BUILD="${BUILD_LDFLAGS}" > - export CFLAGS_FOR_TARGET="${TARGET_CFLAGS}" > + export CFLAGS_FOR_TARGET="${TARGET_CFLAGS} ${TUNE_CCARGS}" > export CPPFLAGS_FOR_TARGET="${TARGET_CPPFLAGS}" > export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}" > export LDFLAGS_FOR_TARGET="${TARGET_LDFLAGS}" > diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc > b/meta/recipes-devtools/gcc/gcc-cross.inc > index aa10633..b6020a4 100644 > --- a/meta/recipes-devtools/gcc/gcc-cross.inc > +++ b/meta/recipes-devtools/gcc/gcc-cross.inc > @@ -43,7 +43,7 @@ do_compile () { > export LD_FOR_TARGET="${TARGET_SYS}-ld" > export NM_FOR_TARGET="${TARGET_SYS}-nm" > export CC_FOR_TARGET="${CCACHE} ${TARGET_SYS}-gcc" > - export CFLAGS_FOR_TARGET="${TARGET_CFLAGS}" > + export CFLAGS_FOR_TARGET="${TARGET_CFLAGS} ${TUNE_CCARGS}" > export CPPFLAGS_FOR_TARGET="${TARGET_CPPFLAGS}" > export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}" > export LDFLAGS_FOR_TARGET="${TARGET_LDFLAGS}" > -- > 2.3.1 > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] matchbox-keyboard: Fix build failure with ld-is-gold
How does that patch help with this issue? It seems to be adding ifunc support which isn't obviously related to the problem at hand. p. On Thu, 2016-01-14 at 10:27 -0800, Khem Raj wrote: > Carlos > > Can you try this fix > > https://github.com/kraj/openembedded-core/commit/0e35ad5a35262cfb7a6249ce158f76d1399d6cb4 > > > This should help with this issue. > > > > On Sep 14, 2015, at 4:01 PM, Carlos Alberto Lopez Perez > > wrote: > > > > On 14/09/15 09:24, Khem Raj wrote: > >> > >>> On Sep 11, 2015, at 7:51 AM, Phil Blundell wrote: > >>> > >>> On Fri, 2015-09-11 at 14:49 +0200, Carlos Alberto Lopez Perez wrote: > * When ld-is-gold is enabled in DISTRO_FEATURES, matchbox-keyboard > will fail to build with this error: > > ld: error: matchbox-keyboard-image.o: requires unsupported dynamic > reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC > >>> > >>> This is only an issue for ARM (and only for Thumb2 at that). I don't > >>> think it's necessarily appropriate to force -fPIC on all targets. > >>> > >>> Also, before adding this sort of hack it would be worth verifying > >>> whether this is in fact a toolchain bug and, if it is, fixing it there. > >>> > >> > >> This may not be a toolchain bug if there is a MOVW_ABS relocation being > >> emitted > >> into an object that is eventually linked into shared library. Using -fPIC > >> seems to be right fix > >> I know bfd linker silently ignored these relocations and generated bad .so > >> files but that was fixed > >> several years ago. So I think what needs to be looked at is why does same > >> .o links ok with bfd linker > >> is it some linker trampoline code thats in question here which may be > >> different between gold and ld > >> > >> Carlos > >> > >> Can you check the linker cmdline of failing link step and see if its > >> generating a shared object there ? > >> if thats the case and I assume gcc is generating this relocation into both > >> > > > > It looks is generating an executable (matchbox-keyboard). > > > > Full log: http://sprunge.us/VPIN > > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] image.bbclass: Handle image base type dependency properly
When a base image type has an implicit dependency (from IMAGE_TYPEDEP) this has to be taken into account. This is a regression introduced by OE-Core:c2dab18 (image: Create separate tasks for rootfs construction). The issue has been found when building meta-fsl-arm based images which does not include the rootfs image type explicitly in IMAGE_FSTYPES but instead is added, using IMAGE_TYPEDEP, for the 'sdcard.gz' image. Reported-by: Fabio Berton Signed-off-by: Otavio Salvador --- meta/classes/image.bbclass | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 48505c8..657f9bf 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -334,6 +334,9 @@ python () { _add_type(dep) basedep = _image_base_type(dep) typedeps[baset].add(basedep) + +if baset != t: +_add_type(baset) for t in alltypes[:]: _add_type(t) -- 2.7.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] directfb.inc: enable bfd linker workaround for all arm targets
Hi Khem, On Thu, Jan 14, 2016 at 10:25 AM, Khem Raj wrote: > Andre > > I have a fix for this issue in binutils > > can you try it out if it works for you ? > > https://github.com/kraj/openembedded-core/commit/0e35ad5a35262cfb7a6249ce158f76d1399d6cb4 I cherry picked 5803c581 from your master branch. It does indeed seem to fix the errors previously seen with the gold linker. >> On Dec 21, 2015, at 5:07 PM, Andre McCurdy wrote: >> >> Although the gold linker problems with DirectFB have only so far been >> observed with armv7a, they could potentially affect future arm targets >> too. Since there's no particular downside to using the bfd linker for >> DirectFB, apply the workaround to all arm targets. >> >> Signed-off-by: Andre McCurdy >> --- >> meta/recipes-graphics/directfb/directfb.inc | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/meta/recipes-graphics/directfb/directfb.inc >> b/meta/recipes-graphics/directfb/directfb.inc >> index b905ab0..603aba3 100644 >> --- a/meta/recipes-graphics/directfb/directfb.inc >> +++ b/meta/recipes-graphics/directfb/directfb.inc >> @@ -23,7 +23,7 @@ S = "${WORKDIR}/DirectFB-${PV}" >> LDFLAGS_append =" -lts -lm" >> >> # Workaround for linking issues seen with armv7a + gold >> -LDFLAGS_append_armv7a = "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', >> ' -fuse-ld=bfd ', '', d)}" >> +LDFLAGS_append_arm = "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', ' >> -fuse-ld=bfd ', '', d)}" >> >> BINCONFIG = "${bindir}/directfb-config" >> >> -- >> 1.9.1 >> >> -- >> ___ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] Use TUNE_CCARGS for target compilation
The initial gcc configuration is using TARGET_CFLAGS, but this is probably not what is intended, because TARGET_CFLAGS doesn't include any architecture-specific flags. For PPC64, it's possible to end up with gcc configured to pass -a64 to the assembler, but be itself getting invoked without -m64, which can result in alignment problems in generated code. Solution: Instead of setting CFLAGS_FOR_TARGET to TARGET_CFLAGS, set it to TARGET_CFLAGS + TUNE_CCARGS. However, for crosssdk cases, we need to prevent that from having any effect; this can be done by emptying out the TUNE_*ARGS flags in the crosssdk bbclass, because there is no "target tune" in crosssdk cases. Signed-off-by: Peter Seebach --- meta/classes/crosssdk.bbclass | 4 meta/recipes-devtools/gcc/gcc-configure-common.inc | 2 +- meta/recipes-devtools/gcc/gcc-cross.inc| 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/classes/crosssdk.bbclass b/meta/classes/crosssdk.bbclass index 7315c38..ccff3ce 100644 --- a/meta/classes/crosssdk.bbclass +++ b/meta/classes/crosssdk.bbclass @@ -6,6 +6,10 @@ PACKAGE_ARCH = "${SDK_ARCH}" python () { # set TUNE_PKGARCH to SDK_ARCH d.setVar('TUNE_PKGARCH', d.getVar('SDK_ARCH', True)) + # We're not running a 'target', so clear these... + d.setVar('TUNE_CCARGS', '') + d.setVar('TUNE_LDARGS', '') + d.setVar('TUNE_ASARGS', '') } STAGING_DIR_TARGET = "${STAGING_DIR}/${SDK_ARCH}-${SDKPKGSUFFIX}${SDK_VENDOR}-${SDK_OS}" diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc index 45b3f15..4b4d91d 100644 --- a/meta/recipes-devtools/gcc/gcc-configure-common.inc +++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc @@ -120,7 +120,7 @@ do_configure () { export CPPFLAGS_FOR_BUILD="${BUILD_CPPFLAGS}" export CXXFLAGS_FOR_BUILD="${BUILD_CXXFLAGS}" export LDFLAGS_FOR_BUILD="${BUILD_LDFLAGS}" - export CFLAGS_FOR_TARGET="${TARGET_CFLAGS}" + export CFLAGS_FOR_TARGET="${TARGET_CFLAGS} ${TUNE_CCARGS}" export CPPFLAGS_FOR_TARGET="${TARGET_CPPFLAGS}" export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}" export LDFLAGS_FOR_TARGET="${TARGET_LDFLAGS}" diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc index aa10633..b6020a4 100644 --- a/meta/recipes-devtools/gcc/gcc-cross.inc +++ b/meta/recipes-devtools/gcc/gcc-cross.inc @@ -43,7 +43,7 @@ do_compile () { export LD_FOR_TARGET="${TARGET_SYS}-ld" export NM_FOR_TARGET="${TARGET_SYS}-nm" export CC_FOR_TARGET="${CCACHE} ${TARGET_SYS}-gcc" - export CFLAGS_FOR_TARGET="${TARGET_CFLAGS}" + export CFLAGS_FOR_TARGET="${TARGET_CFLAGS} ${TUNE_CCARGS}" export CPPFLAGS_FOR_TARGET="${TARGET_CPPFLAGS}" export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}" export LDFLAGS_FOR_TARGET="${TARGET_LDFLAGS}" -- 2.3.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] Fix target cflags for gcc cross builds
In some cases, CFLAGS_FOR_TARGET may need to have tune-specific compiler flags, particularly if you're trying to build a multilib compiler which won't automatically pick the right ABI, bit size, etc. by default if invoked without them. After some experimentation and thought, I concluded that cross gcc should use these in CFLAGS_FOR_TARGET, but crosssdk shouldn't. This appears to work, at least for the reasonably obvious cases. We did this back in November, and I thought I submitted it then, but apparently the email never made it out. Rebased against current master. The following changes since commit 541315d6c56df6448f64c262f99d43d5c1e9400b: update_font_cache: only scan system font directories (2016-01-11 23:23:18 +) are available in the git repository at: git://git.yoctoproject.org/poky-contrib seebs/gcc_target_args http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=seebs/gcc_target_args Peter Seebach (1): Use TUNE_CCARGS for target compilation meta/classes/crosssdk.bbclass | 4 meta/recipes-devtools/gcc/gcc-configure-common.inc | 2 +- meta/recipes-devtools/gcc/gcc-cross.inc| 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) -- 2.3.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RFC][PATCH 5/9] glib: use bash-completion.bbclass
Use bash-completion.bbclass to package bash completions. Signed-off-by: George McCollister --- meta/recipes-core/glib-2.0/glib.inc | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 86f7e0e..079b214 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -22,12 +22,12 @@ DEPENDS_append = " ${@bb.utils.contains('PTEST_ENABLED', '1', ' glib-2.0-native DEPENDS_class-native = "pkgconfig-native gettext-native libffi-native zlib-native" DEPENDS_class-nativesdk = "nativesdk-libtool nativesdk-gettext nativesdk-libffi nativesdk-zlib" -PACKAGES =+ "${PN}-utils ${PN}-bash-completion ${PN}-codegen" +PACKAGES =+ "${PN}-utils ${PN}-codegen" LEAD_SONAME = "libglib-2.0.*" FILES_${PN}-utils = "${bindir}/* ${datadir}/glib-2.0/gettext" -inherit autotools gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even +inherit autotools gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion S = "${WORKDIR}/glib-${PV}" @@ -51,8 +51,6 @@ FILES_${PN}-dev += "${libdir}/glib-2.0/include \ ${libdir}/gio/modules/*.la" FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb" FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py" -FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d \ - ${datadir}/bash-completion" ARM_INSTRUCTION_SET = "arm" USE_NLS = "yes" -- 2.4.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RFC][PATCH 6/9] util-linux: use bash-completion.bbclass
Use bash-completion.bbclass to package bash completions. Signed-off-by: George McCollister --- meta/recipes-core/util-linux/util-linux.inc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 7ef7a54..b9961f7 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=1715f5ee3e01203ca1e1e0b9ee65918c file://libmount/COPYING;md5=fb93f01d4361069c5616327705373b16 \ file://libblkid/COPYING;md5=fb93f01d4361069c5616327705373b16" -inherit autotools gettext pkgconfig systemd update-alternatives python-dir ptest +inherit autotools gettext pkgconfig systemd update-alternatives python-dir ptest bash-completion DEPENDS = "zlib ncurses" DEPENDS_append_class-native = " lzo-native" DEPENDS_append_class-nativesdk = " lzo-native" @@ -31,7 +31,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \ util-linux-mkfs util-linux-mcookie util-linux-reset util-linux-runuser \ util-linux-mkfs.cramfs util-linux-fsck.cramfs util-linux-fstrim \ - util-linux-partx ${PN}-bash-completion util-linux-hwclock \ + util-linux-partx util-linux-hwclock \ util-linux-findfs util-linux-getopt util-linux-sulogin" PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" @@ -64,7 +64,6 @@ PACKAGECONFIG[pylibmount] = "--with-python --enable-pylibmount,--without-python # Readline support PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" -FILES_${PN}-bash-completion += "${datadir}/bash-completion" FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" FILES_${PN}-dev += "${libdir}/${PYTHON_DIR}/dist-packages/libmount/pylibmount.la" -- 2.4.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RFC][PATCH 4/9] dbus-glib: use bash-completion.bbclass
Use bash-completion.bbclass to package bash completions. Signed-off-by: George McCollister --- meta/recipes-core/dbus/dbus-glib.inc | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/dbus/dbus-glib.inc b/meta/recipes-core/dbus/dbus-glib.inc index f8c0ebe..4661e3a 100644 --- a/meta/recipes-core/dbus/dbus-glib.inc +++ b/meta/recipes-core/dbus/dbus-glib.inc @@ -15,7 +15,7 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz file://test-install-makefile.patch \ " -inherit autotools pkgconfig gettext +inherit autotools pkgconfig gettext bash-completion #default disable regression tests, some unit test code in non testing code #PACKAGECONFIG_pn-${PN} = "tests" enable regression tests local.conf @@ -26,11 +26,10 @@ EXTRA_OECONF = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-in --with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool" EXTRA_OECONF_class-native = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml" -PACKAGES += "${PN}-bash-completion ${PN}-tests" +PACKAGES += "${PN}-tests" FILES_${PN} = "${libdir}/lib*${SOLIBS}" -FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d/dbus-bash-completion.sh \ - ${libexecdir}/dbus-bash-completion-helper" +FILES_${PN}-bash-completion += "${libexecdir}/dbus-bash-completion-helper" FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" FILES_${PN}-dev += "${bindir}/dbus-binding-tool" -- 2.4.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RFC][PATCH 9/9] gstreamer1.0: use bash-completion.bbclass
Use bash-completion.bbclass to package bash completions. Signed-off-by: George McCollister --- meta/recipes-multimedia/gstreamer/gstreamer1.0.inc | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc index c10f66f..5688b5e 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc @@ -7,7 +7,7 @@ SECTION = "multimedia" LICENSE = "LGPLv2+" DEPENDS = "glib-2.0 libxml2 bison-native flex-native libcap" -inherit autotools pkgconfig gettext upstream-version-is-even +inherit autotools pkgconfig gettext upstream-version-is-even bash-completion PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" PACKAGECONFIG[check] = "--enable-check,--disable-check" @@ -26,6 +26,3 @@ CACHED_CONFIGUREVARS += "ac_cv_header_valgrind_valgrind_h=no" FILES_${PN} += " ${libdir}/gstreamer-1.0/*.so" FILES_${PN}-dev += " ${libdir}/gstreamer-1.0/*.la ${libdir}/gstreamer-1.0/*.a ${libdir}/gstreamer-1.0/include" -FILES_${PN}-bash-completion += " ${datadir}/bash-completion/completions/ ${datadir}/bash-completion/helpers/gst*" - -PACKAGES += " ${PN}-bash-completion" -- 2.4.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RFC][PATCH 8/9] kmod: use bash-completion.bbclass
Use bash-completion.bbclass to package bash completions. Signed-off-by: George McCollister --- meta/recipes-kernel/kmod/kmod_git.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/kmod/kmod_git.bb index e0bb95c..69185b2 100644 --- a/meta/recipes-kernel/kmod/kmod_git.bb +++ b/meta/recipes-kernel/kmod/kmod_git.bb @@ -39,7 +39,7 @@ do_compile_prepend() { sed -i 's/ac_pwd=/#ac_pwd=/' config.status ; sed -i "/#ac_pwd=/a\ac_pwd='.'" config.status } -inherit update-alternatives +inherit update-alternatives bash-completion ALTERNATIVE_PRIORITY = "60" @@ -56,8 +56,7 @@ ALTERNATIVE_TARGET[lsmod] = "${base_bindir}/lsmod.${BPN}" ALTERNATIVE_LINK_NAME[depmod] = "${base_sbindir}/depmod" -PACKAGES =+ "libkmod ${PN}-bash-completion" +PACKAGES =+ "libkmod" FILES_libkmod = "${base_libdir}/libkmod*${SOLIBS} ${libdir}/libkmod*${SOLIBS}" FILES_${PN} += "${base_libdir}/depmod.d ${base_libdir}/modprobe.d" -FILES_${PN}-bash-completion = "${datadir}/bash-completion" -- 2.4.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RFC][PATCH 7/9] git: use bash-completion.bbclass
Use bash-completion.bbclass to package bash completions. Signed-off-by: George McCollister --- meta/recipes-devtools/git/git.inc | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index d9770e6..c19e0d4 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc @@ -17,7 +17,7 @@ EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \ --without-tcltk \ " -inherit autotools-brokensep perlnative +inherit autotools-brokensep perlnative bash-completion EXTRA_OEMAKE = "NO_PYTHON=1 CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'" EXTRA_OEMAKE += "'PERL_PATH=/usr/bin/env perl'" @@ -96,10 +96,6 @@ PERLTOOLS = " \ ${datadir}/git-core/templates/hooks/pre-rebase.sample \ " -# Basic tab completion support -PACKAGES =+ "${PN}-bash-completion" -FILES_${PN}-bash-completion = "${datadir}/bash-completion/completions/*" - # Git tools requiring perl PACKAGES =+ "${PN}-perltools" FILES_${PN}-perltools += " \ -- 2.4.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RFC][PATCH 3/9] bash-completion.bbclass: add class
Add bash-completion.bbclass which will package bash completion files in a subpackage ${PN}-bash-completion. Use of this class will ensure consitent handling of bash completions across recipes. Signed-off-by: George McCollister --- meta/classes/bash-completion.bbclass | 5 + 1 file changed, 5 insertions(+) create mode 100644 meta/classes/bash-completion.bbclass diff --git a/meta/classes/bash-completion.bbclass b/meta/classes/bash-completion.bbclass new file mode 100644 index 000..74a878e --- /dev/null +++ b/meta/classes/bash-completion.bbclass @@ -0,0 +1,5 @@ +PACKAGES += "${PN}-bash-completion" + +FILES_${PN}-bash-completion = "${datadir}/bash-completion ${sysconfdir}/bash_completion.d" + +RDEPENDS_${PN}-bash-completion = "bash-completion" -- 2.4.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RFC][PATCH 0/9] cleanup packaging of bash completions
Recipes in OE core and meta-oe (possibly others too) package bash completion files in a similar but inconsitent manner. This patch series adds a class bash-completion.bbclass that creates a subpackage containing files installed to the common bash-completion paths. Prior to this series some recipes created bash-completion subpackages which had no RDEPENDS, others with bash-completion and yet others with bash. I decided to have the class add an RDEPENDS for bash-completion and move bash-completion to OE-core for this reason. If someone has a different view on what should be done please, speak up. I'll be posting an accompanying series to openembedded-devel for meta-oe. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RFC][PATCH 1/9] bash-completion: move in recipe from meta-oe
Recipes in OE core are building packages that should RDEPEND on bash-completion so it should be in this layer. Signed-off-by: George McCollister --- .../bash-completion/bash-completion_2.1.bb | 39 ++ 1 file changed, 39 insertions(+) create mode 100644 meta/recipes-support/bash-completion/bash-completion_2.1.bb diff --git a/meta/recipes-support/bash-completion/bash-completion_2.1.bb b/meta/recipes-support/bash-completion/bash-completion_2.1.bb new file mode 100644 index 000..fbe4278 --- /dev/null +++ b/meta/recipes-support/bash-completion/bash-completion_2.1.bb @@ -0,0 +1,39 @@ +SUMMARY = "Programmable Completion for Bash 4" +HOMEPAGE = "http://bash-completion.alioth.debian.org/"; +BUGTRACKER = "https://alioth.debian.org/projects/bash-completion/"; + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +SECTION = "console/utils" + +SRC_URI="http://bash-completion.alioth.debian.org/files/${BPN}-${PV}.tar.bz2"; + +SRC_URI[md5sum] = "4e2a9f11a4042a38ee79ddcd048e8b9e" +SRC_URI[sha256sum] = "2b606804a7d5f823380a882e0f7b6c8a37b0e768e72c3d4107c51fbe8a46ae4f" + +PARALLEL_MAKE = "" + +inherit autotools + +do_install_append() { + # compatdir + install -d ${D}${sysconfdir}/bash_completion.d/ + echo '. ${datadir}/${BPN}/bash_completion' >${D}${sysconfdir}/bash_completion + + # Delete files already provided by util-linux + local i + for i in cal dmesg eject hexdump hwclock ionice look renice rtcwake su; do + rm ${D}${datadir}/${BPN}/completions/$i + done + + # Delete files for networkmanager + rm ${D}${datadir}/${BPN}/completions/nmcli +} + +RDEPENDS_${PN} = "bash" + +# Some recipes are providing ${PN}-bash-completion packages +PACKAGES =+ "${PN}-extra" +FILES_${PN}-extra = "${datadir}/${BPN}/completions/ \ +${datadir}/${BPN}/helpers/" -- 2.4.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RFC][PATCH 2/9] bash-completion: build nativesdk variant
The nativesdk variant is required for some recipes like git to use the class. Signed-off-by: George McCollister --- meta/recipes-support/bash-completion/bash-completion_2.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-support/bash-completion/bash-completion_2.1.bb b/meta/recipes-support/bash-completion/bash-completion_2.1.bb index fbe4278..5c39863 100644 --- a/meta/recipes-support/bash-completion/bash-completion_2.1.bb +++ b/meta/recipes-support/bash-completion/bash-completion_2.1.bb @@ -37,3 +37,5 @@ RDEPENDS_${PN} = "bash" PACKAGES =+ "${PN}-extra" FILES_${PN}-extra = "${datadir}/${BPN}/completions/ \ ${datadir}/${BPN}/helpers/" + +BBCLASSEXTEND = "nativesdk" -- 2.4.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] u-boot: Update to 2016.01 release
On Thu, Jan 14, 2016 at 1:17 AM, Marek Vasut wrote: > Upgrade U-Boot to latest version and drop upstreamed patches. > > Signed-off-by: Marek Vasut Acked-by: Otavio Salvador -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] opkg-utils: store alternatives in nonarch_libdir
From: Daniel McGregor opkg-utils-native stores alternative info in /usr/lib, so do the same on the target. Signed-off-by: Daniel McGregor --- meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb index b242d1f..1bc561c 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb @@ -34,7 +34,7 @@ do_install() { do_install_append_class-target() { if [ -e "${D}${bindir}/update-alternatives" ]; then - sed -i ${D}${bindir}/update-alternatives -e 's,/usr/bin,${bindir},g; s,/usr/lib,${libdir},g' + sed -i ${D}${bindir}/update-alternatives -e 's,/usr/bin,${bindir},g; s,/usr/lib,${nonarch_libdir},g' fi } -- 2.7.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] bitbake.conf: make localedir nonarch
From: Daniel McGregor systemd and others expect locales to be in nonarch_libdir, regardless of the base library directory. Signed-off-by: Daniel McGregor --- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 2fe6b24..47f8a43 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -44,7 +44,7 @@ export libdir = "${exec_prefix}/${baselib}" export libexecdir = "${libdir}/${BPN}" export includedir = "${exec_prefix}/include" export oldincludedir = "${exec_prefix}/include" -localedir = "${libdir}/locale" +localedir = "${nonarch_libdir}/locale" # Linkage between native/cross/nativesdk layouts base_bindir_native = "/bin" -- 2.7.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] BASELIB != lib fixes
From: Dan McGregor These solve a few issues when libdir is /usr/lib64. The commits are also available in the git repository at: git://git.openembedded.org/openembedded-core-contrib.git dankm/libdir Daniel McGregor (2): bitbake.conf: make localedir nonarch opkg-utils: store alternatives in nonarch_libdir meta/conf/bitbake.conf | 2 +- meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.7.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] u-boot: Update to 2016.01 release
On Wed, Jan 13, 2016 at 8:09 PM, Tom Rini wrote: > On Wed, Jan 13, 2016 at 01:55:56PM -0200, Otavio Salvador wrote: >> On Wed, Jan 13, 2016 at 1:53 PM, Marek Vasut wrote: >> > On Wednesday, January 13, 2016 at 04:39:53 PM, Otavio Salvador wrote: >> >> On Wed, Jan 13, 2016 at 12:34 PM, Marek Vasut wrote: >> >> > On Wednesday, January 13, 2016 at 01:04:31 PM, Otavio Salvador wrote: >> >> >> On Wed, Jan 13, 2016 at 1:36 AM, Marek Vasut wrote: >> >> >> > Upgrade U-Boot to latest version and drop upstreamed patches. >> >> >> > >> >> >> > Repair configuration of U-Boot during build. It is no longer >> >> >> > possible to run "make foomachine" in U-Boot. Instead, it is >> >> >> > necessary to do "make foomachine_defconfig ; make". Fix this >> >> >> > in u-boot.inc and u-boot-fw-utils*.bb . >> >> >> >> >> >> Please drop this config suffix, from u-boot.inc. The config value >> >> >> should be used as is and the respective BSP ought to be fixed to >> >> >> change _config to _defconfig. >> >> > >> >> > If I don't have the _defconfig there AND I define UBOOT_MACHINE in my >> >> > machine file, it will call "make machine", which no longer works. >> >> >> >> I know and the right fix is to use the right value to UBOOT_MACHINE as >> >> we do for KERNEL_DEVICETREE. >> > >> > So what is the right value ? UBOOT_MACHINE := "foo_defconfig" ? This does >> > not sound right at all. >> > >> > And what is the right value of UBOOT_CONFIG then ? >> >> foo_defconfig. >> >> This is what we pass for make to configure the board and should be the >> given value. >> >> As we does for device tree, where we pass for KERNEL_DEVICETREE: >> >> foo-bar.dtb >> >> and this is also given for the make, for the kernel. > > This is not the same thing in my view. In the kernel you're also > getting that as the output file. > > What we should do, and I've wanted to do for ages but always never get > around to it is: > > do_configure() { > oe_runmake ${UBOOT_MACHINE}_config > } > > do_compile() { > oe_runmake > } > > As _config has worked for forever. And modify the above as-needed for > the env recipes and so forth. Any change like this need to be proposed as another patch; please split this patch in upgrade and logic change. So we review and test them separated. -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] matchbox-keyboard: Fix build failure with ld-is-gold
Carlos Can you try this fix https://github.com/kraj/openembedded-core/commit/0e35ad5a35262cfb7a6249ce158f76d1399d6cb4 This should help with this issue. > On Sep 14, 2015, at 4:01 PM, Carlos Alberto Lopez Perez > wrote: > > On 14/09/15 09:24, Khem Raj wrote: >> >>> On Sep 11, 2015, at 7:51 AM, Phil Blundell wrote: >>> >>> On Fri, 2015-09-11 at 14:49 +0200, Carlos Alberto Lopez Perez wrote: * When ld-is-gold is enabled in DISTRO_FEATURES, matchbox-keyboard will fail to build with this error: ld: error: matchbox-keyboard-image.o: requires unsupported dynamic reloc R_ARM_MOVW_ABS_NC; recompile with -fPIC >>> >>> This is only an issue for ARM (and only for Thumb2 at that). I don't >>> think it's necessarily appropriate to force -fPIC on all targets. >>> >>> Also, before adding this sort of hack it would be worth verifying >>> whether this is in fact a toolchain bug and, if it is, fixing it there. >>> >> >> This may not be a toolchain bug if there is a MOVW_ABS relocation being >> emitted >> into an object that is eventually linked into shared library. Using -fPIC >> seems to be right fix >> I know bfd linker silently ignored these relocations and generated bad .so >> files but that was fixed >> several years ago. So I think what needs to be looked at is why does same .o >> links ok with bfd linker >> is it some linker trampoline code thats in question here which may be >> different between gold and ld >> >> Carlos >> >> Can you check the linker cmdline of failing link step and see if its >> generating a shared object there ? >> if thats the case and I assume gcc is generating this relocation into both >> > > It looks is generating an executable (matchbox-keyboard). > > Full log: http://sprunge.us/VPIN > signature.asc Description: Message signed with OpenPGP using GPGMail -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] directfb.inc: enable bfd linker workaround for all arm targets
Andre I have a fix for this issue in binutils can you try it out if it works for you ? https://github.com/kraj/openembedded-core/commit/0e35ad5a35262cfb7a6249ce158f76d1399d6cb4 > On Dec 21, 2015, at 5:07 PM, Andre McCurdy wrote: > > Although the gold linker problems with DirectFB have only so far been > observed with armv7a, they could potentially affect future arm targets > too. Since there's no particular downside to using the bfd linker for > DirectFB, apply the workaround to all arm targets. > > Signed-off-by: Andre McCurdy > --- > meta/recipes-graphics/directfb/directfb.inc | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/recipes-graphics/directfb/directfb.inc > b/meta/recipes-graphics/directfb/directfb.inc > index b905ab0..603aba3 100644 > --- a/meta/recipes-graphics/directfb/directfb.inc > +++ b/meta/recipes-graphics/directfb/directfb.inc > @@ -23,7 +23,7 @@ S = "${WORKDIR}/DirectFB-${PV}" > LDFLAGS_append =" -lts -lm" > > # Workaround for linking issues seen with armv7a + gold > -LDFLAGS_append_armv7a = "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', ' > -fuse-ld=bfd ', '', d)}" > +LDFLAGS_append_arm = "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', ' > -fuse-ld=bfd ', '', d)}" > > BINCONFIG = "${bindir}/directfb-config" > > -- > 1.9.1 > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core signature.asc Description: Message signed with OpenPGP using GPGMail -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/3] Introduces kernel-initramfs recipe to resolve a implicit dependency issue
Just bumping this review to let you know that I haven't forgotten about it. I've been looking at the details at least twice now, but haven't managed to sort everything out. I'll pick this up again shortly. Bruce On 16-01-05 08:12 AM, Ming Liu wrote: In current initramfs bundled kernel packaging policy, there are several dependency chains co-existing: | "core-image-minimal.do_build" -> "core-image-minimal.do_bundle_initramfs" | "core-image-minimal.do_bundle_initramfs" -> "virtual/kernel.do_bundle_initramfs" | "core-image-minimal.do_bundle_initramfs" -> "core-image-minimal.do_rootfs" | "core-image-minimal.do_rootfs" -> "virtual/kernel.do_package_write_${IMAGE_PKGTYPE}" | "virtual/kernel.do_package_write_${IMAGE_PKGTYPE}" -> "virtual/kernel.do_package" | "virtual/kernel.do_package" -> "virtual/kernel.do_install" | | "virtual/kernel.do_deploy" -> "virtual/kernel.do_bundle_initramfs" | "virtual/kernel.do_bundle_initramfs" -> "virtual/kernel.do_install" We could see, virtual/kernel.do_package is not explicitly depending on virtual/kernel.do_bundle_initramfs so far, therefore, there is not a workable way to add initramfs bundled kernel image into rootfs, because kernel's do_bundle_initramfs could run parallelly with its do_package, which means we will get a implicit kernel-image package that sometimes it contains the initramfs bundled kernel or sometimes it doesn't. To fix this problem, the idea is to let the initramfs bundled kernel packaging depend on do_bundle_initramfs, meanwhile, to avoid the circular dependency issue that commit: 609d5a9ab9e58bb1c2bcc2145399fbc8b701b85a [ kernel.bbclass, image.bbclass: Implement kernel INITRAMFS dependency and bundling ] was trying to address, this dependency has to be splitted from kernel recipe(at least, I could not figure out another way to achieve it), so a new kernel-initramfs is introduced, in which a dependency chain is created: | "kernel-initramfs.do_install" -> "virtual/kernel.do_deploy" | "virtual/kernel.do_deploy" -> "virtual/kernel.do_bundle_initramfs" Then the users can add initramfs bundled kernel image into rootfs by: IMAGE_INSTALL_append = " kernel-initramfs" without introducing any circular dependencies. Ming Liu (3): kernel.bbclass: do not install initramfs bundled kernel image image.bbclass: removes bundle_initramfs related code kernel-initramfs: new recipe, creates initramfs bundled kernel packaging meta/classes/image.bbclass| 11 - meta/classes/kernel.bbclass | 4 -- meta/recipes-kernel/linux/kernel-initramfs.bb | 69 +++ 3 files changed, 69 insertions(+), 15 deletions(-) create mode 100644 meta/recipes-kernel/linux/kernel-initramfs.bb -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] openssh: update to 7.1p2
This fixes a number of security issues. Signed-off-by: Alexander Kanavin --- .../openssh/{openssh_7.1p1.bb => openssh_7.1p2.bb}| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-connectivity/openssh/{openssh_7.1p1.bb => openssh_7.1p2.bb} (97%) diff --git a/meta/recipes-connectivity/openssh/openssh_7.1p1.bb b/meta/recipes-connectivity/openssh/openssh_7.1p2.bb similarity index 97% rename from meta/recipes-connectivity/openssh/openssh_7.1p1.bb rename to meta/recipes-connectivity/openssh/openssh_7.1p2.bb index d81127c..ac824ee 100644 --- a/meta/recipes-connectivity/openssh/openssh_7.1p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_7.1p2.bb @@ -24,8 +24,8 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar. PAM_SRC_URI = "file://sshd" -SRC_URI[md5sum] = "8709736bc8a8c253bc4eeb4829888ca5" -SRC_URI[sha256sum] = "fc0a6d2d1d063d5c66dffd952493d0cda256cad204f681de0f84ef85b2ad8428" +SRC_URI[md5sum] = "4d8547670e2a220d5ef805ad9e47acf2" +SRC_URI[sha256sum] = "dd75f024dcf21e06a0d6421d582690bf987a1f6323e32ad6619392f3bfde6bbd" inherit useradd update-rc.d update-alternatives systemd -- 2.6.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] matchbox-keyboard: export GTK_IM_MODULE_FILE location
Hi, gentle ping on this one. On Mon, Jan 04, 2016 at 05:20:57PM +0200, Maxin B. John wrote: > This commit in gtk+ moved the cache files below > " > commit c8849046860a9b17fa943247d85ddadb29262b48 > Author: Matthias Clasen > Date: Thu Jul 4 09:27:17 2013 -0400 > > Move the module cache files below libdir > > These files contain architecture-dependent paths, and thus placing > them into sysconfdir causes unnecessary hassle. Now the immodule cache > file is looked for in libdir/gtk-2.0/2.10.0/immodules.cache. > Belated backport of a change that was done in the run-up to 3.0. > " > > Since gtk-immodules-cache.bbclass creates the cache file in > "/etc/gtk-2.0/gtk.immodules", the environment variable "GTK_IM_MODULE_FILE" > can be set to point GTK+ at the file. > > [YOCTO #6774] > > Signed-off-by: Maxin B. John > --- > meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh > b/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh > index 6cf188b..63d9b8d 100644 > --- a/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh > +++ b/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh > @@ -1,6 +1,7 @@ > #!/bin/sh > > . /etc/formfactor/config > +export GTK_IM_MODULE_FILE="/etc/gtk-2.0/gtk.immodules" > > CMD="" > > -- > 2.4.0 > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [wic][PATCH 8/9] wic: get rid of set_size and set_source_file setters
Used size and source_file attributes instead of using setters. It's more pythonic, clear an consistent. Signed-off-by: Ed Bartosh --- scripts/lib/wic/plugins/source/bootimg-efi.py| 4 ++-- scripts/lib/wic/plugins/source/bootimg-pcbios.py | 4 ++-- scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index 35afa30..8bfa3a9 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py @@ -235,5 +235,5 @@ class BootimgEFIPlugin(SourcePlugin): out = exec_cmd(du_cmd) bootimg_size = out.split()[0] -part.set_size(bootimg_size) -part.set_source_file(bootimg) +part.size = bootimg_size +part.source_file = bootimg diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py index 255684b..e84bddf 100644 --- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py @@ -205,7 +205,7 @@ class BootimgPcbiosPlugin(SourcePlugin): out = exec_cmd(du_cmd) bootimg_size = out.split()[0] -part.set_size(bootimg_size) -part.set_source_file(bootimg) +part.size = int(out.split()[0]) +part.source_file = bootimg diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py index b5ca4d3..daefff3 100644 --- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py +++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py @@ -302,7 +302,7 @@ class IsoImagePlugin(SourcePlugin): # which contains rootfs du_cmd = "du -bks %s" % rootfs_dir out = exec_cmd(du_cmd) -part.set_size(int(out.split()[0])) +part.size = int(out.split()[0]) part.extra_space = 0 part.overhead_factor = 1.2 part.prepare_rootfs(cr_workdir, oe_builddir, rootfs_dir, \ @@ -502,8 +502,8 @@ class IsoImagePlugin(SourcePlugin): out = exec_cmd(du_cmd) isoimg_size = int(out.split()[0]) -part.set_size(isoimg_size) -part.set_source_file(iso_img) +part.size = isoimg_size +part.source_file = iso_img @classmethod def do_install_disk(cls, disk, disk_name, creator, workdir, oe_builddir, -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [wic][PATCH 9/9] wic: get rid of 2 getters
Used partitions and configfile bootloader attributes instead of using getters get_bootloader_file and get_partitions. Signed-off-by: Ed Bartosh --- scripts/lib/wic/imager/direct.py | 2 +- scripts/lib/wic/plugins/source/bootimg-efi.py| 4 ++-- scripts/lib/wic/plugins/source/bootimg-pcbios.py | 11 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py index 09ff5f8..8d4daec 100644 --- a/scripts/lib/wic/imager/direct.py +++ b/scripts/lib/wic/imager/direct.py @@ -159,7 +159,7 @@ class DirectImageCreator(BaseImageCreator): self.ks.partitions.append(part) # partitions list from kickstart file -return kickstart.get_partitions(self.ks) +return self.ks.partitions def get_disk_names(self): """ Returns a list of physical target disk names (e.g., 'sdb') which diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index 8bfa3a9..22f9813 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py @@ -46,7 +46,7 @@ class BootimgEFIPlugin(SourcePlugin): """ Create loader-specific (grub-efi) config """ -configfile = kickstart.get_bootloader_file(creator.ks) +configfile = creator.ks.bootloader.configfile custom_cfg = None if configfile: custom_cfg = get_custom_config(configfile) @@ -104,7 +104,7 @@ class BootimgEFIPlugin(SourcePlugin): cfg.write(loader_conf) cfg.close() -configfile = kickstart.get_bootloader_file(creator.ks) +configfile = creator.ks.bootloader.configfile custom_cfg = None if configfile: custom_cfg = get_custom_config(configfile) diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py index e84bddf..0b5478e 100644 --- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py @@ -84,18 +84,19 @@ class BootimgPcbiosPlugin(SourcePlugin): install_cmd = "install -d %s" % hdddir exec_cmd(install_cmd) -configfile = kickstart.get_bootloader_file(creator.ks) +bootloader = creator.ks.bootloader + custom_cfg = None -if configfile: -custom_cfg = get_custom_config(configfile) +if bootloader.configfile: +custom_cfg = get_custom_config(bootloader.configfile) if custom_cfg: # Use a custom configuration for grub syslinux_conf = custom_cfg msger.debug("Using custom configuration file " -"%s for syslinux.cfg" % configfile) +"%s for syslinux.cfg" % bootloader.configfile) else: msger.error("configfile is specified but failed to " -"get it from %s." % configfile) +"get it from %s." % bootloader.configfile) if not custom_cfg: # Create syslinux configuration using parameters from wks file -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [wic][PATCH 7/9] wic: get rid of get_rootfs and set_rootfs
Got rid of get_rootfs and set_rootfs java-like getter and setter. Renamed rootfs to rootfs_dir to be consistent with the name of kickstart parameter --rootfs-dir. Signed-off-by: Ed Bartosh --- scripts/lib/wic/imager/direct.py | 6 +++--- scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 14 +++--- scripts/lib/wic/plugins/source/rootfs.py | 14 +++--- scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py index 25bab89..09ff5f8 100644 --- a/scripts/lib/wic/imager/direct.py +++ b/scripts/lib/wic/imager/direct.py @@ -233,7 +233,7 @@ class DirectImageCreator(BaseImageCreator): # get rootfs size from bitbake variable if it's not set in .ks file if not part.size: # and if rootfs name is specified for the partition -image_name = part.get_rootfs() +image_name = part.rootfs_dir if image_name: # Bitbake variable ROOTFS_SIZE is calculated in # Image._get_rootfs_size method from meta/lib/oe/image.py @@ -336,13 +336,13 @@ class DirectImageCreator(BaseImageCreator): msg += 'The following build artifacts were used to create the image(s):\n' for part in parts: -if part.get_rootfs() is None: +if part.rootfs_dir is None: continue if part.mountpoint == '/': suffix = ':' else: suffix = '["%s"]:' % (part.mountpoint or part.label) -msg += ' ROOTFS_DIR%s%s\n' % (suffix.ljust(20), part.get_rootfs()) +msg += ' ROOTFS_DIR%s%s\n' % (suffix.ljust(20), part.rootfs_dir) msg += ' BOOTIMG_DIR: %s\n' % self.bootimg_dir msg += ' KERNEL_DIR: %s\n' % self.kernel_dir diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py index 9ad0bc7..b5ca4d3 100644 --- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py +++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py @@ -262,26 +262,26 @@ class IsoImagePlugin(SourcePlugin): isodir = "%s/ISO" % cr_workdir -if part.rootfs is None: +if part.rootfs_dir is None: if not 'ROOTFS_DIR' in rootfs_dir: msger.error("Couldn't find --rootfs-dir, exiting.\n") rootfs_dir = rootfs_dir['ROOTFS_DIR'] else: -if part.rootfs in rootfs_dir: -rootfs_dir = rootfs_dir[part.rootfs] -elif part.rootfs: -rootfs_dir = part.rootfs +if part.rootfs_dir in rootfs_dir: +rootfs_dir = rootfs_dir[part.rootfs_dir] +elif part.rootfs_dir: +rootfs_dir = part.rootfs_dir else: msg = "Couldn't find --rootfs-dir=%s connection " msg += "or it is not a valid path, exiting.\n" -msger.error(msg % part.rootfs) +msger.error(msg % part.rootfs_dir) if not os.path.isdir(rootfs_dir): rootfs_dir = get_bitbake_var("IMAGE_ROOTFS") if not os.path.isdir(rootfs_dir): msger.error("Couldn't find IMAGE_ROOTFS, exiting.\n") -part.set_rootfs(rootfs_dir) +part.rootfs_dir = rootfs_dir # Prepare rootfs.img hdd_dir = get_bitbake_var("HDDDIR") diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py index a90712b..425da8b 100644 --- a/scripts/lib/wic/plugins/source/rootfs.py +++ b/scripts/lib/wic/plugins/source/rootfs.py @@ -61,23 +61,23 @@ class RootfsPlugin(SourcePlugin): 'prepares' the partition to be incorporated into the image. In this case, prepare content for legacy bios boot partition. """ -if part.rootfs is None: +if part.rootfs_dir is None: if not 'ROOTFS_DIR' in krootfs_dir: msg = "Couldn't find --rootfs-dir, exiting" msger.error(msg) rootfs_dir = krootfs_dir['ROOTFS_DIR'] else: -if part.rootfs in krootfs_dir: -rootfs_dir = krootfs_dir[part.rootfs] -elif part.rootfs: -rootfs_dir = part.rootfs +if part.rootfs_dir in krootfs_dir: +rootfs_dir = krootfs_dir[part.rootfs_dir] +elif part.rootfs_dir: +rootfs_dir = part.rootfs_dir else: msg = "Couldn't find --rootfs-dir=%s connection" msg += " or it is not a valid path, exiting" -msger.error(msg % part.rootfs) +msger.error(msg % part.rootfs_dir) real_rootfs_dir = cls.__get_rootfs_dir(rootfs_dir) -part.set_rootfs(re
[OE-core] [wic][PATCH 6/9] wic: get rid of get_timeout getter
Used bootloader.timeout instead of kickstart.get_timeout getter. Accessing attributes instead of getting them with getters is more pythonic, shorter and readable. It also more consistent as most of partition and bootloader attributes are used this way. This change also takes care of appendLine bootloader attribute: it's renamed to bootloader.append attribute provided by new parser. Signed-off-by: Ed Bartosh --- scripts/lib/wic/plugins/source/bootimg-efi.py| 18 ++ scripts/lib/wic/plugins/source/bootimg-pcbios.py | 9 ++--- scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 16 +++- scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py | 5 + 4 files changed, 16 insertions(+), 32 deletions(-) diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index 556586f..35afa30 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py @@ -66,16 +66,13 @@ class BootimgEFIPlugin(SourcePlugin): grubefi_conf = "" grubefi_conf += "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1\n" grubefi_conf += "default=boot\n" -timeout = kickstart.get_timeout(creator.ks) -if not timeout: -timeout = 0 -grubefi_conf += "timeout=%s\n" % timeout +grubefi_conf += "timeout=%s\n" % bootloader.timeout grubefi_conf += "menuentry 'boot'{\n" kernel = "/bzImage" grubefi_conf += "linux %s root=%s rootwait %s\n" \ -% (kernel, creator.rootdev, options) +% (kernel, creator.rootdev, bootloader.append) grubefi_conf += "}\n" msger.debug("Writing grubefi config %s/hdd/boot/EFI/BOOT/grub.cfg" \ @@ -95,15 +92,11 @@ class BootimgEFIPlugin(SourcePlugin): install_cmd = "install -d %s/loader/entries" % hdddir exec_cmd(install_cmd) -options = creator.ks.handler.bootloader.appendLine - -timeout = kickstart.get_timeout(creator.ks) -if not timeout: -timeout = 0 +bootloader = creator.ks.bootloader loader_conf = "" loader_conf += "default boot\n" -loader_conf += "timeout %d\n" % timeout +loader_conf += "timeout %d\n" % bootloader.timeout msger.debug("Writing gummiboot config %s/hdd/boot/loader/loader.conf" \ % cr_workdir) @@ -131,7 +124,8 @@ class BootimgEFIPlugin(SourcePlugin): boot_conf = "" boot_conf += "title boot\n" boot_conf += "linux %s\n" % kernel -boot_conf += "options LABEL=Boot root=%s %s\n" % (creator.rootdev, options) +boot_conf += "options LABEL=Boot root=%s %s\n" % \ + (creator.rootdev, bootloader.append) msger.debug("Writing gummiboot config %s/hdd/boot/loader/entries/boot.conf" \ % cr_workdir) diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py index 80c7dfb..255684b 100644 --- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py @@ -105,14 +105,9 @@ class BootimgPcbiosPlugin(SourcePlugin): else: splashline = "" -options = creator.ks.handler.bootloader.appendLine - syslinux_conf = "" syslinux_conf += "PROMPT 0\n" -timeout = kickstart.get_timeout(creator.ks) -if not timeout: -timeout = 0 -syslinux_conf += "TIMEOUT " + str(timeout) + "\n" +syslinux_conf += "TIMEOUT " + str(bootloader.timeout) + "\n" syslinux_conf += "\n" syslinux_conf += "ALLOWOPTIONS 1\n" syslinux_conf += "SERIAL 0 115200\n" @@ -126,7 +121,7 @@ class BootimgPcbiosPlugin(SourcePlugin): syslinux_conf += "KERNEL " + kernel + "\n" syslinux_conf += "APPEND label=boot root=%s %s\n" % \ - (creator.rootdev, options) + (creator.rootdev, bootloader.append) msger.debug("Writing syslinux config %s/hdd/boot/syslinux.cfg" \ % cr_workdir) diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py index 9472d8a..9ad0bc7 100644 --- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py +++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py @@ -64,13 +64,11 @@ class IsoImagePlugin(SourcePlugin): else: splashline = "" -options = creator.ks.handler.bootloader.appendLine - -timeout = kickstart.get_timeout(creator.ks, 10) +bootloader = creator.ks.bootloader syslinux_conf = "" syslinux_conf += "PROMPT 0\n" -syslinux_conf += "TIMEOUT
[OE-core] [wic][PATCH 5/9] wic: adjust code for new data structure
New data structure is less nested than old one. Adjusted bootloader and partitions fields: self.ks.handler.bootloader -> self.ks.bootoader self.ks.handler.partitions -> self.ks.partitions Signed-off-by: Ed Bartosh --- scripts/lib/wic/imager/baseimager.py| 2 +- scripts/lib/wic/imager/direct.py| 16 scripts/lib/wic/plugins/source/bootimg-efi.py | 2 +- scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/lib/wic/imager/baseimager.py b/scripts/lib/wic/imager/baseimager.py index acbe948..760cf8a 100644 --- a/scripts/lib/wic/imager/baseimager.py +++ b/scripts/lib/wic/imager/baseimager.py @@ -85,7 +85,7 @@ class BaseImageCreator(object): # No ks provided when called by convertor, so skip the dependency check if self.ks: # If we have btrfs partition we need to check necessary tools -for part in self.ks.handler.partition.partitions: +for part in self.ks.partitions: if part.fstype and part.fstype == "btrfs": self._dep_checks.append("mkfs.btrfs") break diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py index f89c42c..25bab89 100644 --- a/scripts/lib/wic/imager/direct.py +++ b/scripts/lib/wic/imager/direct.py @@ -64,7 +64,7 @@ class DirectImageCreator(BaseImageCreator): self.__disks = {} self.__disk_format = "direct" self._disk_names = [] -self.ptable_format = self.ks.handler.bootloader.ptable +self.ptable_format = self.ks.bootloader.ptable self.oe_builddir = oe_builddir if image_output_dir: @@ -151,12 +151,12 @@ class DirectImageCreator(BaseImageCreator): "please check your kickstart setting.") # Set a default partition if no partition is given out -if not self.ks.handler.partition.partitions: +if not self.ks.partitions: partstr = "part / --size 1900 --ondisk sda --fstype=ext3" args = partstr.split() -part = self.ks.handler.partition.parse(args[1:]) -if part not in self.ks.handler.partition.partitions: -self.ks.handler.partition.partitions.append(part) +part = self.ks.parse(args[1:]) +if part not in self.ks.partitions: +self.ks.partitions.append(part) # partitions list from kickstart file return kickstart.get_partitions(self.ks) @@ -206,7 +206,7 @@ class DirectImageCreator(BaseImageCreator): bootloader object, the default can be explicitly set using the --source bootloader param. """ -return self.ks.handler.bootloader.source +return self.ks.bootloader.source # # Actual implemention @@ -224,8 +224,8 @@ class DirectImageCreator(BaseImageCreator): for part in parts: # as a convenience, set source to the boot partition source # instead of forcing it to be set via bootloader --source -if not self.ks.handler.bootloader.source and part.mountpoint == "/boot": -self.ks.handler.bootloader.source = part.source +if not self.ks.bootloader.source and part.mountpoint == "/boot": +self.ks.bootloader.source = part.source fstab_path = self._write_fstab(self.rootfs_dir.get("ROOTFS_DIR")) diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index 5feb79d..556586f 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py @@ -61,7 +61,7 @@ class BootimgEFIPlugin(SourcePlugin): if not custom_cfg: # Create grub configuration using parameters from wks file -options = creator.ks.handler.bootloader.appendLine +bootloader = creator.ks.bootloader grubefi_conf = "" grubefi_conf += "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1\n" diff --git a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py index 76e7b03..4280ff7 100644 --- a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py +++ b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py @@ -78,7 +78,7 @@ class RootfsPlugin(SourcePlugin): Called before do_prepare_partition() """ -options = image_creator.ks.handler.bootloader.appendLine +bootloader = image_creator.ks.bootloader syslinux_conf = "" syslinux_conf += "PROMPT 0\n" @@ -97,7 +97,7 @@ class RootfsPlugin(SourcePlugin): syslinux_conf += " KERNEL /boot/bzImage\n" syslinux_conf += " APPEND label=boot root=%s %s\n" % \ - (image_creator.rootdev, options) + (image_creator.root
[OE-core] [wic][PATCH 3/9] wic: use new kickstart parser
Used KickStart parser class instead of pykickstart API. This commit breaks wic as data structures and field names provided by new API are a bit different from old ones. This issue will be addressed in the following commits. Signed-off-by: Ed Bartosh --- scripts/lib/wic/conf.py | 4 ++-- scripts/lib/wic/imager/direct.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/lib/wic/conf.py b/scripts/lib/wic/conf.py index 1d4363a..2e29451 100644 --- a/scripts/lib/wic/conf.py +++ b/scripts/lib/wic/conf.py @@ -17,8 +17,8 @@ import os +from wic.kickstart import KickStart from wic import msger -from wic import kickstart from wic.utils import misc @@ -87,7 +87,7 @@ class ConfigMgr(object): if not ksconf: return -ksobj = kickstart.read_kickstart(ksconf) +ksobj = KickStart(ksconf) self.create['ks'] = ksobj self.create['name'] = os.path.splitext(os.path.basename(ksconf))[0] diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py index d5603fa..f89c42c 100644 --- a/scripts/lib/wic/imager/direct.py +++ b/scripts/lib/wic/imager/direct.py @@ -27,7 +27,7 @@ import os import shutil -from wic import kickstart, msger +from wic import msger from wic.utils import fs_related from wic.utils.oe.misc import get_bitbake_var from wic.utils.partitionedfs import Image -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [wic][PATCH 4/9] wic: remove pykickstart code
Removed pykickstart-related code as it's replaced by new kickstart parser. Signed-off-by: Ed Bartosh --- scripts/lib/wic/3rdparty/pykickstart/__init__.py | 0 scripts/lib/wic/3rdparty/pykickstart/base.py | 466 .../wic/3rdparty/pykickstart/commands/__init__.py | 20 - .../3rdparty/pykickstart/commands/bootloader.py| 216 --- .../wic/3rdparty/pykickstart/commands/partition.py | 314 --- scripts/lib/wic/3rdparty/pykickstart/constants.py | 57 -- scripts/lib/wic/3rdparty/pykickstart/errors.py | 103 .../wic/3rdparty/pykickstart/handlers/__init__.py | 0 .../wic/3rdparty/pykickstart/handlers/control.py | 46 -- .../lib/wic/3rdparty/pykickstart/handlers/f16.py | 24 - scripts/lib/wic/3rdparty/pykickstart/ko.py | 37 -- scripts/lib/wic/3rdparty/pykickstart/options.py| 223 scripts/lib/wic/3rdparty/pykickstart/parser.py | 619 - scripts/lib/wic/3rdparty/pykickstart/sections.py | 244 scripts/lib/wic/3rdparty/pykickstart/version.py| 168 -- scripts/lib/wic/kickstart/__init__.py | 129 - .../lib/wic/kickstart/custom_commands/__init__.py | 7 - .../lib/wic/kickstart/custom_commands/partition.py | 526 - .../lib/wic/kickstart/custom_commands/wicboot.py | 65 --- 19 files changed, 3264 deletions(-) delete mode 100644 scripts/lib/wic/3rdparty/pykickstart/__init__.py delete mode 100644 scripts/lib/wic/3rdparty/pykickstart/base.py delete mode 100644 scripts/lib/wic/3rdparty/pykickstart/commands/__init__.py delete mode 100644 scripts/lib/wic/3rdparty/pykickstart/commands/bootloader.py delete mode 100644 scripts/lib/wic/3rdparty/pykickstart/commands/partition.py delete mode 100644 scripts/lib/wic/3rdparty/pykickstart/constants.py delete mode 100644 scripts/lib/wic/3rdparty/pykickstart/errors.py delete mode 100644 scripts/lib/wic/3rdparty/pykickstart/handlers/__init__.py delete mode 100644 scripts/lib/wic/3rdparty/pykickstart/handlers/control.py delete mode 100644 scripts/lib/wic/3rdparty/pykickstart/handlers/f16.py delete mode 100644 scripts/lib/wic/3rdparty/pykickstart/ko.py delete mode 100644 scripts/lib/wic/3rdparty/pykickstart/options.py delete mode 100644 scripts/lib/wic/3rdparty/pykickstart/parser.py delete mode 100644 scripts/lib/wic/3rdparty/pykickstart/sections.py delete mode 100644 scripts/lib/wic/3rdparty/pykickstart/version.py delete mode 100644 scripts/lib/wic/kickstart/__init__.py delete mode 100644 scripts/lib/wic/kickstart/custom_commands/__init__.py delete mode 100644 scripts/lib/wic/kickstart/custom_commands/partition.py delete mode 100644 scripts/lib/wic/kickstart/custom_commands/wicboot.py diff --git a/scripts/lib/wic/3rdparty/pykickstart/__init__.py b/scripts/lib/wic/3rdparty/pykickstart/__init__.py deleted file mode 100644 index e69de29..000 diff --git a/scripts/lib/wic/3rdparty/pykickstart/base.py b/scripts/lib/wic/3rdparty/pykickstart/base.py deleted file mode 100644 index e6c8f56..000 --- a/scripts/lib/wic/3rdparty/pykickstart/base.py +++ /dev/null @@ -1,466 +0,0 @@ -# -# Chris Lumens -# -# Copyright 2006, 2007, 2008 Red Hat, Inc. -# -# This copyrighted material is made available to anyone wishing to use, modify, -# copy, or redistribute it subject to the terms and conditions of the GNU -# General Public License v.2. This program is distributed in the hope that it -# will be useful, but WITHOUT ANY WARRANTY expressed or implied, including the -# implied warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# this program; if not, write to the Free Software Foundation, Inc., 51 -# Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Any Red Hat -# trademarks that are incorporated in the source code or documentation are not -# subject to the GNU General Public License and may only be used or replicated -# with the express permission of Red Hat, Inc. -# -""" -Base classes for creating commands and syntax version object. - -This module exports several important base classes: - -BaseData - The base abstract class for all data objects. Data objects - are contained within a BaseHandler object. - -BaseHandler - The base abstract class from which versioned kickstart - handler are derived. Subclasses of BaseHandler hold - BaseData and KickstartCommand objects. - -DeprecatedCommand - An abstract subclass of KickstartCommand that should -be further subclassed by users of this module. When -a subclass is used, a warning message will be -printed. - -KickstartCommand - The base abstract class for all kickstart commands. - Command objects are contained within a BaseHandler - ob
[OE-core] [wic][PATCH 2/9] wic: add kickstart parser module
This module will replace existing pykickstart machinery it contains only option used by wic, it's simple and clear. And It will allow to remove a lot of old complex code from 3rdparty/pykickstart/ and kickstart/custom_commands. Signed-off-by: Ed Bartosh --- scripts/lib/wic/kickstart.py | 120 +++ 1 file changed, 120 insertions(+) create mode 100644 scripts/lib/wic/kickstart.py diff --git a/scripts/lib/wic/kickstart.py b/scripts/lib/wic/kickstart.py new file mode 100644 index 000..2208395 --- /dev/null +++ b/scripts/lib/wic/kickstart.py @@ -0,0 +1,120 @@ +#!/usr/bin/env python -tt +# ex:ts=4:sw=4:sts=4:et +# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- +# +# Copyright (c) 2016 Intel, Inc. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the Free +# Software Foundation; version 2 of the License +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., 59 +# Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# DESCRIPTION +# This module provides parser for kickstart format +# +# AUTHORS +# Tom Zanussi +# Ed Bartosh (at] linux.intel.com> + + + +import shlex +from argparse import ArgumentParser, ArgumentTypeError + +from wic.partition import Partition + +def sizetype(arg): +""" +Custom type for ArgumentParser +Converts size string in [K|k|M|G] format into the integer value +""" +if arg.isdigit(): +return int(arg) * 1024L + +if not arg[:-1].isdigit(): +raise ArgumentTypeError("Invalid size: %r" % arg) + +size = int(arg[:-1]) +if arg.endswith("k") or arg.endswith("K"): +return size +if arg.endswith("M"): +return size * 1024L +if arg.endswith("G"): +return size * 1024L * 1024L + +raise ArgumentTypeError("Invalid size: %r" % arg) + +def overheadtype(arg): +""" +Custom type for ArgumentParser +Converts overhead string to float and checks if it's bigger than 1.0 +""" +try: +result = float(arg) +except ValueError: +raise ArgumentTypeError("Invalid value: %r" % arg) + +if result < 1.0: +raise ArgumentTypeError("Overhead factor should be > 1.0" % arg) + +return result + +class KickStart(object): +def __init__(self, confpath): + +self.partitions = [] +self.bootloader = None +self.lineno = 0 + +parser = ArgumentParser() +subparsers = parser.add_subparsers() + +part = subparsers.add_parser('part') +part.add_argument('mountpoint') +part.add_argument('--active', action='store_true') +part.add_argument('--align', type=int) +part.add_argument("--extra-space", type=sizetype, default=10*1024L) +part.add_argument('--fsoptions', dest='fsopts') +part.add_argument('--fstype') +part.add_argument('--label') +part.add_argument('--no-table') +part.add_argument('--ondisk', '--ondrive', dest='disk') +part.add_argument("--overhead-factor", type=overheadtype, default=1.3) +part.add_argument('--part-type') +part.add_argument('--rootfs-dir') +part.add_argument('--size', type=sizetype, default=0) +part.add_argument('--source') +part.add_argument('--sourceparams') +part.add_argument('--use-uuid', action='store_true') +part.add_argument('--uuid') + +bootloader = subparsers.add_parser('bootloader') +bootloader.add_argument('--append') +bootloader.add_argument('--configfile') +bootloader.add_argument('--ptable', choices=('msdos', 'gpt'), +default='msdos') +bootloader.add_argument('--timeout', type=int) +bootloader.add_argument('--source') + +with open(confpath) as conf: +lineno = 0 +for line in conf: +line = line.strip() +lineno += 1 +if line and line[0] != '#': +parsed = parser.parse_args(shlex.split(line)) +if line.startswith('part'): +self.partitions.append(Partition(parsed, lineno)) +else: +if not self.bootloader: + self.bootloader = parsed +else: + raise KickStartError("Error: more than one bootloader specified") -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded
[OE-core] [wic][PATCH 1/9] wic: add partition module
Copied partition-related API from kickstart/custom_commands/partition.py to separate module in preparation for removal of all pykickstart related code. Signed-off-by: Ed Bartosh --- scripts/lib/wic/partition.py | 410 +++ 1 file changed, 410 insertions(+) create mode 100644 scripts/lib/wic/partition.py diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py new file mode 100644 index 000..9bb1a0a --- /dev/null +++ b/scripts/lib/wic/partition.py @@ -0,0 +1,410 @@ +# ex:ts=4:sw=4:sts=4:et +# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- +# +# Copyright (c) 2013-2016 Intel Corporation. +# All rights reserved. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# DESCRIPTION +# This module provides the OpenEmbedded partition object definitions. +# +# AUTHORS +# Tom Zanussi +# Ed Bartosh (at] linux.intel.com> + +import os +import tempfile +import uuid + +from wic.utils.oe.misc import msger, parse_sourceparams +from wic.utils.oe.misc import exec_cmd, exec_native_cmd +from wic.plugin import pluginmgr + +partition_methods = { +"do_stage_partition":None, +"do_prepare_partition":None, +"do_configure_partition":None, +} + +class Partition(object): + +def __init__(self, args, lineno): +self.args = args +self.active = args.active +self.align = args.align +self.disk = args.disk +self.extra_space = args.extra_space +self.fsopts = args.fsopts +self.fstype = args.fstype +self.label = args.label +self.mountpoint = args.mountpoint +self.no_table = args.no_table +self.overhead_factor = args.overhead_factor +self.part_type = args.part_type +self.rootfs_dir = args.rootfs_dir +self.size = args.size +self.source = args.source +self.sourceparams = args.sourceparams +self.uuid = args.uuid + +self.lineno = lineno +self.source_file = "" +self.sourceparams_dict = {} + +def get_extra_block_count(self, current_blocks): +""" +The --size param is reflected in self.size (in kB), and we already +have current_blocks (1k) blocks, calculate and return the +number of (1k) blocks we need to add to get to --size, 0 if +we're already there or beyond. +""" +msger.debug("Requested partition size for %s: %d" % \ +(self.mountpoint, self.size)) + +if not self.size: +return 0 + +requested_blocks = self.size + +msger.debug("Requested blocks %d, current_blocks %d" % \ +(requested_blocks, current_blocks)) + +if requested_blocks > current_blocks: +return requested_blocks - current_blocks +else: +return 0 + +def prepare(self, creator, cr_workdir, oe_builddir, rootfs_dir, +bootimg_dir, kernel_dir, native_sysroot): +""" +Prepare content for individual partitions, depending on +partition command parameters. +""" +if self.sourceparams: +self.sourceparams_dict = parse_sourceparams(self.sourceparams) + +if not self.source: +if not self.size: +msger.error("The %s partition has a size of zero. Please " +"specify a non-zero --size for that partition." % \ +self.mountpoint) +if self.fstype and self.fstype == "swap": +self.prepare_swap_partition(cr_workdir, oe_builddir, +native_sysroot) +elif self.fstype: +rootfs = "%s/fs_%s.%s.%s" % (cr_workdir, self.label, + self.lineno, self.fstype) +if os.path.isfile(rootfs): +os.remove(rootfs) +for prefix in ("ext", "btrfs", "vfat", "squashfs"): +if self.fstype.startswith(prefix): +method = getattr(self, + "prepare_empty_partition_" + prefix) +method(rootfs, oe_builddir, native_sysroot) +self.source_file = rootfs +break +return + +plugins = pluginmgr.get_source_plugins() + +
[OE-core] [wic][PATCH 0/9] Reimplement kickstart parser
Hi, This patchset contains reimplementation of .ks file parser. New parser code is much smaller (around 4K) than complex pykickstart parser from Fedora (around 170K). I hope it's much more clean and mainainable too. Getting rid of dependency to pykickstart was in my TODO list since March 2015 when I first looked at wic codebase. When I started to work on #8848 (sharing a single Kickstart partition layout definition (.wks) between several images) I decided to implement new parser instead of tweaking complicated pykickstart condebase. As as side effect of this work test coverage report for wic codebase looks shorter and coverage is increased from 58% to 63%: Name Stmts Miss Branch BrMiss Cover - scripts/lib/wic/__init__3 0 0 0 100% scripts/lib/wic/conf 45 4 12 5 84% scripts/lib/wic/creator61 19 29 15 62% scripts/lib/wic/engine102 61 56 44 34% scripts/lib/wic/help 49 4 18 3 90% scripts/lib/wic/imager/__init__ 0 0 0 0 100% scripts/lib/wic/imager/baseimager 73 15 26 10 75% scripts/lib/wic/imager/direct 171 25 79 24 80% scripts/lib/wic/kickstart 67 18 20 12 66% scripts/lib/wic/msger 187101 86 54 43% scripts/lib/wic/partition 199 95 50 36 47% scripts/lib/wic/plugin 84 7 34 6 89% scripts/lib/wic/pluginbase 34 4 12 5 80% scripts/lib/wic/plugins/imager/direct_plugin 36 3 4 1 90% scripts/lib/wic/plugins/source/bootimg-efi119 17 26 13 79% scripts/lib/wic/plugins/source/bootimg-partition 56 45 24 24 14% scripts/lib/wic/plugins/source/bootimg-pcbios 103 8 30 10 86% scripts/lib/wic/plugins/source/fsimage 22 13 6 6 32% scripts/lib/wic/plugins/source/isoimage-isohybrid 294 95107 67 60% scripts/lib/wic/plugins/source/rawcopy 31 22 10 10 22% scripts/lib/wic/plugins/source/rootfs 31 10 12 5 65% scripts/lib/wic/plugins/source/rootfs_pcbios_ext 73 59 24 24 14% scripts/lib/wic/utils/__init__ 0 0 0 0 100% scripts/lib/wic/utils/errors8 0 0 0 100% scripts/lib/wic/utils/fs_related 41 9 6 3 74% scripts/lib/wic/utils/misc 41 4 24 9 80% scripts/lib/wic/utils/oe/__init__ 0 0 0 0 100% scripts/lib/wic/utils/oe/misc 112 20 47 15 78% scripts/lib/wic/utils/partitionedfs 151 23 79 24 80% scripts/lib/wic/utils/runner 57 16 26 12 66% scripts/lib/wic/utils/syslinux 18 15 12 12 10% scripts/wic 170 53 78 30 67% - TOTAL2438765937479 63% The following changes since commit da43a56d3533db37592a1698777af08f51a5800f: bitbake: Revert "fetch2/local.py: avoid using PREMIRROR" (2016-01-13 09:47:28 +) are available in the git repository at: git://git.yoctoproject.org/poky-contrib ed/wic/get-rid-of-ks-parser http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ed/wic/get-rid-of-ks-parser Ed Bartosh (9): wic: add partition module wic: add kickstart parser module wic: use new kickstart parser wic: remove pykickstart code wic: adjust code for new data structure wic: get rid of get_timeout getter wic: get rid of get_rootfs and set_rootfs wic: get rid of set_size and set_source_file setters wic: get rid of 2 getters scripts/lib/wic/3rdparty/pykickstart/__init__.py | 0 scripts/lib/wic/3rdparty/pykickstart/base.py | 466 .../wic/3rdparty/pykickstart/commands/__init__.py | 20 - .../3rdparty/pykickstart/commands/bootloader.py| 216 --- .../wic/3rdparty/pykickstart/commands/partition.py | 314 --- scripts/lib/wic/3rdparty/pykickstart/constants.py | 57 -- scripts/lib/wic/3rdparty/pykickstart/errors.py | 103 .../wic/3rdparty/pykicksta
[OE-core] [PATCH 6/9] librsvg: upgrade to 2.40.13
Updated gtk-option.patch. Signed-off-by: Jussi Kukkonen --- meta/recipes-gnome/librsvg/librsvg/gtk-option.patch | 13 + .../librsvg/{librsvg_2.40.11.bb => librsvg_2.40.13.bb} | 4 ++-- 2 files changed, 7 insertions(+), 10 deletions(-) rename meta/recipes-gnome/librsvg/{librsvg_2.40.11.bb => librsvg_2.40.13.bb} (91%) diff --git a/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch b/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch index e6af481..6c23071 100644 --- a/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch +++ b/meta/recipes-gnome/librsvg/librsvg/gtk-option.patch @@ -1,4 +1,4 @@ -From 1c38d570b33f2b036d4fa47e929bb2b3264e38bd Mon Sep 17 00:00:00 2001 +From 4e0ce3f22d45033a108cbacca3e5ec6728bd44f3 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Tue, 11 Aug 2015 16:25:38 +0300 Subject: [PATCH] configure: add option to enable/disable use of GTK+ @@ -10,19 +10,16 @@ for forcibly controlling whether GTK+ will be used or not. Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=712693] Signed-off-by: Ross Burton - -Forward-ported to 2.40.10 - Signed-off-by: Jussi Kukkonen --- configure.ac | 17 +++-- 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac -index bf77f3a..ca77de8 100644 +index e61a952..c3aae84 100644 --- a/configure.ac +++ b/configure.ac -@@ -128,17 +128,22 @@ AC_CHECK_FUNCS(strtok_r) +@@ -130,17 +130,22 @@ AC_CHECK_FUNCS(strtok_r) # GTK # === @@ -50,13 +47,13 @@ index bf77f3a..ca77de8 100644 dnl === dnl GDK-Pixbuf SVG loader -@@ -289,6 +294,6 @@ librsvg-$VERSION +@@ -298,6 +303,6 @@ librsvg-$VERSION Build introspectable bindings: ${found_introspection} Build Vala bindings:${enable_vala} Build GdkPixbuf loader: ${enable_pixbuf_loader} -GTK+ $GTK3_REQUIRED or later: ${have_gtk_3} +GTK+ $GTK3_REQUIRED or later: ${with_gtk_3} - Build miscellaenous tools: ${build_misc_tools} + Build miscellaneous tools: ${build_misc_tools} " -- 2.1.4 diff --git a/meta/recipes-gnome/librsvg/librsvg_2.40.11.bb b/meta/recipes-gnome/librsvg/librsvg_2.40.13.bb similarity index 91% rename from meta/recipes-gnome/librsvg/librsvg_2.40.11.bb rename to meta/recipes-gnome/librsvg/librsvg_2.40.13.bb index d57c69d..ed71243 100644 --- a/meta/recipes-gnome/librsvg/librsvg_2.40.11.bb +++ b/meta/recipes-gnome/librsvg/librsvg_2.40.13.bb @@ -14,8 +14,8 @@ inherit autotools pkgconfig gnomebase gtk-doc pixbufcache upstream-version-is-ev SRC_URI += "file://gtk-option.patch" -SRC_URI[archive.md5sum] = "6b9cd1a048210a8e95bdc04c85fe997f" -SRC_URI[archive.sha256sum] = "611ac0f544debd0c9bf1ef5509c990d218e83dd1d8c83297075c4b29796a2e02" +SRC_URI[archive.md5sum] = "ad03780e12c56e52474d8edf86976c73" +SRC_URI[archive.sha256sum] = "4d6ea93ec05f5dabe7262d711d246a0a99b2311e215360dd3dcabd6afe3b9804" CACHED_CONFIGUREVARS = "ac_cv_path_GDK_PIXBUF_QUERYLOADERS=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders" -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 9/9] xf86-input-evdev: upgrade to 2.10.1
Signed-off-by: Jussi Kukkonen --- .../{xf86-input-evdev_2.10.0.bb => xf86-input-evdev_2.10.1.bb}| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/xorg-driver/{xf86-input-evdev_2.10.0.bb => xf86-input-evdev_2.10.1.bb} (83%) diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.1.bb similarity index 83% rename from meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.0.bb rename to meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.1.bb index 3d06f03..cf77ad2 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.0.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.1.bb @@ -16,5 +16,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fefe33b1cf0cacba0e72e3b0fa0f0e16" DEPENDS += "mtdev libevdev" -SRC_URI[md5sum] = "b1183c55125981d346102d1be704760b" -SRC_URI[sha256sum] = "d097298eb07b7a9edf4493b5c3c058041458ca52c8c62dbd4f40b84c5086d117" +SRC_URI[md5sum] = "96d89d9406a02f5e36bdaa4edd9a243a" +SRC_URI[sha256sum] = "af9c2b47f5b272ae56b45da6bd84610fc9a3d80a4b32c8215842a39d862de017" -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/9] libgpg-error: upgrade to 1.21
License checksum changed because text layout changed. Signed-off-by: Jussi Kukkonen --- .../libgpg-error/{libgpg-error_1.19.bb => libgpg-error_1.21.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-support/libgpg-error/{libgpg-error_1.19.bb => libgpg-error_1.21.bb} (86%) diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.19.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.21.bb similarity index 86% rename from meta/recipes-support/libgpg-error/libgpg-error_1.19.bb rename to meta/recipes-support/libgpg-error/libgpg-error_1.21.bb index c69930a..0dd1602 100644 --- a/meta/recipes-support/libgpg-error/libgpg-error_1.19.bb +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.21.bb @@ -5,7 +5,7 @@ BUGTRACKER = "https://bugs.g10code.com/gnupg/index"; LICENSE = "GPLv2+ & LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://src/gpg-error.h.in;endline=23;md5=8b204918f0ca707136394d8bb20c7ebc \ + file://src/gpg-error.h.in;endline=23;md5=93d3155af141ae3b369a5d09ca9d6234 \ file://src/init.c;endline=20;md5=8f5a9b59634f4aebcd0ec9d3ebd53bfe" @@ -15,8 +15,8 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \ file://pkgconfig.patch \ file://0001-libgpg-error-Add-nios2-support.patch \ " -SRC_URI[md5sum] = "c04c16245b92829281f43b5bef7d16da" -SRC_URI[sha256sum] = "53120e1333d5c5d28d87ff2854e9e98719c8e214152f17ad5291704d25c4978b" +SRC_URI[md5sum] = "ab0b5aba6d0a185b41d07bda804fd8b2" +SRC_URI[sha256sum] = "b7dbdb3cad63a740e9f0c632a1da32d4afdb694ec86c8625c98ea0691713b84d" BINCONFIG = "${bindir}/gpg-error-config" -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 8/9] menu-cache: upgrade to 1.0.1
Signed-off-by: Jussi Kukkonen --- .../menu-cache/{menu-cache_1.0.0.bb => menu-cache_1.0.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/menu-cache/{menu-cache_1.0.0.bb => menu-cache_1.0.1.bb} (79%) diff --git a/meta/recipes-graphics/menu-cache/menu-cache_1.0.0.bb b/meta/recipes-graphics/menu-cache/menu-cache_1.0.1.bb similarity index 79% rename from meta/recipes-graphics/menu-cache/menu-cache_1.0.0.bb rename to meta/recipes-graphics/menu-cache/menu-cache_1.0.1.bb index 5d46e89..eb80cd3 100644 --- a/meta/recipes-graphics/menu-cache/menu-cache_1.0.0.bb +++ b/meta/recipes-graphics/menu-cache/menu-cache_1.0.1.bb @@ -10,8 +10,8 @@ DEPENDS = "glib-2.0 intltool-native libfm-extra" SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/menu-cache-${PV}.tar.xz" -SRC_URI[md5sum] = "4a8e6c1a86d5e64ec725d850a4abfbad" -SRC_URI[sha256sum] = "ff7df437bbfd3119c5f662c6d209b98f15de03a7203308c6b56a4c1e1d419aaf" +SRC_URI[md5sum] = "a856ba860b16fdc8c69ee784bc4ade36" +SRC_URI[sha256sum] = "0ac72649919946070258320aafc320467dd040bcef7b3a225e2ab7241ddffd59" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/lxde/files/menu-cache/1.0/"; -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/9] libxi: upgrade to 1.7.6
Signed-off-by: Jussi Kukkonen --- meta/recipes-graphics/xorg-lib/{libxi_1.7.5.bb => libxi_1.7.6.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/xorg-lib/{libxi_1.7.5.bb => libxi_1.7.6.bb} (81%) diff --git a/meta/recipes-graphics/xorg-lib/libxi_1.7.5.bb b/meta/recipes-graphics/xorg-lib/libxi_1.7.6.bb similarity index 81% rename from meta/recipes-graphics/xorg-lib/libxi_1.7.5.bb rename to meta/recipes-graphics/xorg-lib/libxi_1.7.6.bb index f629d3f..7523479 100644 --- a/meta/recipes-graphics/xorg-lib/libxi_1.7.5.bb +++ b/meta/recipes-graphics/xorg-lib/libxi_1.7.6.bb @@ -17,5 +17,5 @@ PE = "1" XORG_PN = "libXi" -SRC_URI[md5sum] = "9f02462855c598a0cd0ddfd98c6e25f5" -SRC_URI[sha256sum] = "d964d7deb5d8f7d6b9c358969c625073d7ab273dbda94693130b3540bc0ca229" +SRC_URI[md5sum] = "510e555ecfffa8d2298a0f42b725e563" +SRC_URI[sha256sum] = "1f32a552cec0f056c0260bdb32e853cec0673d2f40646ce932ad5a9f0205b7ac" -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/9] gpgme: upgrade to 1.6.0
License checksum changed because of text layout change. Signed-off-by: Jussi Kukkonen --- meta/recipes-support/gpgme/{gpgme_1.5.4.bb => gpgme_1.6.0.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-support/gpgme/{gpgme_1.5.4.bb => gpgme_1.6.0.bb} (85%) diff --git a/meta/recipes-support/gpgme/gpgme_1.5.4.bb b/meta/recipes-support/gpgme/gpgme_1.6.0.bb similarity index 85% rename from meta/recipes-support/gpgme/gpgme_1.5.4.bb rename to meta/recipes-support/gpgme/gpgme_1.6.0.bb index 1598377..987d19b 100644 --- a/meta/recipes-support/gpgme/gpgme_1.5.4.bb +++ b/meta/recipes-support/gpgme/gpgme_1.6.0.bb @@ -6,7 +6,7 @@ BUGTRACKER = "https://bugs.g10code.com/gnupg/index"; LICENSE = "GPLv2+ & LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYING.LESSER;md5=bbb461211a33b134d42ed5ee802b37ff \ - file://src/gpgme.h.in;endline=23;md5=71ba2ae8d6ca034ed10bd099a8cf473c \ + file://src/gpgme.h.in;endline=23;md5=5027eec93a996272a9a0a6a86cf35775 \ file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d" SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/${BP}.tar.bz2 \ @@ -14,8 +14,8 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/${BP}.tar.bz2 \ file://pkgconfig.patch \ " -SRC_URI[md5sum] = "feafa03ea064e1d1dc11bc2b88404623" -SRC_URI[sha256sum] = "bb38c0ec8815c9e94e6047b484984808a8dad9d6bec8df33dc5339fd55ffea6c" +SRC_URI[md5sum] = "60d730d22e8065fd5de309e8b98e304b" +SRC_URI[sha256sum] = "b09de4197ac280b102080e09eaec6211d081efff1963bf7821cf8f4f9916099d" DEPENDS = "libgpg-error libassuan" -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/9] libevdev: upgrade to 1.4.6
Signed-off-by: Jussi Kukkonen --- .../recipes-support/libevdev/{libevdev_1.4.2.bb => libevdev_1.4.6.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-support/libevdev/{libevdev_1.4.2.bb => libevdev_1.4.6.bb} (74%) diff --git a/meta/recipes-support/libevdev/libevdev_1.4.2.bb b/meta/recipes-support/libevdev/libevdev_1.4.6.bb similarity index 74% rename from meta/recipes-support/libevdev/libevdev_1.4.2.bb rename to meta/recipes-support/libevdev/libevdev_1.4.6.bb index f851305..c8163e3 100644 --- a/meta/recipes-support/libevdev/libevdev_1.4.2.bb +++ b/meta/recipes-support/libevdev/libevdev_1.4.6.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=75aae0d38feea6fda97ca381cb9132eb \ SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz"; -SRC_URI[md5sum] = "debfcd5153558eba25a8e71eb2534ae8" -SRC_URI[sha256sum] = "7c77b213f075706d428a2af54b66bf86b03a68e9fb390e7ec48cf55065970643" +SRC_URI[md5sum] = "9b3f25bd8fb0f8efa4944d34668dddc0" +SRC_URI[sha256sum] = "7b2ae1a0c7f9f7a96198ddc8fd167f090f233d6cbd8168b847e4f968445132d3" inherit autotools pkgconfig -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/9] gsettings-desktop-schemas: upgrade to 3.19.3
Signed-off-by: Jussi Kukkonen --- ...-desktop-schemas_3.18.1.bb => gsettings-desktop-schemas_3.19.3.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-gnome/gsettings-desktop-schemas/{gsettings-desktop-schemas_3.18.1.bb => gsettings-desktop-schemas_3.19.3.bb} (69%) diff --git a/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.18.1.bb b/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.19.3.bb similarity index 69% rename from meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.18.1.bb rename to meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.19.3.bb index 6904666..4c1fbfc 100644 --- a/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.18.1.bb +++ b/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_3.19.3.bb @@ -9,6 +9,6 @@ DEPENDS = "glib-2.0 intltool-native gobject-introspection-stub-native" inherit gnomebase gsettings gettext -SRC_URI[archive.md5sum] = "e7ec56bb55013e89500c8f3ae6fcf738" -SRC_URI[archive.sha256sum] = "258713b2a3dc6b6590971bcfc81f98d78ea9827d60e2f55ffbe40d9cd0f99a1a" +SRC_URI[archive.md5sum] = "fdc92abcffe46821be423193b275cf8b" +SRC_URI[archive.sha256sum] = "9084989b75ca9b3fc5984c8a0d297a93d3d124f51cadd2bd75a783c80635" -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/9] libcroco: upgrade to 0.6.11
Remove PR from recipe. Signed-off-by: Jussi Kukkonen --- .../libcroco/{libcroco_0.6.9.bb => libcroco_0.6.11.bb} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename meta/recipes-support/libcroco/{libcroco_0.6.9.bb => libcroco_0.6.11.bb} (80%) diff --git a/meta/recipes-support/libcroco/libcroco_0.6.9.bb b/meta/recipes-support/libcroco/libcroco_0.6.11.bb similarity index 80% rename from meta/recipes-support/libcroco/libcroco_0.6.9.bb rename to meta/recipes-support/libcroco/libcroco_0.6.11.bb index 05bd931..9df7923 100644 --- a/meta/recipes-support/libcroco/libcroco_0.6.9.bb +++ b/meta/recipes-support/libcroco/libcroco_0.6.11.bb @@ -11,11 +11,10 @@ SECTION = "x11/utils" DEPENDS = "glib-2.0 libxml2 zlib" BBCLASSEXTEND = "native" EXTRA_OECONF += "--enable-Bsymbolic=auto" -PR = "r2" BINCONFIG = "${bindir}/croco-0.6-config" inherit autotools pkgconfig gnomebase gtk-doc binconfig-disabled -SRC_URI[archive.md5sum] = "f1863da805c9206563da06f56da1ea55" -SRC_URI[archive.sha256sum] = "38b9a6aed1813e55b3ca07a68d1af845ad4d1f984602e9272fe692930c0be0ae" +SRC_URI[archive.md5sum] = "dabc1911dfbfa85f8e6859ca47863168" +SRC_URI[archive.sha256sum] = "132b528a948586b0dfa05d7e9e059901bca5a3be675b6071a90a90b81ae5a056" -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/9] Bunch of upgrades
Fairly minor upgrades (maybe with the exception of gpgme). FYI, all are based on AUH generated patches. Cheers, Jussi The following changes since commit 96a34e7f847ad34deac520b78809e7dd82dbc59e: conf/distro/poky-tiny: correctly disable python in opkg-utils (2016-01-12 15:35:27 +) are available in the git repository at: git://git.yoctoproject.org/poky-contrib jku/auh-upgrades http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/auh-upgrades Jussi Kukkonen (9): gpgme: upgrade to 1.6.0 gsettings-desktop-schemas: upgrade to 3.19.3 libcroco: upgrade to 0.6.11 libevdev: upgrade to 1.4.6 libgpg-error: upgrade to 1.21 librsvg: upgrade to 2.40.13 libxi: upgrade to 1.7.6 menu-cache: upgrade to 1.0.1 xf86-input-evdev: upgrade to 2.10.1 ...chemas_3.18.1.bb => gsettings-desktop-schemas_3.19.3.bb} | 4 ++-- meta/recipes-gnome/librsvg/librsvg/gtk-option.patch | 13 + .../librsvg/{librsvg_2.40.11.bb => librsvg_2.40.13.bb} | 4 ++-- .../menu-cache/{menu-cache_1.0.0.bb => menu-cache_1.0.1.bb} | 4 ++-- ...f86-input-evdev_2.10.0.bb => xf86-input-evdev_2.10.1.bb} | 4 ++-- .../xorg-lib/{libxi_1.7.5.bb => libxi_1.7.6.bb} | 4 ++-- .../gpgme/{gpgme_1.5.4.bb => gpgme_1.6.0.bb}| 6 +++--- .../libcroco/{libcroco_0.6.9.bb => libcroco_0.6.11.bb} | 5 ++--- .../libevdev/{libevdev_1.4.2.bb => libevdev_1.4.6.bb} | 4 ++-- .../{libgpg-error_1.19.bb => libgpg-error_1.21.bb} | 6 +++--- 10 files changed, 25 insertions(+), 29 deletions(-) rename meta/recipes-gnome/gsettings-desktop-schemas/{gsettings-desktop-schemas_3.18.1.bb => gsettings-desktop-schemas_3.19.3.bb} (69%) rename meta/recipes-gnome/librsvg/{librsvg_2.40.11.bb => librsvg_2.40.13.bb} (91%) rename meta/recipes-graphics/menu-cache/{menu-cache_1.0.0.bb => menu-cache_1.0.1.bb} (79%) rename meta/recipes-graphics/xorg-driver/{xf86-input-evdev_2.10.0.bb => xf86-input-evdev_2.10.1.bb} (83%) rename meta/recipes-graphics/xorg-lib/{libxi_1.7.5.bb => libxi_1.7.6.bb} (81%) rename meta/recipes-support/gpgme/{gpgme_1.5.4.bb => gpgme_1.6.0.bb} (85%) rename meta/recipes-support/libcroco/{libcroco_0.6.9.bb => libcroco_0.6.11.bb} (80%) rename meta/recipes-support/libevdev/{libevdev_1.4.2.bb => libevdev_1.4.6.bb} (74%) rename meta/recipes-support/libgpg-error/{libgpg-error_1.19.bb => libgpg-error_1.21.bb} (86%) -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/5] connman-gnome: rrecommend connman, don't rdepend
On 25 November 2015 at 15:05, Jussi Kukkonen wrote: > connman-gnome doesn't have a binary dependency on connman, and using > RRECOMMEND is better for multilib builds (connman-gnome works fine > with connman from a different architecture). > It's possible I've missed a thread during holidays but I believe this patch never made it into master. Jussi > Fixes [YOCTO #8586] > > Signed-off-by: Jussi Kukkonen > --- > meta/recipes-connectivity/connman/connman-gnome_0.7.bb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb > b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb > index 7b875f0..1849dbd 100644 > --- a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb > +++ b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb > @@ -22,7 +22,7 @@ S = "${WORKDIR}/git" > inherit autotools-brokensep gtk-icon-cache pkgconfig distro_features_check > ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" > > -RDEPENDS_${PN} = "connman" > +RRECOMMENDS_${PN} = "connman" > > do_install_append() { > install -m 0644 ${WORKDIR}/images/* > ${D}/usr/share/icons/hicolor/22x22/apps/ > -- > 2.1.4 > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] alsa-lib: 1.0.29 -> 1.1.0
On 14 January 2016 at 12:45, Alexander Kanavin < alexander.kana...@linux.intel.com> wrote: > It's more convenient if you send them in a single batch, with a branch to > pull from (using scripts/(create|send)-pull-request). Less manual > cherry-picking in the email client for Ross. > FWIW I threw some effort into automating tooling last week and can now go from patches in gmail to commits in my repo with just "ss" in gmail (tag message with a specific star) and then running "applyotron -m". (github:rossburton/ross-tools if anyone else is curious). For something like alsa having all the updates happen at once is neater and easier, and branches mean I can never accidentally pull the wrong patch from mail. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] cantarell-fonts: Add recipe
On 01/13/2016 07:36 PM, Jagadeesh Krishnanjanappa wrote: Ping. Without cantarell fonts, the pango test case test-layout.test fails. Previous result of pango ptest is at https://wiki.yoctoproject.org/wiki/Ptest_5e3e2e0cbb0a49986f4653e64c4c8d2b5461645e There is an upstream bug for this: https://bugzilla.gnome.org/show_bug.cgi?id=755733 You should leave a note at the upstream bug that the absence of the needed font is probably the issue. The test should probably be rewritten so that it doesn't assume that the font is available. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] alsa-lib: 1.0.29 -> 1.1.0
On 01/14/2016 02:21 PM, Tanu Kaskinen wrote: Changelog: http://alsa-project.org/main/index.php/Changes_v1.0.29_v 1.1.0 What about all the other alsa-* recipes? They are coming. It's more convenient if you send them in a single batch, with a branch to pull from (using scripts/(create|send)-pull-request). Less manual cherry-picking in the email client for Ross. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] cantarell-fonts: Add recipe
On 13 January 2016 at 19:36, Jagadeesh Krishnanjanappa < jkrishnanjana...@mvista.com> wrote: > Ping. > > Without cantarell fonts, the pango test case test-layout.test fails. > Previous result of pango ptest is at > > https://wiki.yoctoproject.org/wiki/Ptest_5e3e2e0cbb0a49986f4653e64c4c8d2b5461645e > > Normally I'm all for more test coverage but I'll point out that this is a 18M source repo for a single test... Sure, the download and target sizes are a fraction of that but they still count. Jussi > Regards, > Jagadeesh > > On Sat, Jan 9, 2016 at 8:02 PM, Jagadeesh Krishnanjanappa < > jkrishnanjana...@mvista.com> wrote: > >> 1. The Cantarell font typeface is designed as a >>contemporary Humanist sans serif, and was developed for >>on-screen reading; in particular, reading web pages on an >>HTC Dream mobile phone. >> >> 2. Pango test case (test-layout.test) requires cantarell-font >>typeface. This test case uses 'Cantarell 11' font type >> >> Signed-off-by: Jagadeesh Krishnanjanappa >> --- >> .../cantarell-fonts/cantarell-fonts_git.bb | 25 >> ++ >> 1 file changed, 25 insertions(+) >> create mode 100644 meta/recipes-graphics/cantarell-fonts/ >> cantarell-fonts_git.bb >> >> diff --git a/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb >> b/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb >> new file mode 100644 >> index 000..f55fef1 >> --- /dev/null >> +++ b/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb >> @@ -0,0 +1,25 @@ >> +SUMMARY = "Cantarell, a Humanist sans-serif font family" >> + >> +DESCRIPTION = "The Cantarell font typeface is designed as a \ >> + contemporary Humanist sans serif, and was developed for \ >> + on-screen reading; in particular, reading web pages on an >> \ >> + HTC Dream mobile phone." >> + >> +HOMEPAGE = "https://git.gnome.org/browse/cantarell-fonts/"; >> +SECTION = "fonts" >> +LICENSE = "OFL-1.1" >> +LIC_FILES_CHKSUM = "file://COPYING;md5=df91e3ffcab8cfb972a66bf11255188d" >> + >> +PV = "0.0.18.1+git${SRCPV}" >> +PR = "r0" >> + >> +SRCREV = "3e954528d06de1c7e5ba8ebf8b0cca9c68faa0c4" >> +SRC_URI = "git:// >> git.gnome.org/cantarell-fonts;protocol=git;branch=master" >> + >> +S = "${WORKDIR}/git" >> + >> +inherit autotools allarch fontcache >> + >> +PACKAGECONFIG ??= "" >> +PACKAGECONFIG[fontforge] = >> "--enable-source-rebuild=yes,--enable-source-rebuild=no,fontforge-native" >> +FILES_${PN} = "${datadir}/fonts ${datadir}/fontconfig" >> -- >> 1.9.1 >> >> > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] alsa-lib: 1.0.29 -> 1.1.0
Changelog: http://alsa-project.org/main/index.php/Changes_v1.0.29_v1.1.0 The most significant change is probably the addition of the "topology API", which is used to change the DSP topology from userspace. My understanding is that the API is (or will be) needed to support some new hardware, but I don't know any specifics about that. Rebased Check-if-wordexp-function-is-supported.patch. Dropped 0001-build-Do-not-try-to-detect-cross-compiler.patch, since it is included in the new release. Signed-off-by: Tanu Kaskinen --- Sorry, I sent v1 again without rename detection, making the changes hard to see. I now found that "git config diff.renames" helps with this, so this shouldn't happen any more. There are no functional changes in v2. ...build-Do-not-try-to-detect-cross-compiler.patch | 45 -- .../Check-if-wordexp-function-is-supported.patch | 14 +++ .../alsa/{alsa-lib_1.0.29.bb => alsa-lib_1.1.0.bb} | 5 +-- 3 files changed, 9 insertions(+), 55 deletions(-) delete mode 100644 meta/recipes-multimedia/alsa/alsa-lib/0001-build-Do-not-try-to-detect-cross-compiler.patch rename meta/recipes-multimedia/alsa/{alsa-lib_1.0.29.bb => alsa-lib_1.1.0.bb} (88%) diff --git a/meta/recipes-multimedia/alsa/alsa-lib/0001-build-Do-not-try-to-detect-cross-compiler.patch b/meta/recipes-multimedia/alsa/alsa-lib/0001-build-Do-not-try-to-detect-cross-compiler.patch deleted file mode 100644 index 583bc3d..000 --- a/meta/recipes-multimedia/alsa/alsa-lib/0001-build-Do-not-try-to-detect-cross-compiler.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 17aeb3565f411e7796cabe403f92d15948a8ca95 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 21 Aug 2015 14:42:45 -0700 -Subject: [PATCH] build: Do not try to detect cross-compiler - -cross compilers are passed via path may not be a gcc based cross -compiler in such cases this check fails and try's to force gcc based -cross compiler detection, This code is a convenience that limits the -build system - -Signed-off-by: Khem Raj -Upstream-Status: Pending - - configure.ac | 14 -- - 1 file changed, 14 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 3022cf8..9d77440 100644 a/configure.ac -+++ b/configure.ac -@@ -27,20 +27,6 @@ AC_PREFIX_DEFAULT(/usr) - - dnl Checks for programs. - --dnl try to gues cross-compiler if not set --if test "x$host" != "x$build" -a -z "`echo $CC | grep -e '-gcc'`"; --then -- AC_MSG_CHECKING(for cross-compiler) -- -- which ${program_prefix}gcc >/dev/null 2>&1 && CC=${program_prefix}gcc -- which ${host_cpu}-${host_os}-gcc >/dev/null 2>&1 \ -- && CC=${host_cpu}-${host_os}-gcc -- which ${host_cpu}-${host_vendor}-${host_os}-gcc >/dev/null 2>&1 \ -- && CC=${host_cpu}-${host_vendor}-${host_os}-gcc -- -- AC_MSG_RESULT($CC) --fi -- - CFLAGS="$CFLAGS -D_GNU_SOURCE" - - --- -2.1.4 - diff --git a/meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch b/meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch index 75a6eb8..795e48a 100644 --- a/meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch +++ b/meta/recipes-multimedia/alsa/alsa-lib/Check-if-wordexp-function-is-supported.patch @@ -1,4 +1,4 @@ -From e33357b59a10d44e9bec5d24100ce23ca300cc79 Mon Sep 17 00:00:00 2001 +From 3408f8e78776b12f131e433749721602f87e0a70 Mon Sep 17 00:00:00 2001 From: "Hong H. Pham" Date: Fri, 29 Aug 2014 17:13:55 +0300 Subject: [PATCH] Check if wordexp function is supported @@ -18,15 +18,15 @@ Signed-off-by: Cristian Iorga 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index b8353a0..773b72f 100644 +index 9490d39..b08a90a 100644 --- a/configure.ac +++ b/configure.ac -@@ -311,7 +311,10 @@ fi +@@ -295,7 +295,10 @@ fi AC_SUBST(ALSA_DEPLIBS) dnl Check for headers --AC_CHECK_HEADERS([wordexp.h endian.h sys/endian.h]) -+AC_CHECK_HEADERS([wordexp.h endian.h sys/endian.h], +-AC_CHECK_HEADERS([wordexp.h endian.h sys/endian.h sys/shm.h]) ++AC_CHECK_HEADERS([wordexp.h endian.h sys/endian.h sys/shm.h], + dnl Make sure wordexp is supported by the C library + AC_CHECK_FUNCS([wordexp]) +) @@ -34,7 +34,7 @@ index b8353a0..773b72f 100644 dnl Check for resmgr support... AC_MSG_CHECKING(for resmgr support) diff --git a/src/userfile.c b/src/userfile.c -index 3a73836..b8ce809 100644 +index 72779da..e9d13e6 100644 --- a/src/userfile.c +++ b/src/userfile.c @@ -32,7 +32,7 @@ @@ -47,5 +47,5 @@ index 3a73836..b8ce809 100644 #include int snd_user_file(const char *file, char **result) -- -1.9.1 +2.6.4 diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.0.29.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.1.0.bb similarity index 88% rename from meta/recipes-multimedia/alsa/alsa-lib_1.0.29.bb rename to meta/recipes-multimedia/alsa/alsa-lib_1.1.0.bb index 8eaeff4..d62c1fc 100644 --- a/meta/recipes-multimedia/alsa/alsa-lib_1.0.29.bb +++ b/meta/recipes-multimedia/a
Re: [OE-core] [PATCH] alsa-lib: 1.0.29 -> 1.1.0
On Thu, 2016-01-14 at 13:11 +0200, Alexander Kanavin wrote: > On 01/14/2016 08:52 AM, Tanu Kaskinen wrote: > > Changelog: http://alsa-project.org/main/index.php/Changes_v1.0.29_v > > 1.1.0 > > What about all the other alsa-* recipes? They are coming. -- Tanu -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] State of bitbake world, Failed tasks 2016-01-09, full QA report
qemuarm was using slightly older metadata, that's why it shows more failures. Reexecuting qemuarm build shows only one failure: Summary: 1 task failed: /home/jenkins/oe/world/shr-core/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.24.2.bb, do_populate_sysroot Summary: There were 5 WARNING messages shown. Summary: There were 3 ERROR messages shown, returning a non-zero exit code. == Tested changes (not included in master yet) - bitbake == cdf4cfb world-image: add extra target == Tested changes (not included in master yet) - openembedded-core == d444e2c sstate-sysroot-cruft.sh: Extend the whitelist f5aec48 arch-armv7ve.inc: respect armv7a override as well 33ac877 libbsd: upgrade to 0.8.1 9b8400f scripts/create-pull-request: fix git request-pull syntax 07f4dba qemux86: Add identical qemux86copy variant for tests 3183ee1 report-error: Allow to upload reports automatically == Tested changes (not included in master yet) - meta-openembedded == 4d6ae05 gnome-desktop: don't try to copy omf.make 17bd432 navit: disable qt4 support by default cde9695 gspd: disable qt4 support by default caf40a5 recipes: remove recipes using or depending on qt4 bbclasses or recipes 403bc6c waf-samba.bbclass: add cross-answers option and files b166d5a samba: backport patches for cross-compiling 74457f8 samba: fix the incorrect tmpfiles installed directory 81fed56 libtalloc: upgrade to 2.1.3 eafd027 libtevent: upgrade to 0.9.25 5bb6a15 libldb: upgrade to 1.1.21 64b5ead libtdb: upgrade to 1.3.7 be49dee xterm: 308 -> 320 e912fac gvfs: update to 1.24.2 to make access to windows shares work again 24645de python-pip: 7.1.0 -> 7.1.2 023ae09 stunnel: 5.21 -> 5.28 68edfc2 opensaf: 4.6.0 -> 4.7.0 143e983 postfix: 3.0.2 -> 3.0.3 a855432 rp-pppoe: 3.11 -> 3.12 dc19244 dnsmasq: Listen only on loopback and disable DHCP 1356bc0 poco: Add recipe for POCO C++ library 5635496 mozjs: fix linking issues on i586 fc26804 syslog-ng: 3.5.4.1 -> 3.6.4 641efda libsmi: 0.4.8 -> 0.5.0 456105b lvm2: 2.02.125 -> 2.02.138 5a09739 python-six: Error fix for recipes depend on python-six bae5cd5 Add python-jsonpatch and python-jsonpointer recipes ffb25e5 python-tornado: upgrade to 4.3 355ecdd mariadb: -native also needs gold workaround 38cfba5 cifs-utils: add PACKAGECONFIG for cifsidmap 5683c8b cifs-utils: add PACKAGECONFIG for pam fea767c netmap-modules: fix build with kernel < 3.17 f21b8b5 dhcpcd: add recipe for dhcpcd ffea5e3 samba: Fix typo in PACKAGECONFIG for "acl" and "aio" 7a34c21 Revert "libjpeg-turbo: remove recipe" 1ea033a libjpeg-turbo: remove recipe 44d0230 lowpan-tools: add missing flex/bison deps 3c49bd0 postfix: fix clean broken issue 1b9a465 ncftp: fix build failures with ccdv 9ec3ca5 iscsitarget: skip the arch test for kernel modules 345134f iscsitarget: split the kernel module into separate package ce4c2a0 netkit-ftp: fixed invalid symlink 3944ca6 ctdb: add PACKAGECONFIG for libtdb 36bbcb2 cim-schema-exper: fix host-user-contaminated 4c62551 nbd: use BPN in Files 1622b4e wireshark: update SRC_URI link to sources 3f03fb3 postfix: premission of /var/spool/mail seems incorrect af66826 tcpdump: add PACKAGECONFIG for libcap-ng == Tested changes (not included in master yet) - meta-qt5 == 943406e Revert "qtbase: fix Tartget typo" 7a2906b qtbase: fix Tartget typo c053ee2 qtscript/qtwebkit: disable thumb for armv4 and armv5 only to fix segfault on armv7 ca847b3 qtwebengine: Fix error jpeg_codec.cc, media_capture_devices_dispatcher.cpp and file API qquickwebengineview_p_p.h. c29c758 qt5: add extra path to qmlplugins == Tested changes (not included in master yet) - meta-browser == == Tested changes (not included in master yet) - meta-webos-ports == == Tested changes (not included in master yet) - meta-smartphone == 7daae02 meta-shr-distro: remove aurora dependency 1776861 layer.conf: add LAYERDEPENDS matching README files 208dda7 packagegroup-shr-feed: remove confclerk, evopedia, anki, monav fd22968 meta-fso, meta-aurora: move libfso-qt and qfsodbusxml2cpp to meta-aurora and add dependency on qt4 layer ec44745 Initial support for Samsung Galaxy SIII (International), aka i9300 cf30493 initramfs-boot-android: clean up init script 34c0047 busybox: rename bbappend to match new version from oe-core 1223487 xserver-xorg: rename bbappend to match new version from oe-core 92f78c0 packagegroup-shr*: remove pidgin, jefliks and claws-mail blacklisted in meta-oe 2ce67f5 jefliks: blacklist because of gnutls upgrade 96a7810 meta-shr, meta-fso: drop nonworking recipes == Number of issues - stats == {| class='wikitable' !|Date !!colspan='3'|Failed tasks !!colspan='12'|QA !!Comment |- || ||qemuarm ||qemux86 ||qemux86_64 ||already-stripped ||libdir||textrel ||build-deps ||file-rdeps||version-going-backwards ||host-user-contaminated ||installed-vs-shipped ||unknown-configure-option ||symlink-to-sysroot ||invalid-pkgconfig
Re: [OE-core] [PATCH V2] u-boot: Update to 2016.01 release
On Thu, Jan 14, 2016 at 04:17:12AM +0100, Marek Vasut wrote: > Upgrade U-Boot to latest version and drop upstreamed patches. > > Signed-off-by: Marek Vasut > Cc: Otavio Salvador > Cc: Ross Burton > Cc: Richard Purdie Reviewed-by: Tom Rini -- Tom signature.asc Description: Digital signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [Openembedded-architecture] Cached size of off_t
On Tue, Jan 12, 2016 at 03:23:33PM -0800, Khem Raj wrote: > Hi > > We cache size of off_t in site files and the value is 4 in most cases > > > meta/site/arm-linux:ac_cv_sizeof_off_t=${ac_cv_sizeof_off_t=4} > meta/site/ix86-common:ac_cv_sizeof_off_t=${ac_cv_sizeof_off_t=4} > meta/site/nios2-linux:ac_cv_sizeof_off_t=${ac_cv_sizeof_off_t=4} > meta/site/powerpc32-linux:ac_cv_sizeof_off_t=${ac_cv_sizeof_off_t=4} > meta/site/x32-linux:ac_cv_sizeof_off_t=${ac_cv_sizeof_off_t=8} > meta/site/x86_64-linux:ac_cv_sizeof_off_t=${ac_cv_sizeof_off_t=8} > > > However this value is wrong when largefile support is enabled (which is > default) on > most OE based distros. It also lands us in nasty bugs which are complicated > to uncover > eg. the curl issue > > http://git.openembedded.org/openembedded-core/commit/?id=3c58712465494e441c4036a7cf21d2e6d343efab > > and just in OE-Core more e.g. grub2,libsndfile1,pax are showing same symptoms. It's even more complicated in curl case, which bumps SONAME version when off_t is changed. So with dizzy we had libcurl5, but after the commit above we get libcurl4 which looks strange considering the curl version in oe-core is newer now. You can force the bump with --enable-soname-bump, but that doesn't make it ABI compatible, because SIZEOF_OFF_T was really changed inside curl build. Regards, > I think this value should be left for configure to compute and > autotools.bbclass should pass --{enable|disable}-largefile based upon > DISTRO_FEATURES enabling largefile support > > Do we see any downsides or point I might have missed > > Thank you > -Khem > > ___ > Openembedded-architecture mailing list > openembedded-architect...@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-architecture -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] alsa-lib: 1.0.29 -> 1.1.0
On 01/14/2016 08:52 AM, Tanu Kaskinen wrote: Changelog: http://alsa-project.org/main/index.php/Changes_v1.0.29_v1.1.0 What about all the other alsa-* recipes? Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] dbus: upgrade to 1.10.6
The following changes since commit 541315d6c56df6448f64c262f99d43d5c1e9400b: update_font_cache: only scan system font directories (2016-01-11 23:23:18 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib ChenQi/dbus-1.10.6 http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/dbus-1.10.6 Chen Qi (1): dbus: upgrade to 1.10.6 .../{dbus-test_1.8.20.bb => dbus-test_1.10.6.bb}| 4 ++-- meta/recipes-core/dbus/dbus/python-config.patch | 21 +++-- .../dbus/{dbus_1.8.20.bb => dbus_1.10.6.bb} | 17 +++-- 3 files changed, 28 insertions(+), 14 deletions(-) rename meta/recipes-core/dbus/{dbus-test_1.8.20.bb => dbus-test_1.10.6.bb} (93%) rename meta/recipes-core/dbus/{dbus_1.8.20.bb => dbus_1.10.6.bb} (90%) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] dbus: upgrade to 1.10.6
1. Upgrade dbus and dbus-test to 1.10.6. 2. Modify PACKAGECONFIG for systemd to avoid runtime failure. 3. Modify python-config.patch to suite the latest version. 4. Change FILES variable to suite the latest version. 5. Remove obsolete option '--without-dbus-glib'. Signed-off-by: Chen Qi --- .../{dbus-test_1.8.20.bb => dbus-test_1.10.6.bb}| 4 ++-- meta/recipes-core/dbus/dbus/python-config.patch | 21 +++-- .../dbus/{dbus_1.8.20.bb => dbus_1.10.6.bb} | 17 +++-- 3 files changed, 28 insertions(+), 14 deletions(-) rename meta/recipes-core/dbus/{dbus-test_1.8.20.bb => dbus-test_1.10.6.bb} (93%) rename meta/recipes-core/dbus/{dbus_1.8.20.bb => dbus_1.10.6.bb} (90%) diff --git a/meta/recipes-core/dbus/dbus-test_1.8.20.bb b/meta/recipes-core/dbus/dbus-test_1.10.6.bb similarity index 93% rename from meta/recipes-core/dbus/dbus-test_1.8.20.bb rename to meta/recipes-core/dbus/dbus-test_1.10.6.bb index f5400a0..147451f 100644 --- a/meta/recipes-core/dbus/dbus-test_1.8.20.bb +++ b/meta/recipes-core/dbus/dbus-test_1.10.6.bb @@ -18,8 +18,8 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://clear-guid_from_server-if-send_negotiate_unix_f.patch \ " -SRC_URI[md5sum] = "b49890bbabedab3a1c3f4f73c7ff8b2b" -SRC_URI[sha256sum] = "5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a" +SRC_URI[md5sum] = "26d0cf3a1c9782cb0e342101f0450440" +SRC_URI[sha256sum] = "b5fefa08a77edd76cd64d872db949eebc02cf6f3f8be82e4bbc641742af5d35f" S="${WORKDIR}/dbus-${PV}" FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:" diff --git a/meta/recipes-core/dbus/dbus/python-config.patch b/meta/recipes-core/dbus/dbus/python-config.patch index 2944002..da2f10c 100644 --- a/meta/recipes-core/dbus/dbus/python-config.patch +++ b/meta/recipes-core/dbus/dbus/python-config.patch @@ -7,19 +7,28 @@ Upstream-Status: Inappropriate [oe specific] Signed-off-by: Mark Hatle dbus-1.6.8/configure.ac.orig 2013-07-11 14:15:58.834554799 -0500 -+++ dbus-1.6.8/configure.ac2013-07-11 14:14:40.969554848 -0500 -@@ -257,13 +257,6 @@ +--- + configure.ac | 7 --- + 1 file changed, 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 80d27b4..becc1cc 100644 +--- a/configure.ac b/configure.ac +@@ -279,13 +279,6 @@ if test "x$enable_tests" = xyes; then # full test coverage is required, Python is a hard dependency - AC_MSG_NOTICE([Full test coverage (--enable-tests=yes) requires Python, dbus-python, pygobject]) + AC_MSG_NOTICE([Full test coverage (--enable-tests=yes) requires Python, dbus-python, pygi]) AM_PATH_PYTHON([2.6]) - AC_MSG_CHECKING([for Python modules for full test coverage]) -- if "$PYTHON" -c "import dbus, gobject, dbus.mainloop.glib"; then +- if "$PYTHON" -c "import dbus, gi.repository.GObject, dbus.mainloop.glib"; then -AC_MSG_RESULT([yes]) - else -AC_MSG_RESULT([no]) --AC_MSG_ERROR([cannot import dbus, gobject, dbus.mainloop.glib Python modules]) +-AC_MSG_ERROR([cannot import dbus, gi.repository.GObject, dbus.mainloop.glib Python modules]) - fi else # --enable-tests not given: do not abort if Python is missing AM_PATH_PYTHON([2.6], [], [:]) +-- +1.9.1 + diff --git a/meta/recipes-core/dbus/dbus_1.8.20.bb b/meta/recipes-core/dbus/dbus_1.10.6.bb similarity index 90% rename from meta/recipes-core/dbus/dbus_1.8.20.bb rename to meta/recipes-core/dbus/dbus_1.10.6.bb index 0c7f6b1..d159478 100644 --- a/meta/recipes-core/dbus/dbus_1.8.20.bb +++ b/meta/recipes-core/dbus/dbus_1.10.6.bb @@ -20,8 +20,8 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://0001-configure.ac-support-large-file-for-stat64.patch \ " -SRC_URI[md5sum] = "b49890bbabedab3a1c3f4f73c7ff8b2b" -SRC_URI[sha256sum] = "5c4fbf4c64621c96e871da91d2b729a5b00536e116d3c4612a469d924b1b703a" +SRC_URI[md5sum] = "26d0cf3a1c9782cb0e342101f0450440" +SRC_URI[sha256sum] = "b5fefa08a77edd76cd64d872db949eebc02cf6f3f8be82e4bbc641742af5d35f" inherit useradd autotools pkgconfig gettext update-rc.d upstream-version-is-even @@ -59,15 +59,21 @@ FILES_${PN} = "${bindir}/dbus-daemon* \ ${bindir}/dbus-monitor \ ${bindir}/dbus-launch \ ${bindir}/dbus-run-session \ + ${bindir}/dbus-update-activation-environment \ + ${bindir}/dbus-test-tool \ ${libexecdir}/dbus* \ ${sysconfdir} \ ${localstatedir} \ ${datadir}/dbus-1/services \ ${datadir}/dbus-1/system-services \ + ${datadir}/dbus-1/session.d \ + ${datadir}/dbus-1/session.conf \ + ${datadir}/dbus-1/system.d \ + ${datadir}/dbus-1/system.conf \ ${systemd_unitdir}/system/" FILES_${PN}-lib = "${libdir}/lib*.so.*" RRECOMMENDS_${PN}-lib = "${PN}" -FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus