Re: [OE-core] [PATCH 3/4] rootfs_rpm.bbclass: rename postinst trigger script
On Sun, Mar 4, 2012 at 01:31, Richard Purdie richard.pur...@linuxfoundation.org wrote: I find the consistency argument a little confusing when you had to rename this for all of the packaging backends from the same thing? I did it because I used run-postinsts package for bootstrap in ipk. I understand you want a less confusing name though as configure is an overloaded word. If you prefer I can change this; doesn't matter for me. Also, please do post the deb patch too. Saying you've just pushed an extra patch somewhere doesn't really work... Right; once you reply if you want me to change wording I do. -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC] keymaps and kernel version
On Sun, Mar 4, 2012 at 12:40 AM, Andrea Adami andrea.ad...@gmail.com wrote: Hi, while testing some new kernels I found out a broken keymap. After short research I could identify the cause in recipes-bsp/keymaps/files/keymap.sh: ... KERNEL_MAJMIN=`uname -r | cut -d '.' -f 1,2` if [ -e /etc/keymap-$KERNEL_MAJMIN.map ]; then loadkeys /etc/keymap-$KERNEL_MAJMIN.map fi ... $ uname -r | cut -d '.' -f 1,2 3.2 I realized we are still using some old keymap-2.6.map and this doesn't match with KERNEL_MAJMIN. Now, renaming the keymaps to 3.2 would be only a band-aid, 3.3 is coming. Maybe we should check for keymap-3.map, i.e. uname -r | cut -d '.' -f 1,1 or embed the machine name instead. Regards Andrea Actually this all sounds remnant of linux 2.4 vs. 2.6 times. Probably today we can just set: ... if [ -e /etc/keymap.map ]; then ... and the BSP layers will have to rename the overrides only once. My 2 cents Andrea ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC] keymaps and kernel version
Op 5 mrt. 2012, om 14:12 heeft Andrea Adami het volgende geschreven: On Sun, Mar 4, 2012 at 12:40 AM, Andrea Adami andrea.ad...@gmail.com wrote: Hi, while testing some new kernels I found out a broken keymap. After short research I could identify the cause in recipes-bsp/keymaps/files/keymap.sh: ... KERNEL_MAJMIN=`uname -r | cut -d '.' -f 1,2` if [ -e /etc/keymap-$KERNEL_MAJMIN.map ]; then loadkeys /etc/keymap-$KERNEL_MAJMIN.map fi ... $ uname -r | cut -d '.' -f 1,2 3.2 I realized we are still using some old keymap-2.6.map and this doesn't match with KERNEL_MAJMIN. Now, renaming the keymaps to 3.2 would be only a band-aid, 3.3 is coming. Maybe we should check for keymap-3.map, i.e. uname -r | cut -d '.' -f 1,1 or embed the machine name instead. Regards Andrea Actually this all sounds remnant of linux 2.4 vs. 2.6 times. Probably today we can just set: ... if [ -e /etc/keymap.map ]; then ... and the BSP layers will have to rename the overrides only once. Or just drop it completely and let udev handle it? regards, Koen ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] logrotate 3.7.9: Allow rotate log across filesystems
The logrotate can't save the log across the different filesystems since
it used the rename(const char *oldpath, const char *newpath) to save
the file, fix it to act as the mv command(first rename, if failed,
read and write) to allow save the log across the different filesystems.
* config.c: Remove the check for different filesystems
* logrotate.c: Act as the mv command when rotate log
* logrotate.8: Update the mannual
* logrotate.8: Fix a bug in the mannual(\f should be \fR)
[YOCTO #718]
Signed-off-by: Robert Yang liezhi.y...@windriver.com
---
.../allow-across-different-filesystems.patch | 154
meta/recipes-extended/logrotate/logrotate_3.7.9.bb |5 +-
2 files changed, 157 insertions(+), 2 deletions(-)
create mode 100644
meta/recipes-extended/logrotate/logrotate-3.7.9/allow-across-different-filesystems.patch
diff --git
a/meta/recipes-extended/logrotate/logrotate-3.7.9/allow-across-different-filesystems.patch
b/meta/recipes-extended/logrotate/logrotate-3.7.9/allow-across-different-filesystems.patch
--- /dev/null
+++
b/meta/recipes-extended/logrotate/logrotate-3.7.9/allow-across-different-filesystems.patch
@@ -0,0 +1,154 @@
+Allow rotate log across different filesystems
+
+* Remove the check for different filesystems
+* Act as the mv command when rotate log
+* Update the mannual
+* Fix a bug in the mannual(\f should be \fR)
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang liezhi.y...@windriver.com
+---
+ config.c|8
+ logrotate.8 |9 -
+ logrotate.c | 59 +--
+ 3 files changed, 57 insertions(+), 19 deletions(-)
+
+diff --git a/config.c b/config.c
+--- a/config.c
b/config.c
+@@ -1482,14 +1482,6 @@ duperror:
+ dirName, strerror(errno));
+ goto error;
+ }
+-
+- if (sb.st_dev != sb2.st_dev) {
+- message(MESS_ERROR,
+- %s:%d olddir %s and log file %s
+- are on different devices\n, configFile,
+- lineNum, newlog-oldDir, newlog-files[i]);
+- goto error;
+- }
+ }
+ }
+
+diff --git a/logrotate.8 b/logrotate.8
+--- a/logrotate.8
b/logrotate.8
+@@ -354,10 +354,9 @@ Do not rotate the log if it is empty (this overrides the
\fBifempty\fR option).
+ .TP
+ \fBolddir \fIdirectory\fR
+ Logs are moved into \fIdirectory\fR for rotation. The \fIdirectory\fR
+-must be on the same physical device as the log file being rotated,
+-and is assumed to be relative to the directory holding the log file
+-unless an absolute path name is specified. When this option is used all
+-old versions of the log end up in \fIdirectory\fR. This option may be
++is assumed to be relative to the directory holding the log file unless
++an absolute path name is specified. When this option is used all old
++versions of the log end up in \fIdirectory\fR. This option may be
+ overridden by the \fBnoolddir\fR option.
+
+ .TP
+@@ -415,7 +414,7 @@ Log files are rotated when they grow bigger than
\fIsize\fR bytes. If
+ \fIsize\fR is followed by \fIk\fR, the size is assumed to be in kilobytes.
+ If the \fIM\fR is used, the size is in megabytes, and if \fIG\fR is used, the
+ size is in gigabytes. So \fBsize 100\fR, \fIsize 100k\fR, \fIsize 100M\fR and
+-\fIsize 100G\f are all valid.
++\fIsize 100G\fR are all valid.
+
+ .TP
+ \fBsharedscripts\fR
+diff --git a/logrotate.c b/logrotate.c
+--- a/logrotate.c
b/logrotate.c
+@@ -625,6 +625,53 @@ int findNeedRotating(struct logInfo *log, int logNum)
+ return 0;
+ }
+
++/* Act as the mv command, if rename failed, then read the old file and
++ * write to new file. The function which invokes the mvFile will use
++ * the strerror(errorno) to handle the error message, so we don't have
++ * to print the error message here */
++
++int mvFile (char *oldName, char *newName, struct logInfo *log)
++{
++struct stat sbprev;
++int fd_old, fd_new, n;
++char buf[BUFSIZ];
++
++/* Do the rename first */
++if (!rename(oldName, newName))
++return 0;
++
++/* If the errno is EXDEV, then read old file, write newfile and
++ * remove the oldfile */
++if (errno == EXDEV) {
++/* Open the old file to read */
++if ((fd_old = open(oldName, O_RDONLY)) 0)
++return 1;
++
++/* Create the file to write, keep the same attribute as the old file
*/
++if (stat(oldName, sbprev))
++return 1;
++else {
++if ((fd_new = createOutputFile(newName,
++O_WRONLY | O_CREAT | O_TRUNC, sbprev)) 0 )
++return 1;
++}
++
++/* Read and write */
++while ((n = read(fd_old, buf, BUFSIZ)) 0)
++if (write(fd_new, buf, n) != n)
++return 1;
++
++if ((close(fd_old) 0)
[OE-core] [PATCH 0/1] Allow rotate log across filesystems
This patch is based on oe-core, and the pull request is on poky-contrib The testing summary: 1) Add the olddir to logrotate.conf, and the olddir should have a different mount point of the current log directory. 2) Run logrotate -f /path/to/logrotate.conf to force rotate, the old log should be rotated to the olddir which is on another mount point. //Robert The following changes since commit a439d32dd843d10a9f65cc858b02422fac7deb50: soc-family.inc: to be included in machine.conf to add SOC_FAMILY to MACHINEOVERRIDE (2012-03-04 05:41:11 -0800) are available in the git repository at: git://git.pokylinux.org/poky-contrib robert/logrotate http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/logrotate Robert Yang (1): logrotate 3.7.9: Allow rotate log across filesystems .../allow-across-different-filesystems.patch | 154 meta/recipes-extended/logrotate/logrotate_3.7.9.bb |5 +- 2 files changed, 157 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-extended/logrotate/logrotate-3.7.9/allow-across-different-filesystems.patch -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] package_rpm.bbclass: Add srpm function
On Sat, 2012-03-03 at 18:54 +0800, Xiaofeng Yan wrote:
From: Xiaofeng Yan xiaofeng@windriver.com
Add a new function to archive source, patches and logs to a source rpm
package. Every source rpm package will be deployed to
${DEPLOY}/sources/deploy-srpm.
What's the goal of this? Just to be a one file collection of
sources? Or do we actually expect people to build from this somehow?
If the intention is to eventually allow building, but it's not actually
used to build right now, it seems very likely to bitrot as the core
changes.
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 1/4] polkit 0.104: convert pam code to PACKAGECONFIG and adhere to OE recipe styleguide
On Mon, 2012-03-05 at 08:38 +0100, Koen Kooi wrote: Signed-off-by: Koen Kooi k...@dominion.thruhere.net --- meta/recipes-extended/polkit/polkit_0.104.bb | 25 +++-- 1 files changed, 15 insertions(+), 10 deletions(-) Merged to master, thanks (patches 1-4). Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] read only rootfs?
Hello, What are the best practices for implementing a read-only rootfs built with OE? I've looked at a few things like poky-tiny.conf, but figured I would ask. To date, I've been cheating and implementing a tmpfs overlay on top a RO rootfs using unionfs, but this is less than idea as you need to do the package install process on every boot. Others boot the first time RW, and then switch to RO for subsequent boots. Thanks, Cliff -- = http://bec-systems.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] read only rootfs?
On Mon, Mar 5, 2012 at 17:39, Cliff Brake cliff.br...@gmail.com wrote: What are the best practices for implementing a read-only rootfs built with OE? I've looked at a few things like poky-tiny.conf, but figured I would ask. You could the image feature for it; depending on the image complexity it might just work or need few fixes for some postinsts to work in offline mode. -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 1/4] polkit 0.104: convert pam code to PACKAGECONFIG and adhere to OE recipe styleguide
On Mon, 2012-03-05 at 08:38 +0100, Koen Kooi wrote:
Signed-off-by: Koen Kooi k...@dominion.thruhere.net
---
meta/recipes-extended/polkit/polkit_0.104.bb | 25 +++--
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/meta/recipes-extended/polkit/polkit_0.104.bb
b/meta/recipes-extended/polkit/polkit_0.104.bb
index 2737a4a..5dc82c5 100644
--- a/meta/recipes-extended/polkit/polkit_0.104.bb
+++ b/meta/recipes-extended/polkit/polkit_0.104.bb
@@ -6,28 +6,33 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=155db86cdbafa7532b41f390409283eb \
file://src/polkit/polkit.h;beginline=1;endline=20;md5=0a8630b0133176d0504c87a0ded39db4
\
file://docs/polkit/html/license.html;md5=d85a36709a446c10f4ee123f9dda0e38
+DEPENDS = expat dbus-glib eggdbus intltool-native
+
+PACKAGECONFIG = ${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}
+PACKAGECONFIG[pam] = --with-authfw=pam,--with-authfw=none,libpam,libpam
+
After this merged I found a few issues on the autobuilder. There were
two problems. If DISTRO_FEATURES didn't contain pam and was empty, the
PACKAGECONFIG code would not trigger at all (and not add the
authfw=none). Secondly, I think we need shadow, not none as
otherwise the builds fail due to an invalid configuration.
I've pushed the two fixes for this since builds were breaking.
Cheers,
Richard
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 1/4] polkit 0.104: convert pam code to PACKAGECONFIG and adhere to OE recipe styleguide
Op 5 mrt. 2012, om 22:14 heeft Richard Purdie het volgende geschreven:
On Mon, 2012-03-05 at 08:38 +0100, Koen Kooi wrote:
Signed-off-by: Koen Kooi k...@dominion.thruhere.net
---
meta/recipes-extended/polkit/polkit_0.104.bb | 25 +++--
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/meta/recipes-extended/polkit/polkit_0.104.bb
b/meta/recipes-extended/polkit/polkit_0.104.bb
index 2737a4a..5dc82c5 100644
--- a/meta/recipes-extended/polkit/polkit_0.104.bb
+++ b/meta/recipes-extended/polkit/polkit_0.104.bb
@@ -6,28 +6,33 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=155db86cdbafa7532b41f390409283eb \
file://src/polkit/polkit.h;beginline=1;endline=20;md5=0a8630b0133176d0504c87a0ded39db4
\
file://docs/polkit/html/license.html;md5=d85a36709a446c10f4ee123f9dda0e38
+DEPENDS = expat dbus-glib eggdbus intltool-native
+
+PACKAGECONFIG = ${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}
+PACKAGECONFIG[pam] = --with-authfw=pam,--with-authfw=none,libpam,libpam
+
After this merged I found a few issues on the autobuilder. There were
two problems. If DISTRO_FEATURES didn't contain pam and was empty, the
PACKAGECONFIG code would not trigger at all (and not add the
authfw=none).
Beth mailed me the log and I asked her is PACKAGECONFIG is broken, and it seems
it is since the --disable-foo isn't triggering. Or have I misunderstood how
PACKAGECONFIG is supposed to work?
regards,
Koen
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 1/4] polkit 0.104: convert pam code to PACKAGECONFIG and adhere to OE recipe styleguide
Op 5 mrt. 2012, om 22:16 heeft Koen Kooi het volgende geschreven:
Op 5 mrt. 2012, om 22:14 heeft Richard Purdie het volgende geschreven:
On Mon, 2012-03-05 at 08:38 +0100, Koen Kooi wrote:
Signed-off-by: Koen Kooi k...@dominion.thruhere.net
---
meta/recipes-extended/polkit/polkit_0.104.bb | 25
+++--
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/meta/recipes-extended/polkit/polkit_0.104.bb
b/meta/recipes-extended/polkit/polkit_0.104.bb
index 2737a4a..5dc82c5 100644
--- a/meta/recipes-extended/polkit/polkit_0.104.bb
+++ b/meta/recipes-extended/polkit/polkit_0.104.bb
@@ -6,28 +6,33 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=155db86cdbafa7532b41f390409283eb \
file://src/polkit/polkit.h;beginline=1;endline=20;md5=0a8630b0133176d0504c87a0ded39db4
\
file://docs/polkit/html/license.html;md5=d85a36709a446c10f4ee123f9dda0e38
+DEPENDS = expat dbus-glib eggdbus intltool-native
+
+PACKAGECONFIG = ${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}
+PACKAGECONFIG[pam] = --with-authfw=pam,--with-authfw=none,libpam,libpam
+
After this merged I found a few issues on the autobuilder. There were
two problems. If DISTRO_FEATURES didn't contain pam and was empty, the
PACKAGECONFIG code would not trigger at all (and not add the
authfw=none).
Beth mailed me the log and I asked her is PACKAGECONFIG is broken, and it
seems it is since the --disable-foo isn't triggering. Or have I misunderstood
how PACKAGECONFIG is supposed to work?
http://cgit.openembedded.org/openembedded-core/commit/?id=d7b8c247227f3cc82f92292407f548927e9fde78
:)
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] mtd-utils: clean up old files
On 02/27/2012 10:25 PM, James Limbouris wrote:
Signed-off-by: James Limbourisja...@digitalmatter.com.au
---
.../add-exclusion-to-mkfs-jffs2-git-2.patch| 103 ---
.../add-exclusion-to-mkfs-jffs2-git.patch | 136
.../mtd/mtd-utils/fix-ignoreerrors-git.patch | 28
.../mtd/mtd-utils/remove-ubi.patch | 35 -
meta/recipes-devtools/mtd/mtd-utils_1.1.0+git.bb | 28
5 files changed, 0 insertions(+), 330 deletions(-)
delete mode 100644
meta/recipes-devtools/mtd/mtd-utils-1.4.9/mtd-utils-1.4.1/add-exclusion-to-mkfs-jffs2-git-2.patch
delete mode 100644
meta/recipes-devtools/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-git.patch
delete mode 100644
meta/recipes-devtools/mtd/mtd-utils/fix-ignoreerrors-git.patch
delete mode 100644 meta/recipes-devtools/mtd/mtd-utils/remove-ubi.patch
delete mode 100644 meta/recipes-devtools/mtd/mtd-utils_1.1.0+git.bb
Sorry for the delay on this one, not sure why you are removing the git
version of the recipe? If anything you could move it forward to the
latetest git version and clean up the patches as needed.
Thanks
Sau!
diff --git
a/meta/recipes-devtools/mtd/mtd-utils-1.4.9/mtd-utils-1.4.1/add-exclusion-to-mkfs-jffs2-git-2.patch
b/meta/recipes-devtools/mtd/mtd-utils-1.4.9/mtd-utils-1.4.1/add-exclusion-to-mkfs-jffs2-git-2.patch
deleted file mode 100644
index 57d6a30..000
---
a/meta/recipes-devtools/mtd/mtd-utils-1.4.9/mtd-utils-1.4.1/add-exclusion-to-mkfs-jffs2-git-2.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-Upstream-Status: Pending
-
/tmp/mkfs.jffs2.c 2009-01-11 15:28:41.0 +0100
-+++ git/mkfs.jffs2.c 2009-01-11 15:59:29.0 +0100
-@@ -100,6 +100,11 @@
- struct rb_node hardlink_rb;
- };
-
-+struct ignorepath_entry {
-+ struct ignorepath_entry* next; /* Points to the next ignorepath
element */
-+ char name[PATH_MAX];/* Name of the entry */
-+};
-+static struct ignorepath_entry* ignorepath = 0;
- struct rb_root hardlinks;
- static int out_fd = -1;
- static int in_fd = -1;
-@@ -408,7 +413,7 @@
- char *hpath, *tpath;
- struct dirent *dp, **namelist;
- struct filesystem_entry *entry;
--
-+ struct ignorepath_entry* element = ignorepath;
-
- if (lstat(hostpath,sb)) {
- perror_msg_and_die(%s, hostpath);
-@@ -417,6 +422,15 @@
- entry = add_host_filesystem_entry(targetpath, hostpath,
- sb.st_uid, sb.st_gid, sb.st_mode, 0, parent);
-
-+ while ( element ) {
-+ if ( strcmp( element-name, targetpath ) == 0 ) {
-+ printf( Note: ignoring directories below '%s'\n,
targetpath );
-+ return entry;
-+ break;
-+ }
-+ element = element-next;
-+ }
-+
- n = scandir(hostpath,namelist, 0, alphasort);
- if (n 0) {
- perror_msg_and_die(opening directory %s, hostpath);
-@@ -1453,6 +1467,7 @@
- {root, 1, NULL, 'r'},
- {pagesize, 1, NULL, 's'},
- {eraseblock, 1, NULL, 'e'},
-+ {ignore, 1, NULL, 'I'},
- {output, 1, NULL, 'o'},
- {help, 0, NULL, 'h'},
- {verbose, 0, NULL, 'v'},
-@@ -1500,6 +1515,7 @@
- -L, --list-compressors Show the list of the avaiable compressors\n
- -t, --test-compression Call decompress and compare with the original (for
test)\n
- -n, --no-cleanmarkers Don't add a cleanmarker to every eraseblock\n
-+ -I, --ignore=PATH Ignore sub directory and file tree below PATH when
recursing over the file system\n
- -o, --output=FILE Output to FILE (default: stdout)\n
- -l, --little-endian Create a little-endian filesystem\n
- -b, --big-endianCreate a big-endian filesystem\n
-@@ -1666,6 +1682,7 @@
- char *compr_name = NULL;
- int compr_prior = -1;
- int warn_page_size = 0;
-+ struct ignorepath_entry* element = ignorepath;
-
- page_size = sysconf(_SC_PAGESIZE);
- if (page_size 0) /* System doesn't know so ... */
-@@ -1676,7 +1693,7 @@
- jffs2_compressors_init();
-
- while ((opt = getopt_long(argc, argv,
-- D:d:r:s:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:i:,
long_options,c))= 0)
-+ D:d:r:s:I:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:i:,
long_options,c))= 0)
- {
- switch (opt) {
- case 'D':
-@@ -1700,6 +1717,28 @@
- warn_page_size = 0; /* set by user, so don't
need to warn */
- break;
-
-+ case 'I':
-+ printf( Note: Adding '%s' to ignore Path\n,
optarg );
-+ element = ignorepath;
-+ if ( !ignorepath ) {
-+ ignorepath = xmalloc( sizeof( struct
ignorepath_entry ) );
-+
Re: [OE-core] [PATCH v2 1/4] polkit 0.104: convert pam code to PACKAGECONFIG and adhere to OE recipe styleguide
Op 5 mrt. 2012, om 22:14 heeft Richard Purdie het volgende geschreven:
On Mon, 2012-03-05 at 08:38 +0100, Koen Kooi wrote:
Signed-off-by: Koen Kooi k...@dominion.thruhere.net
---
meta/recipes-extended/polkit/polkit_0.104.bb | 25 +++--
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/meta/recipes-extended/polkit/polkit_0.104.bb
b/meta/recipes-extended/polkit/polkit_0.104.bb
index 2737a4a..5dc82c5 100644
--- a/meta/recipes-extended/polkit/polkit_0.104.bb
+++ b/meta/recipes-extended/polkit/polkit_0.104.bb
@@ -6,28 +6,33 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=155db86cdbafa7532b41f390409283eb \
file://src/polkit/polkit.h;beginline=1;endline=20;md5=0a8630b0133176d0504c87a0ded39db4
\
file://docs/polkit/html/license.html;md5=d85a36709a446c10f4ee123f9dda0e38
+DEPENDS = expat dbus-glib eggdbus intltool-native
+
+PACKAGECONFIG = ${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}
+PACKAGECONFIG[pam] = --with-authfw=pam,--with-authfw=none,libpam,libpam
+
After this merged I found a few issues on the autobuilder. There were
two problems. If DISTRO_FEATURES didn't contain pam and was empty, the
PACKAGECONFIG code would not trigger at all (and not add the
authfw=none). Secondly, I think we need shadow, not none as
otherwise the builds fail due to an invalid configuration.
I've thought about that, but if we choose 'shadow', we need to add (R)DEPENDS
for it to work properly. So 'none' seems like the best option.
Anyway, how can I take over maintainership of polkit, I'm getting tired of
every commit breaking it subtly and taking another week of my time finding out
that $random error is actually caused by polkit deep down. It's like dbus,
breakage does not always point to the culprit.
Takes this one for example:
http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-extended/polkit?id=6bc6406b019ebc104a4abfb15c2d2e1263968664
PAM is hardcoded to be enabled, but you'll only get a working config if you put
it in DISTRO_FEATURES.
regards,
Koen
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] automake: omit compilation of pyc files on install
On 02/24/2012 05:19 PM, Andreas Oberritter wrote:
* On install, automake calls py-compile, which previously
compiled python source code to pyc and pyo, which both
got packaged.
* The python interpreter in OE contains patches to enable
optimization (pyo) by default:
04-default-is-optimized.patch
99-ignore-optimization-flag.patch
* automake created pyc files by calling py_compile.compile()
and adding the c suffix manually, resulting in identical
byte code for both pyc and pyo files.
* py-compile-compile-only-optimized-byte-code.patch
applies to automake 1.11 and automake master, but older
versions require a slightly modified patch. However,
older versions are only pinned by chinook-compat and
nylon, so I left them untouched.
Signed-off-by: Andreas Oberrittero...@opendreambox.org
Signed-off-by: Khem Rajraj.k...@gmail.com
The patch was imported from the OpenEmbedded git server
(git://git.openembedded.org/openembedded) as of commit id
aa4585c5065e05c759f16e1e8623fc7f40640f1b.
Modified to apply to automake version 1.11.2 and to
include a patch header. Also renamed the patch.
Signed-off-by: Andreas Oberrittero...@opendreambox.org
---
...-compile-compile-only-optimized-byte-code.patch | 42
meta/recipes-devtools/automake/automake_1.11.2.bb |5 +-
2 files changed, 45 insertions(+), 2 deletions(-)
create mode 100644
meta/recipes-devtools/automake/automake/py-compile-compile-only-optimized-byte-code.patch
diff --git
a/meta/recipes-devtools/automake/automake/py-compile-compile-only-optimized-byte-code.patch
b/meta/recipes-devtools/automake/automake/py-compile-compile-only-optimized-byte-code.patch
new file mode 100644
index 000..f09bfbc
--- /dev/null
+++
b/meta/recipes-devtools/automake/automake/py-compile-compile-only-optimized-byte-code.patch
@@ -0,0 +1,42 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+* OE-Core's python creates the same binary output
+ for both pyc and pyo, so disable the creation of
+ pyc files by automake.
+
+Signed-off-by: Andreas Oberrittero...@opendreambox.org
+---
+ lib/py-compile | 17 -
+ 1 files changed, 0 insertions(+), 17 deletions(-)
+
+diff --git a/lib/py-compile b/lib/py-compile
+index 3f9d05b..101c814 100755
+--- a/lib/py-compile
b/lib/py-compile
+@@ -101,23 +101,6 @@ else
+ filetrans=filepath = os.path.normpath('$destdir' + os.sep + path)
+ fi
+
+-$PYTHON -c
+-import sys, os, py_compile
+-
+-files = '''$files'''
+-
+-sys.stdout.write('Byte-compiling python modules...\n')
+-for file in files.split():
+-$pathtrans
+-$filetrans
+-if not os.path.exists(filepath) or not (len(filepath)= 3
+-and filepath[-3:] == '.py'):
+- continue
+-sys.stdout.write(file)
+-sys.stdout.flush()
+-py_compile.compile(filepath, filepath + 'c', path)
+-sys.stdout.write('\n') || exit $?
+-
+ # this will fail for python 1.5, but that doesn't matter ...
+ $PYTHON -O -c
+ import sys, os, py_compile
+--
+1.7.0.4
+
diff --git a/meta/recipes-devtools/automake/automake_1.11.2.bb
b/meta/recipes-devtools/automake/automake_1.11.2.bb
index 4534c39..4271336 100644
--- a/meta/recipes-devtools/automake/automake_1.11.2.bb
+++ b/meta/recipes-devtools/automake/automake_1.11.2.bb
@@ -37,9 +37,10 @@ PATHFIXPATCH_virtclass-nativesdk =
SRC_URI += ${PATHFIXPATCH} \
file://prefer-cpio-over-pax-for-ustar-archives.patch \
file://python-libdir.patch \
-file://automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch
+file://automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch \
+file://py-compile-compile-only-optimized-byte-code.patch
-PR = r1
+PR = r2
SRC_URI[md5sum] = 18194e804d415767bae8f703c963d456
SRC_URI[sha256sum] =
4f46d1f9380c8a3506280750f630e9fc915cb1a435b724be56b499d016368718
Merged into OE-core
Thanks
Sau!
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/4] default-distrovars: Add empty weak definition for DISTRO variable
On 02/24/2012 09:05 AM, Khem Raj wrote: On Fri, Feb 24, 2012 at 8:21 AM, Richard Purdie richard.pur...@linuxfoundation.org wrote: On Thu, 2012-02-23 at 19:33 -0800, Khem Raj wrote: Signed-off-by: Khem Rajraj.k...@gmail.com --- meta/conf/distro/include/default-distrovars.inc |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc index 16b3108..dba204e 100644 --- a/meta/conf/distro/include/default-distrovars.inc +++ b/meta/conf/distro/include/default-distrovars.inc @@ -41,6 +41,13 @@ NO32LIBS ??= 1 # Default to emitting logfiles if a build fails. BBINCLUDELOGS ??= yes + +# dummy distro related variables +# they should be overridden by real distros +# these fallbacks only serve the purpose of +# oe-core standalone testability + +DISTRO ??= SDK_VERSION ??= oe-core.0 DISTRO_VERSION ??= oe-core.0 Why do we need this? The commit message tells me what you're doing but not why. I'm really getting frustrated with one line commit messages with no details. I don't think we should need this either, I'm not sure I like the change. The whole idea was OE-Core could run distroless. There is an error case I dont remeber how I obtained that where it prints bogus value if DISTRO is not defined at all but and empty DISTRO var is distroless in essence anyway IMO Khem, Please let us know what the reproducer for this is. Once we have a reproducer we can look into the issue. Sau! Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] util-linux: Fix build when NLS is disabled
On 02/29/2012 11:55 PM, Khem Raj wrote: AC_CHECK_DECLS generated defines should be checked with #if not #ifdef Signed-off-by: Khem Rajraj.k...@gmail.com --- .../fix_NL_TIME_FIRST_WEEKDAY.patch| 24 meta/recipes-core/util-linux/util-linux_2.21.bb|5 ++- 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/util-linux/util-linux-2.21/fix_NL_TIME_FIRST_WEEKDAY.patch diff --git a/meta/recipes-core/util-linux/util-linux-2.21/fix_NL_TIME_FIRST_WEEKDAY.patch b/meta/recipes-core/util-linux/util-linux-2.21/fix_NL_TIME_FIRST_WEEKDAY.patch new file mode 100644 index 000..545c3a9 --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux-2.21/fix_NL_TIME_FIRST_WEEKDAY.patch @@ -0,0 +1,24 @@ +configure uses AC_CHECK_DECLS to check for _NL_TIME_WEEK_1STDAY +which means we will get HAVE_DECL__NL_TIME_WEEK_1STDAY +defined to 1 if symbol is declared, otherwise to 0 in config.h + +Therefore we cannot rely on conditionals which check for it +being defined or not since it always will be defined so correct +thing is to use #if instead of #ifdef + +Signed-off-by: Khem Rajraj.k...@gmail.com + +Upstream-Status: Pending +Index: util-linux-2.21/misc-utils/cal.c +=== +--- util-linux-2.21.orig/misc-utils/cal.c 2012-02-29 23:41:54.413347665 -0800 util-linux-2.21/misc-utils/cal.c 2012-02-29 23:42:44.573350057 -0800 +@@ -297,7 +297,7 @@ + * the locale database, which can be overridden with the + * -s (Sunday) or -m (Monday) options. + */ +-#ifdef HAVE_DECL__NL_TIME_WEEK_1STDAY ++#if HAVE_DECL__NL_TIME_WEEK_1STDAY + /* +* You need to use 2 locale variables to get the first day of the week. +* This is needed to support first_weekday=2 and first_workday=1 for diff --git a/meta/recipes-core/util-linux/util-linux_2.21.bb b/meta/recipes-core/util-linux/util-linux_2.21.bb index aa6ac64..8234ecb 100644 --- a/meta/recipes-core/util-linux/util-linux_2.21.bb +++ b/meta/recipes-core/util-linux/util-linux_2.21.bb @@ -1,5 +1,5 @@ MAJOR_VERSION = 2.21 -PR = r0 +PR = r1 require util-linux.inc # note that `lscpu' is under GPLv3+ @@ -7,7 +7,8 @@ LICENSE_util-linux-lscpu = GPLv3+ SRC_URI += file://util-linux-ng-replace-siginterrupt.patch \ file://util-linux-ng-2.16-mount_lock_path.patch \ -file://uclibc-__progname-conflict.patch \ +file://uclibc-__progname-conflict.patch \ +file://fix_NL_TIME_FIRST_WEEKDAY.patch \ SRC_URI[md5sum] = 3c7a26963f3921c1e775a80330321870 Merged into OE-core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] read only rootfs?
On Mon, Mar 5, 2012 at 3:56 PM, Otavio Salvador ota...@ossystems.com.br wrote: On Mon, Mar 5, 2012 at 17:39, Cliff Brake cliff.br...@gmail.com wrote: What are the best practices for implementing a read-only rootfs built with OE? I've looked at a few things like poky-tiny.conf, but figured I would ask. You could the image feature for it; depending on the image complexity it might just work or need few fixes for some postinsts to work in offline mode. Thanks for the idea -- just for the record, I assume you mean the following: IMAGE_FEATURES read-only-rootfs Looking briefly at what this does, it appears its only a diagnostic feature that tells you if there are postinst processes that need to run? Thanks, Cliff -- = http://bec-systems.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/1] bitbake-prserv-tool adepted to new bitbake cache
On 02/27/2012 07:42 PM, Lianhao Lu wrote: Modified the bitbake-prserv-tool scripts to trigger reparse according to the new content-based bitbake cache mechanism. The following changes since commit 8d4db8e6dcd2d25637cb77515fe776552f2fdd6d: Dongxiao Xu (1): bitbake.conf: Create a new filter variable BB_HASHCONFIG_WHITELIST are available in the git repository at: git://git.yoctoproject.org/poky-contrib llu/prserv-tool http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=llu/prserv-tool Lianhao Lu (1): scripts/prserv-tool: Adepted to new bitbake cache. scripts/bitbake-prserv-tool | 28 +--- 1 files changed, 17 insertions(+), 11 deletions(-) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core Merged into OE-core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] read only rootfs?
On Mon, Mar 5, 2012 at 18:47, Cliff Brake cliff.br...@gmail.com wrote: Looking briefly at what this does, it appears its only a diagnostic feature that tells you if there are postinst processes that need to run? In fact it checks if there're postinsts that *needs* to be run online; if it does not, then it can be run in read-only mode. -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] eglibc-testing: Fix testing script to work well with dash
On 03/02/2012 02:57 PM, Khem Raj wrote: Dash did not like so we do 2 1 /dev/null Signed-off-by: Khem Rajraj.k...@gmail.com --- meta/recipes-core/eglibc/eglibc-testing.inc |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/recipes-core/eglibc/eglibc-testing.inc b/meta/recipes-core/eglibc/eglibc-testing.inc index c30409f..a5ce773 100644 --- a/meta/recipes-core/eglibc/eglibc-testing.inc +++ b/meta/recipes-core/eglibc/eglibc-testing.inc @@ -47,7 +47,7 @@ then echo Please specify the target machine and remote user in form of user@target exit 1; fi -ssh \$target ls \$PWD\ /dev/null +ssh \$target ls \$PWD\ 21 /dev/null if [ x\$? != x0 ] then echo Failed connecting to \$target it could be because of: Merged into OE-core Thanks Sau! ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [Oe-core][PATCH 3/3] archiver_configure.bbclass: configure the content for archiving package
On 03/03/2012 02:54 AM, Xiaofeng Yan wrote:
From: Xiaofeng Yanxiaofeng@windriver.com
This is configuration file to point to what content a archive package
should include in the different stage of task by pointing to different variable
and
stage.
Xiaogeng,
You are on the right path with this one, but what was originally talked
about was having multiple archiver bbclasses that did the configuration
and set when the archive would take place.
Than one could just inherit the bbclass that matches their needs, so
there should be a bbclass that's equivalent to the current copyleft
bbclass. And as we defined in earlier emails the 3-4 archives, we should
have matching bbclasses for those.
1) Original Source Patches w/ Series file other files
2) Patched Configured Source temp dir
3) Copyleft Equivlant (so we can remove that class also)
Sau!
[YOCTO #1977]
Signed-off-by: Xiaofeng Yanxiaofeng@windriver.com
Signed-off-by: Xiaofeng Yanxiaofeng@windriver.com
---
meta/classes/archiver_configure.bbclass | 35 +++
1 files changed, 35 insertions(+), 0 deletions(-)
create mode 100644 meta/classes/archiver_configure.bbclass
diff --git a/meta/classes/archiver_configure.bbclass
b/meta/classes/archiver_configure.bbclass
new file mode 100644
index 000..c9892d3
--- /dev/null
+++ b/meta/classes/archiver_configure.bbclass
@@ -0,0 +1,35 @@
+# This file is for getting tarball in different stage for sources, patches,
and logs by configuring
+# the following variable and tasks
+
+inherit archiver
+
+# SOURCE_ARCHIVE_PACKAGE_TYPE = {'tar','srpm'}
+SOURCE_ARCHIVE_PACKAGE_TYPE = 'tar'
+
+# SOURCE_ARCHIVE_LOG_WITH_SCRIPTS = {'logs_with_scripts', 'logs'}
+# String 'logs_with_scripts' include temp directory and .bb and .inc file
+# String 'logs' only include temp
+SOURCE_ARCHIVE_LOG_WITH_SCRIPTS = 'logs_with_scripts'
+
+# PATCHES_ARCHIVE_WITH_SERIES = {'true', 'false'}
+# Strings 'true' means that patches including series files(series +
non-applying)
+# String 'false' means that no series and only archive applying patches
+PATCHES_ARCHIVE_WITH_SERIES = 'true'
+
+# Archive packages for copy-left
+#COPYLEFT_COMPLIANCE = 'true'
+
+# Open this item when you want to get original sources tarball with patches
+do_unpack[postfuncs] += do_archive_original_sources_patches
+
+# Open this item when you want to get tarball for patched sources including
patches
+#do_patch[postfuncs] += do_archive_patched_sources
+
+# Open this item when you want to get tarball for configured sources including
patches
+#do_configure[postfuncs] += do_archive_configured_sources
+
+# Open this item when you want to get tarball for logs tarball
+do_package_write_rpm[prefuncs] += do_archive_scripts_logs
+
+# Get dump date and create diff file
+do_package_write_rpm[postfuncs] += do_dumpdata_create_diff_gz
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/3] Realize archiver.bbclass
On 03/03/2012 02:53 AM, Xiaofeng Yan wrote: From: Xiaofeng Yanxiaofeng@windriver.com archiver.bbclass is for archiving sources , patches and logs including .bb and .inc files by configuring archiver_configure.bbclass which control what a archiving package should include. For archiving a source rpm package, I add some functions to package_rpm.bbclass. I also merge source_pkg.bbclass to archiver.bbclass due to their similar functions. Are you going to deprecate/remove the other classes sourcepkg.bbclass, src_distribute.bbclass, src_distribute_local.bbclass and copyleft_compliance.bbclass I am still reviewing this and would like to get ACKs from Chris and Mark. This is going to require some review and testing. I also sent and email about the archiver_configure class. Can you please let us know how you tested, this is an important change and we would like to get it close to correct the first time through. Thanks for your effort on this. Sau! Pull URL: git://git.pokylinux.org/poky-contrib.git Branch: xiaofeng/1977 Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/1977 Thanks, Xiaofeng Yanxiaofeng@windriver.com --- Xiaofeng Yan (3): package_rpm.bbclass: Add srpm function archiver.bbclass: archive sources, patches,logs to tarball archiver_configure.bbclass: configure the content for archiving package meta/classes/archiver.bbclass | 393 +++ meta/classes/archiver_configure.bbclass | 35 +++ meta/classes/package_rpm.bbclass| 54 - 3 files changed, 479 insertions(+), 3 deletions(-) create mode 100644 meta/classes/archiver.bbclass create mode 100644 meta/classes/archiver_configure.bbclass ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] psplash: Add mising commands module import.
Python commands module is used in the recipe, but never imported.
This leads to build errors like:
NameError: global name 'commands' is not defined
ERROR: The stack trace of python calls that resulted in this exception/failure
was:
ERROR: File do_compile, line 24, in module
ERROR:
ERROR: File do_compile, line 11, in do_compile
ERROR:
ERROR: The code that was being executed was:
ERROR: 0020:bb.build.exec_func(oe_runmake, d)
ERROR: 0021:shutil.copyfile(psplash, outputfile)
ERROR: 0022:
ERROR: 0023:
ERROR: *** 0024:do_compile(d)
ERROR: 0025:
ERROR: (file: 'do_compile', lineno: 24, function: module)
ERROR: 0007:localfiles = d.getVar('SPLASH_LOCALPATHS', True).split()
ERROR: 0008:outputfiles = d.getVar('SPLASH_INSTALL', True).split()
ERROR: 0009:for localfile, outputfile in zip(localfiles, outputfiles):
ERROR: 0010:if localfile.endswith(.png):
ERROR: *** 0011:outp =
commands.getstatusoutput('./make-image-header.sh %s POKY' % localfile)
ERROR: 0012:print(outp[1])
ERROR: 0013:fbase =
os.path.splitext(os.path.basename(localfile))[0]
ERROR: 0014:shutil.copyfile(%s-img.h % fbase, destfile)
ERROR: 0015:else:
Signed-off-by: Peter Tworek tworaz...@gmail.com
---
meta/recipes-core/psplash/psplash_git.bb |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/psplash/psplash_git.bb
b/meta/recipes-core/psplash/psplash_git.bb
index 42ea615..bd405f9 100644
--- a/meta/recipes-core/psplash/psplash_git.bb
+++ b/meta/recipes-core/psplash/psplash_git.bb
@@ -68,7 +68,7 @@ S = ${WORKDIR}/git
inherit autotools pkgconfig update-rc.d
python do_compile () {
-import shutil
+import shutil, commands
# Build a separate executable for each splash image
destfile = %s/psplash-poky-img.h % d.getVar('S', True)
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gcc: Upgrade to 4.6.3 release
On 03/04/2012 10:21 PM, Khem Raj wrote:
core-image-sato/core-image-minimal builds and boots
on all qemu machines
Signed-off-by: Khem Rajraj.k...@gmail.com
---
meta/recipes-devtools/gcc/gcc-4.6.inc |9 +-
.../GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch | 32 +++---
.../gcc/gcc-4.6/gcc-flags-for-build.patch | 97 +++-
.../gcc-4.6/gcc-poison-system-directories.patch| 80
.../gcc/gcc-4.6/gcc-with-linker-hash-style.patch | 36
.../gcc/gcc-4.6/volatile_access_backport.patch | 28 --
6 files changed, 131 insertions(+), 151 deletions(-)
delete mode 100644
meta/recipes-devtools/gcc/gcc-4.6/volatile_access_backport.patch
Khem,
We are moving into stabilization phase with oe-core with the pending
2012-01 version. I am going to pull this locally to MUT and start
testing it, if I get good results, we will get it into master now, but
if we see issues, it will likely get held for master-next and most 2012-01.
Sau!
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc
b/meta/recipes-devtools/gcc/gcc-4.6.inc
index edc2a58..99c30a6 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.inc
@@ -1,6 +1,6 @@
require gcc-common.inc
-PR = r22
+PR = r23
# Third digit in PV should be incremented after a minor release
# happens from this branch on gcc e.g. currently its 4.6.0
@@ -8,7 +8,7 @@ PR = r22
# on branch then PV should be incremented to 4.6.1+svnr${SRCPV}
# to reflect that change
-PV = 4.6.2+svnr${SRCPV}
+PV = 4.6.3+svnr${SRCPV}
# BINV should be incremented after updating to a revision
# after a minor gcc release (e.g. 4.6.1 or 4.6.2) has been made
@@ -16,9 +16,9 @@ PV = 4.6.2+svnr${SRCPV}
# 4.6.1 then the value below will have 2 which will mean 4.6.2
# which will be next minor release and so on.
-BINV = 4.6.3
+BINV = 4.6.4
-SRCREV = 181430
+SRCREV = 184847
BRANCH = gcc-4_6-branch
FILESPATH = ${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.6' ], d)}
@@ -63,7 +63,6 @@ SRC_URI =
svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \
file://optional_libstdc.patch \
file://disable_relax_pic_calls_flag.patch \
file://COLLECT_GCC_OPTIONS.patch \
- file://volatile_access_backport.patch \
file://use-defaults.h-and-t-oe-in-B.patch \
file://powerpc-e5500.patch \
file://fix-for-ice-50099.patch \
diff --git
a/meta/recipes-devtools/gcc/gcc-4.6/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch
b/meta/recipes-devtools/gcc/gcc-4.6/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch
index 6ccbeea..575e0e4 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.6/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch
@@ -58,8 +58,8 @@ from the sysroot, one of the paths *does* need to be
relocated in this way.
===
Index: gcc-4_6-branch/gcc/Makefile.in
===
gcc-4_6-branch.orig/gcc/Makefile.in2011-12-13 22:52:15.0
-0800
-+++ gcc-4_6-branch/gcc/Makefile.in 2011-12-13 22:52:21.933635767 -0800
+--- gcc-4_6-branch.orig/gcc/Makefile.in2012-03-04 09:33:36.0
-0800
gcc-4_6-branch/gcc/Makefile.in 2012-03-04 09:41:06.858672113 -0800
@@ -587,6 +587,7 @@
build_tooldir = $(exec_prefix)/$(target_noncanonical)
# Directory in which the compiler finds target-independent g++ includes.
@@ -78,8 +78,8 @@ Index: gcc-4_6-branch/gcc/Makefile.in
-DLOCAL_INCLUDE_DIR=\$(local_includedir)\ \
Index: gcc-4_6-branch/gcc/configure.ac
===
gcc-4_6-branch.orig/gcc/configure.ac 2011-12-13 22:52:15.0
-0800
-+++ gcc-4_6-branch/gcc/configure.ac2011-12-13 22:52:21.937635526 -0800
+--- gcc-4_6-branch.orig/gcc/configure.ac 2012-03-04 09:33:36.0
-0800
gcc-4_6-branch/gcc/configure.ac2012-03-04 09:41:06.862671939 -0800
@@ -144,6 +144,15 @@
fi
fi
@@ -96,7 +96,7 @@ Index: gcc-4_6-branch/gcc/configure.ac
AC_ARG_WITH(cpp_install_dir,
[ --with-cpp-install-dir=DIR
install the user visible C preprocessor in DIR
-@@ -4737,6 +4746,7 @@
+@@ -4727,6 +4736,7 @@
AC_SUBST(float_h_file)
AC_SUBST(gcc_config_arguments)
AC_SUBST(gcc_gxx_include_dir)
@@ -106,8 +106,8 @@ Index: gcc-4_6-branch/gcc/configure.ac
AC_SUBST(host_xm_include_list)
Index: gcc-4_6-branch/gcc/cppdefault.c
===
gcc-4_6-branch.orig/gcc/cppdefault.c 2011-12-13 22:51:28.0
-0800
-+++ gcc-4_6-branch/gcc/cppdefault.c2011-12-13 22:52:21.937635526 -0800
+--- gcc-4_6-branch.orig/gcc/cppdefault.c 2012-03-03 01:03:17.0
-0800
gcc-4_6-branch/gcc/cppdefault.c2012-03-04 09:41:06.862671939 -0800
@@ -48,15
Re: [OE-core] [PATCH] psplash: Add mising commands module import.
On Monday 05 March 2012 23:31:34 Peter Tworek wrote:
Python commands module is used in the recipe, but never imported.
This leads to build errors like:
NameError: global name 'commands' is not defined
ERROR: The stack trace of python calls that resulted in this
exception/failure was: ERROR: File do_compile, line 24, in module
ERROR:
ERROR: File do_compile, line 11, in do_compile
ERROR:
ERROR: The code that was being executed was:
ERROR: 0020:bb.build.exec_func(oe_runmake, d)
ERROR: 0021:shutil.copyfile(psplash, outputfile)
ERROR: 0022:
ERROR: 0023:
ERROR: *** 0024:do_compile(d)
ERROR: 0025:
ERROR: (file: 'do_compile', lineno: 24, function: module)
ERROR: 0007:localfiles = d.getVar('SPLASH_LOCALPATHS',
True).split() ERROR: 0008:outputfiles = d.getVar('SPLASH_INSTALL',
True).split() ERROR: 0009:for localfile, outputfile in
zip(localfiles, outputfiles): ERROR: 0010:if
localfile.endswith(.png):
ERROR: *** 0011:outp =
commands.getstatusoutput('./make-image-header.sh %s POKY' % localfile)
ERROR: 0012:print(outp[1])
ERROR: 0013:fbase =
os.path.splitext(os.path.basename(localfile))[0] ERROR: 0014:
shutil.copyfile(%s-img.h % fbase, destfile) ERROR: 0015:
else:
Signed-off-by: Peter Tworek tworaz...@gmail.com
---
meta/recipes-core/psplash/psplash_git.bb |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/psplash/psplash_git.bb
b/meta/recipes-core/psplash/psplash_git.bb index 42ea615..bd405f9 100644
--- a/meta/recipes-core/psplash/psplash_git.bb
+++ b/meta/recipes-core/psplash/psplash_git.bb
@@ -68,7 +68,7 @@ S = ${WORKDIR}/git
inherit autotools pkgconfig update-rc.d
python do_compile () {
-import shutil
+import shutil, commands
# Build a separate executable for each splash image
destfile = %s/psplash-poky-img.h % d.getVar('S', True)
Acked-by: Paul Eggleton paul.eggle...@linux.intel.com
--
Paul Eggleton
Intel Open Source Technology Centre
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gcc: Upgrade to 4.6.3 release
On Mon, Mar 5, 2012 at 2:36 PM, Saul Wold s...@linux.intel.com wrote: Khem, We are moving into stabilization phase with oe-core with the pending 2012-01 version. I am going to pull this locally to MUT and start testing it, if I get good results, we will get it into master now, but if we see issues, it will likely get held for master-next and most 2012-01. yes. let me know if there are any issues. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/4] default-distrovars: Add empty weak definition for DISTRO variable
On Mon, Mar 5, 2012 at 1:36 PM, Saul Wold s...@linux.intel.com wrote: On 02/24/2012 09:05 AM, Khem Raj wrote: On Fri, Feb 24, 2012 at 8:21 AM, Richard Purdie richard.pur...@linuxfoundation.org wrote: On Thu, 2012-02-23 at 19:33 -0800, Khem Raj wrote: Signed-off-by: Khem Rajraj.k...@gmail.com --- meta/conf/distro/include/default-distrovars.inc | 7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc index 16b3108..dba204e 100644 --- a/meta/conf/distro/include/default-distrovars.inc +++ b/meta/conf/distro/include/default-distrovars.inc @@ -41,6 +41,13 @@ NO32LIBS ??= 1 # Default to emitting logfiles if a build fails. BBINCLUDELOGS ??= yes + +# dummy distro related variables +# they should be overridden by real distros +# these fallbacks only serve the purpose of +# oe-core standalone testability + +DISTRO ??= SDK_VERSION ??= oe-core.0 DISTRO_VERSION ??= oe-core.0 Why do we need this? The commit message tells me what you're doing but not why. I'm really getting frustrated with one line commit messages with no details. I don't think we should need this either, I'm not sure I like the change. The whole idea was OE-Core could run distroless. There is an error case I dont remeber how I obtained that where it prints bogus value if DISTRO is not defined at all but and empty DISTRO var is distroless in essence anyway IMO Khem, Please let us know what the reproducer for this is. Once we have a reproducer we can look into the issue. yeah. Sau! Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] multilib build failure with shadow-sysroot:do_populate_sysroot_setscene
On 03/02/2012 11:31 PM, Richard Purdie wrote:
On Fri, 2012-03-02 at 14:33 +0800, Zhai, Edwin wrote:
RP,
I have image-sato multilib build failure with following error:
ERROR: Task do_package_setscene depends upon nonexistant task
/distro/edwin-working/poky/meta/recipes-extended/shadow/shadow-sysroot_4.1.4.3.bb:do_populate_sysroot_setscene
Summary: There was 1 ERROR message shown, returning a non-zero exit code.
After removing shadow-sysroot:do_populate_sysroot_setscene from
USERADDSETSCENEDEPS in meta/classes/useradd.bbclass, I can pass the build.
Why does it become nonexistant task in multilib building? Any possible fix for
it?
Totally guessing but does replacing:
shadow-sysroot:do_populate_sysroot_setscene
with:
${MLPREFIX}shadow-sysroot:do_populate_sysroot_setscene
work better?
RP,
It works. I'll send out this patch after test.
BTW, shouldn't it be extended automatically?
Thanks,
Edwin
Cheers,
Richard
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] mtd-utils: clean up old files
-Original Message- From: Saul Wold [mailto:s...@linux.intel.com] Sent: Tuesday, 6 March 2012 5:24 AM To: Patches and discussions about the oe-core layer Cc: James Limbouris Subject: Re: [OE-core] [PATCH] mtd-utils: clean up old files On 02/27/2012 10:25 PM, James Limbouris wrote: Signed-off-by: James Limbourisja...@digitalmatter.com.au --- .../add-exclusion-to-mkfs-jffs2-git-2.patch| 103 --- .../add-exclusion-to-mkfs-jffs2-git.patch | 136 .../mtd/mtd-utils/fix-ignoreerrors-git.patch | 28 .../mtd/mtd-utils/remove-ubi.patch | 35 - meta/recipes-devtools/mtd/mtd-utils_1.1.0+git.bb | 28 5 files changed, 0 insertions(+), 330 deletions(-) delete mode 100644 meta/recipes-devtools/mtd/mtd-utils-1.4.9/mtd- utils-1.4.1/add-exclusion-to-mkfs-jffs2-git-2.patch delete mode 100644 meta/recipes-devtools/mtd/mtd-utils/add- exclusion-to-mkfs-jffs2-git.patch delete mode 100644 meta/recipes-devtools/mtd/mtd-utils/fix- ignoreerrors-git.patch delete mode 100644 meta/recipes-devtools/mtd/mtd-utils/remove- ubi.patch delete mode 100644 meta/recipes-devtools/mtd/mtd-utils_1.1.0+git.bb Sorry for the delay on this one, not sure why you are removing the git version of the recipe? If anything you could move it forward to the latetest git version and clean up the patches as needed. Thanks Sau! Hi Saul, It seems they are both git recipes, only the 1.4.1 recipe is missing dependencies, has no LIC_FILES_CHKSUM, and has a different license tag. It looks to me like it hasn't built for some time... There is also a bogus folder full of 1.4.1 patches in the 1.4.9 patches folder. I think things got mixed up during the recipe reorganisation, a parallel version of mtd-utils was subsequently added, and the original has rotted. Regards, James ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gdk-pixbuf: Pick up ${NM} from the environment.
On (02/03/12 08:12), James Limbouris wrote:
-Original Message-
From: openembedded-core-boun...@lists.openembedded.org
[mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf
Of Khem Raj
Sent: Friday, 2 March 2012 3:56 PM
To: Patches and discussions about the oe-core layer
Subject: Re: [OE-core] [PATCH] gdk-pixbuf: Pick up ${NM} from the
environment.
It is more than set in the environment - the configure script spits out
two
messages about it before hitting this macro.
So, I think the check is entirely extraneous.
if you can point that there is another check which makes this one
redundant thats a different issue and then your patch is ok. but I doubt
thats the case
I have seen this issue patched out in other gnome packages, some in oe-
core.
At least one was marked Upstream-Status: Inappropriate [configuration],
and one marked Pending.
So I got the idea that upstream was not interested...
usually such patches are taken status may be too conservative
Here is the fragment from the configure script, with the patch applied.
Sorry, it's quite long:
{ $as_echo $as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible
name lister (nm) 5
$as_echo_n checking for BSD- or MS-compatible name lister (nm)... 6; }
if ${lt_cv_path_NM+:} false; then :
$as_echo_n (cached) 6
else
if test -n $NM; then
# Let the user override the test.
lt_cv_path_NM=$NM
else
lt_nm_to_check=${ac_tool_prefix}nm
if test -n $ac_tool_prefix test $build = $host; then
lt_nm_to_check=$lt_nm_to_check nm
fi
for lt_tmp_nm in $lt_nm_to_check; do
lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
IFS=$lt_save_ifs
test -z $ac_dir ac_dir=.
tmp_nm=$ac_dir/$lt_tmp_nm
if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
# Check to see if the nm accepts a BSD-compat flag.
# Adding the `sed 1q' prevents false positives on HP-UX, which says:
# nm: unknown option B ignored
# Tru64's nm complains that /dev/null is an invalid object file
case `$tmp_nm -B /dev/null 21 | sed '1q'` in
*/dev/null* | *'Invalid file or object type'*)
lt_cv_path_NM=$tmp_nm -B
break
;;
*)
case `$tmp_nm -p /dev/null 21 | sed '1q'` in
*/dev/null*)
lt_cv_path_NM=$tmp_nm -p
break
;;
*)
lt_cv_path_NM=${lt_cv_path_NM=$tmp_nm} # keep the first match, but
continue # so that we can try to find one that supports BSD flags
;;
esac
;;
esac
fi
done
IFS=$lt_save_ifs
done
: ${lt_cv_path_NM=no}
fi
fi
{ $as_echo $as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM 5
$as_echo $lt_cv_path_NM 6; }
if test $lt_cv_path_NM != no; then
NM=$lt_cv_path_NM
else
# Didn't find any BSD compatible name lister, look for dumpbin.
if test -n $DUMPBIN; then :
# Let the user override the test.
else
if test -n $ac_tool_prefix; then
for ac_prog in dumpbin link -dump
do
# Extract the first word of $ac_tool_prefix$ac_prog, so it can be a
program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo $as_me:${as_lineno-$LINENO}: checking for $ac_word 5
$as_echo_n checking for $ac_word... 6; }
if ${ac_cv_prog_DUMPBIN+:} false; then :
$as_echo_n (cached) 6
else
if test -n $DUMPBIN; then
ac_cv_prog_DUMPBIN=$DUMPBIN # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z $as_dir as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f $as_dir/$ac_word$ac_exec_ext $as_test_x
$as_dir/$ac_word$ac_exec_ext; }; then
ac_cv_prog_DUMPBIN=$ac_tool_prefix$ac_prog
$as_echo $as_me:${as_lineno-$LINENO}: found
$as_dir/$ac_word$ac_exec_ext 5
break 2
fi
done
done
IFS=$as_save_IFS
I believe this code is generated by libtool, in ./m4/libtool.m4.
I have _no_ idea how libtool works, or fits in with autotools, so I'm not too
sure whether AC_CHECK_TOOLS makes sense here or not.
I'm happy to resubmit and/or file a bugzilla report with Gnome.
Please resubmit
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] gdk-pixbuf: Pick up ${NM} from the environment.
Signed-off-by: James Limbouris ja...@digitalmatter.com.au
---
.../gdk-pixbuf-2.24.0/configure_nm.patch | 18 ++
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb |3 ++-
2 files changed, 20 insertions(+), 1 deletions(-)
create mode 100644
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure_nm.patch
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure_nm.patch
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure_nm.patch
new file mode 100644
index 000..0460824
--- /dev/null
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.24.0/configure_nm.patch
@@ -0,0 +1,18 @@
+Pick up ${NM} from the environment.
+Upstream-Status: Inappropriate [configuration]
+Signed-off-by: James Limbouris ja...@digitalmatter.com.au
+
+Index: gdk-pixbuf-2.24.0/configure.ac
+===
+diff -uNr gdk-pixbuf-2.24.0/configure.ac gdk-pixbuf-2.24.0.mod/configure.ac
+--- gdk-pixbuf-2.24.0/configure.ac 2011-08-27 11:27:52.0 +0800
gdk-pixbuf-2.24.0.mod/configure.ac 2012-02-28 14:48:36.481126410 +0800
+@@ -147,7 +147,7 @@
+ AC_SYS_LARGEFILE
+
+ AM_PROG_AS
+-AC_PATH_PROG(NM, nm, nm)
++AC_CHECK_TOOLS(NM, [$NM nm], nm)
+
+ AC_MSG_CHECKING([for some Win32 platform])
+ AS_CASE([$host],
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
index 121babd..d75bf2a 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.0.bb
@@ -11,6 +11,7 @@ SECTION = libs
DEPENDS = libpng glib-2.0 jpeg
SRC_URI =
http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${PV}.tar.bz2
\
+ file://configure_nm.patch \
file://hardcoded_libtool.patch \
file://configure_fix.patch \
@@ -18,7 +19,7 @@ SRC_URI =
http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${
SRC_URI[md5sum] = d8ece3a4ade4a91c768328620e473ab8
SRC_URI[sha256sum] =
38d2630314e6d91976bffd833236f84fefa440a9038f86dc422820a39f2e3700
-PR = r4
+PR = r5
inherit autotools pkgconfig gettext
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/4] self-hosted: Fix multiple libx11 error
From: Zhai Edwin edwin.z...@intel.com
Self-hosted needs package libx11-dev, which is ambiguous as virtual/libx11 is
provided by libx11 or libx11-trim. This patch explictly set the perferred one,
libx11-trim-dev, to avoid this.
Signed-off-by: Zhai Edwin edwin.z...@intel.com
---
meta/recipes-core/tasks/task-self-hosted.bb |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/tasks/task-self-hosted.bb
b/meta/recipes-core/tasks/task-self-hosted.bb
index 586a461..a6cf75f 100644
--- a/meta/recipes-core/tasks/task-self-hosted.bb
+++ b/meta/recipes-core/tasks/task-self-hosted.bb
@@ -3,7 +3,7 @@
#
DESCRIPTION = Create Basic Image Tasks
-PR = r6
+PR = r7
LICENSE = MIT
LIC_FILES_CHKSUM =
file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420
@@ -189,6 +189,6 @@ RDEPENDS_task-self-hosted-graphics = \
libglu-dev \
libsdl \
libsdl-dev \
-libx11-dev \
+libx11-trim-dev \
python-pygtk \
--
1.7.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/4] Fixes for multilib and VTE, Mar 6, 2012
From: Zhai Edwin edwin.z...@intel.com RP, 2 fixes for multilib. 1 for VTE, which just revert a simple commit after last VTE upgrade. Although doesn't hit the root cause, it fix the end user experience issue and is more light-weight than reverting whole VTE upgrade. We can revisit it for root cause in future. Thanks, edwin The following changes since commit a8dc76ee69cfe1ffe846c07a510e3a562a5b1a7f: base.bbclass: Fix PACKAGECONFIG handling when no flags are set (2012-03-05 13:04:11 -0800) are available in the git repository at: git://git.pokylinux.org/poky-contrib gzhai/master2 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/master2 Dongxiao Xu (1): multilib: extend all recipes in multilib.conf Zhai Edwin (3): vte: fix scroll issue self-hosted: Fix multiple libx11 error shadow-sysroot: Fix for multilib meta/classes/useradd.bbclass |2 +- meta/conf/multilib.conf | 313 -- meta/recipes-core/tasks/task-self-hosted.bb |4 +- meta/recipes-support/vte/vte.inc |3 +- meta/recipes-support/vte/vte/scrollbar_fix.patch | 122 + 5 files changed, 424 insertions(+), 20 deletions(-) create mode 100644 meta/recipes-support/vte/vte/scrollbar_fix.patch ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] shadow-sysroot: Fix for multilib
From: Zhai Edwin edwin.z...@intel.com
Fix following error in multilib build:
ERROR: Task do_package_setscene depends upon nonexistant task
poky/meta/recipes-extended/shadow/shadow-sysroot_4.1.4.3.bb:do_populate_sysroot_setscene
From richard.pur...@linuxfoundation.org
Signed-off-by: Zhai Edwin edwin.z...@intel.com
---
meta/classes/useradd.bbclass |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index db874bc..7981a68 100644
--- a/meta/classes/useradd.bbclass
+++ b/meta/classes/useradd.bbclass
@@ -114,7 +114,7 @@ SYSROOTPOSTFUNC_virtclass-cross =
SYSROOTPOSTFUNC_virtclass-native =
SYSROOTPOSTFUNC_virtclass-nativesdk =
-USERADDSETSCENEDEPS = base-passwd:do_populate_sysroot_setscene
shadow-native:do_populate_sysroot_setscene
shadow-sysroot:do_populate_sysroot_setscene
+USERADDSETSCENEDEPS = base-passwd:do_populate_sysroot_setscene
shadow-native:do_populate_sysroot_setscene
${MLPREFIX}shadow-sysroot:do_populate_sysroot_setscene
USERADDSETSCENEDEPS_virtclass-cross =
USERADDSETSCENEDEPS_virtclass-native =
USERADDSETSCENEDEPS_virtclass-nativesdk =
--
1.7.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] vte: fix scroll issue
From: Zhai Edwin edwin.z...@intel.com
On qemu x86-64, scrollbar in vte got broken with one commit to change the way
of emiting changed signal. This patch revert it as work around.
[YOCTO #1906] got fixed.
Signed-off-by: Zhai Edwin edwin.z...@intel.com
---
meta/recipes-support/vte/vte.inc |3 +-
meta/recipes-support/vte/vte/scrollbar_fix.patch | 122 ++
2 files changed, 124 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-support/vte/vte/scrollbar_fix.patch
diff --git a/meta/recipes-support/vte/vte.inc b/meta/recipes-support/vte/vte.inc
index 7971673..5e05608 100644
--- a/meta/recipes-support/vte/vte.inc
+++ b/meta/recipes-support/vte/vte.inc
@@ -6,7 +6,8 @@ RDEPENDS_libvte = vte-termcap
inherit gnome
-SRC_URI += file://introspection.patch
+SRC_URI += file://introspection.patch\
+file://scrollbar_fix.patch
EXTRA_OECONF = --disable-gtk-doc --disable-python --disable-introspection
diff --git a/meta/recipes-support/vte/vte/scrollbar_fix.patch
b/meta/recipes-support/vte/vte/scrollbar_fix.patch
new file mode 100644
index 000..707377a
--- /dev/null
+++ b/meta/recipes-support/vte/vte/scrollbar_fix.patch
@@ -0,0 +1,122 @@
+On qemu x86-64, matchbox-terminal has broken scrollbar, because of following
+commit in vte. This patch revert it as work around.
+
+Signed-off-by: Zhai Edwin edwin.z...@intel.com
+
+Upstream-Status: Inappropriate [workaround]
+
+commit 6eadb8494797e44910b86b5e101823cf527c04e1
+Author: Kristian Høgsberg k...@bitplanet.net
+Date: Thu Jul 15 09:07:51 2010 -0400
+
+Use accessors for setting adjustment
+
+We use g_object_freeze_notify() to emit the same amount of ::changed
+signals.
+
+Index: vte-0.28.2/src/vte.c
+===
+--- vte-0.28.2.orig/src/vte.c 2011-08-29 05:31:45.0 +0800
vte-0.28.2/src/vte.c 2012-02-21 11:03:22.0 +0800
+@@ -2018,15 +2018,13 @@
+ glong v;
+ gdouble current;
+
+- g_object_freeze_notify (G_OBJECT (terminal-adjustment));
+-
+ v = _vte_ring_delta (screen-row_data);
+ current = gtk_adjustment_get_lower(terminal-adjustment);
+ if (current != v) {
+ _vte_debug_print(VTE_DEBUG_ADJ,
+ Changing lower bound from %.0f to
%ld\n,
+current, v);
+- gtk_adjustment_set_lower(terminal-adjustment, v);
++ terminal-adjustment-lower = v;
+ changed = TRUE;
+ }
+
+@@ -2039,19 +2037,19 @@
+ _vte_debug_print(VTE_DEBUG_ADJ,
+ Changing upper bound from %.0f to
%ld\n,
+current, v);
+- gtk_adjustment_set_upper(terminal-adjustment, v);
++ terminal-adjustment-upper = v;
+ changed = TRUE;
+ }
+
+- g_object_thaw_notify (G_OBJECT (terminal-adjustment));
+-
+- if (changed)
++ if (changed) {
+ _vte_debug_print(VTE_DEBUG_SIGNALS,
+ Emitting adjustment_changed.\n);
++ gtk_adjustment_changed(terminal-adjustment);
++ }
+ terminal-pvt-adjustment_changed_pending = FALSE;
+ }
+ if (terminal-pvt-adjustment_value_changed_pending) {
+- glong v, delta;
++ glong v;
+ _vte_debug_print(VTE_DEBUG_SIGNALS,
+ Emitting adjustment_value_changed.\n);
+ terminal-pvt-adjustment_value_changed_pending = FALSE;
+@@ -2062,9 +2060,9 @@
+* via the adjustment - e.g. user interaction with the
+* scrollbar
+*/
+- delta = terminal-pvt-screen-scroll_delta;
++ terminal-adjustment-value =
terminal-pvt-screen-scroll_delta;
+ terminal-pvt-screen-scroll_delta = v;
+- gtk_adjustment_set_value(terminal-adjustment, delta);
++ gtk_adjustment_value_changed(terminal-adjustment);
+ }
+ }
+ }
+@@ -2141,15 +2139,13 @@
+
+ _vte_terminal_adjust_adjustments(terminal);
+
+-g_object_freeze_notify(G_OBJECT(terminal-adjustment));
+-
+ /* The step increment should always be one. */
+ v = gtk_adjustment_get_step_increment(terminal-adjustment);
+ if (v != 1) {
+ _vte_debug_print(VTE_DEBUG_ADJ,
+ Changing step increment from %.0lf to %ld\n,
+ v, terminal-row_count);
+- gtk_adjustment_set_step_increment(terminal-adjustment, 1);
++ terminal-adjustment-step_increment = 1;
+
[OE-core] [PATCH 3/4] multilib: extend all recipes in multilib.conf
From: Dongxiao Xu dongxiao...@intel.com
Signed-off-by: Dongxiao Xu dongxiao...@intel.com
Signed-off-by: Zhai Edwin edwin.z...@intel.com
---
meta/conf/multilib.conf | 313 ---
1 files changed, 297 insertions(+), 16 deletions(-)
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index d366fd3..3b47c48 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -11,23 +11,37 @@ STAGING_DIR_TARGET = ${STAGING_DIR}/${MLPREFIX}${MACHINE}
INHERIT += multilib_global
+BBCLASSEXTEND_append_pn-abiword-embedded = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-abiword = ${MULTILIBS}
BBCLASSEXTEND_append_pn-acl = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-acpid = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-adt-installer = ${MULTILIBS}
BBCLASSEXTEND_append_pn-alsa-lib = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-alsa-state = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-alsa-tools = ${MULTILIBS}
BBCLASSEXTEND_append_pn-alsa-utils = ${MULTILIBS}
BBCLASSEXTEND_append_pn-apmd = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-apr = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-apr-util = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-apt = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-aspell = ${MULTILIBS}
BBCLASSEXTEND_append_pn-atk = ${MULTILIBS}
BBCLASSEXTEND_append_pn-at = ${MULTILIBS}
BBCLASSEXTEND_append_pn-attr = ${MULTILIBS}
BBCLASSEXTEND_append_pn-augeas = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-autoconf = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-automake = ${MULTILIBS}
BBCLASSEXTEND_append_pn-avahi = ${MULTILIBS}
BBCLASSEXTEND_append_pn-avahi-ui = ${MULTILIBS}
BBCLASSEXTEND_append_pn-base-files = ${MULTILIBS}
BBCLASSEXTEND_append_pn-base-passwd = ${MULTILIBS}
BBCLASSEXTEND_append_pn-bash = ${MULTILIBS}
BBCLASSEXTEND_append_pn-bc = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-beagleboard-audio = ${MULTILIBS}
BBCLASSEXTEND_append_pn-beecrypt = ${MULTILIBS}
BBCLASSEXTEND_append_pn-bigreqsproto = ${MULTILIBS}
BBCLASSEXTEND_append_pn-bind = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-binutils-cross-canadian = ${MULTILIBS}
BBCLASSEXTEND_append_pn-binutils-cross = ${MULTILIBS}
BBCLASSEXTEND_append_pn-binutils = ${MULTILIBS}
BBCLASSEXTEND_append_pn-bison = ${MULTILIBS}
@@ -36,32 +50,60 @@ BBCLASSEXTEND_append_pn-blktrace = ${MULTILIBS}
BBCLASSEXTEND_append_pn-bluez4 = ${MULTILIBS}
BBCLASSEXTEND_append_pn-bluez-hcidump = ${MULTILIBS}
BBCLASSEXTEND_append_pn-boost = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-btrfs-tools = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-builder = ${MULTILIBS}
BBCLASSEXTEND_append_pn-busybox = ${MULTILIBS}
BBCLASSEXTEND_append_pn-byacc = ${MULTILIBS}
BBCLASSEXTEND_append_pn-bzip2 = ${MULTILIBS}
BBCLASSEXTEND_append_pn-cairo = ${MULTILIBS}
BBCLASSEXTEND_append_pn-calibrateproto = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-ccache = ${MULTILIBS}
BBCLASSEXTEND_append_pn-chkconfig = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-chrpath = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-claws-mail = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-claws-plugin-gtkhtml2-viewer = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-claws-plugin-maildir = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-claws-plugin-mailmbox = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-claws-plugin-rssyl = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-clipboard-manager = ${MULTILIBS}
BBCLASSEXTEND_append_pn-clutter-1.8 = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-clutter-box2d = ${MULTILIBS}
BBCLASSEXTEND_append_pn-clutter-gst-1.8 = ${MULTILIBS}
BBCLASSEXTEND_append_pn-clutter-gtk-1.8 = ${MULTILIBS}
-BBCLASSEXTEND_append_pn-clutter-box2d = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-clutter = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-cmake = ${MULTILIBS}
BBCLASSEXTEND_append_pn-cogl = ${MULTILIBS}
BBCLASSEXTEND_append_pn-compositeproto = ${MULTILIBS}
BBCLASSEXTEND_append_pn-connman-gnome = ${MULTILIBS}
BBCLASSEXTEND_append_pn-connman = ${MULTILIBS}
BBCLASSEXTEND_append_pn-consolekit = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-console-tools = ${MULTILIBS}
BBCLASSEXTEND_append_pn-contacts = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-core-image-base = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-core-image-basic = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-core-image-clutter = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-core-image-core = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-core-image-gtk-directfb = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-core-image-lsb-dev = ${MULTILIBS}
BBCLASSEXTEND_append_pn-core-image-lsb = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-core-image-lsb-sdk = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-core-image-minimal-dev = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-core-image-minimal-initramfs = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-core-image-minimal-mtdutils = ${MULTILIBS}
BBCLASSEXTEND_append_pn-core-image-minimal = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-core-image-rt = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-core-image-rt-sdk = ${MULTILIBS}
+BBCLASSEXTEND_append_pn-core-image-sato-dev = ${MULTILIBS}
