* [CONSOLIDATED PULL 01/25] util-linux: Update patch for non-GPLv3
2012-01-06 7:56 [CONSOLIDATED PULL 00/25] Various Patches Saul Wold
@ 2012-01-06 7:56 ` Saul Wold
2012-01-06 7:56 ` [CONSOLIDATED PULL 02/25] gnutls: remove gettext " Saul Wold
` (24 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2012-01-06 7:56 UTC (permalink / raw)
To: openembedded-core
Rebase the disable-lscpu patch for the updated source base,
we only need to modify Makefile.am, since automake will regenerate
the Makefile.in.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../util-linux-2.20.1/remove-lscpu.patch | 94 +------------------
1 files changed, 5 insertions(+), 89 deletions(-)
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/remove-lscpu.patch b/meta/recipes-core/util-linux/util-linux-2.20.1/remove-lscpu.patch
index afa50f4..434e28d 100644
--- a/meta/recipes-core/util-linux/util-linux-2.20.1/remove-lscpu.patch
+++ b/meta/recipes-core/util-linux/util-linux-2.20.1/remove-lscpu.patch
@@ -6,104 +6,20 @@ Take out lscpu stuff from the code
Saul Wold <saul.wold@intel.com>
Nitin A Kamble <nitin.a.kamble@intel.com>
-Index: util-linux-2.19.1/sys-utils/Makefile.am
+Index: util-linux-2.20.1/sys-utils/Makefile.am
===================================================================
---- util-linux-2.19.1.orig/sys-utils/Makefile.am 2011-04-05 03:43:02.000000000 -0700
-+++ util-linux-2.19.1/sys-utils/Makefile.am 2011-06-29 12:08:24.187440334 -0700
-@@ -17,12 +17,6 @@
+--- util-linux-2.20.1.orig/sys-utils/Makefile.am
++++ util-linux-2.20.1/sys-utils/Makefile.am
+@@ -17,12 +17,6 @@ usrsbin_exec_PROGRAMS += ldattach tunelp
dist_man_MANS += dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \
ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8 fstrim.8
-if HAVE_CPU_SET_T
-usrbin_exec_PROGRAMS += lscpu
--lscpu_SOURCES = lscpu.c $(top_srcdir)/lib/cpuset.c
+-lscpu_SOURCES = lscpu.c $(top_srcdir)/lib/cpuset.c $(top_srcdir)/lib/strutils.c
-dist_man_MANS += lscpu.1
-endif
-
endif
cytune_SOURCES = cytune.c cyclades.h
-Index: util-linux-2.19.1/sys-utils/Makefile.in
-===================================================================
---- util-linux-2.19.1.orig/sys-utils/Makefile.in 2011-05-02 02:49:19.000000000 -0700
-+++ util-linux-2.19.1/sys-utils/Makefile.in 2011-06-29 12:10:47.647440371 -0700
-@@ -51,8 +51,6 @@
- @LINUX_TRUE@am__append_5 = dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \
- @LINUX_TRUE@ ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8 fstrim.8
-
--@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@am__append_6 = lscpu
--@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@am__append_7 = lscpu.1
- @BUILD_FALLOCATE_TRUE@am__append_8 = fallocate
- @BUILD_FALLOCATE_TRUE@am__append_9 = fallocate.1
- @BUILD_PIVOT_ROOT_TRUE@am__append_10 = pivot_root
-@@ -98,7 +96,6 @@
- @BUILD_PIVOT_ROOT_TRUE@am__EXEEXT_4 = pivot_root$(EXEEXT)
- @BUILD_SWITCH_ROOT_TRUE@am__EXEEXT_5 = switch_root$(EXEEXT)
- @LINUX_TRUE@am__EXEEXT_6 = cytune$(EXEEXT) setarch$(EXEEXT)
--@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@am__EXEEXT_7 = lscpu$(EXEEXT)
- @BUILD_FALLOCATE_TRUE@am__EXEEXT_8 = fallocate$(EXEEXT)
- @BUILD_UNSHARE_TRUE@am__EXEEXT_9 = unshare$(EXEEXT)
- @LINUX_TRUE@am__EXEEXT_10 = ldattach$(EXEEXT) tunelp$(EXEEXT) \
-@@ -146,11 +143,6 @@
- ldattach_SOURCES = ldattach.c
- ldattach_OBJECTS = ldattach.$(OBJEXT)
- ldattach_LDADD = $(LDADD)
--am__lscpu_SOURCES_DIST = lscpu.c $(top_srcdir)/lib/cpuset.c
--@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@am_lscpu_OBJECTS = lscpu.$(OBJEXT) \
--@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@ cpuset.$(OBJEXT)
--lscpu_OBJECTS = $(am_lscpu_OBJECTS)
--lscpu_LDADD = $(LDADD)
- pivot_root_SOURCES = pivot_root.c
- pivot_root_OBJECTS = pivot_root.$(OBJEXT)
- pivot_root_LDADD = $(LDADD)
-@@ -206,13 +198,13 @@
- am__v_GEN_0 = @echo " GEN " $@;
- SOURCES = arch.c ctrlaltdel.c $(cytune_SOURCES) $(dmesg_SOURCES) \
- $(fallocate_SOURCES) flock.c fsfreeze.c $(fstrim_SOURCES) \
-- ipcmk.c ipcrm.c ipcs.c ldattach.c $(lscpu_SOURCES) \
-+ ipcmk.c ipcrm.c ipcs.c ldattach.c \
- pivot_root.c readprofile.c renice.c $(rtcwake_SOURCES) \
- setarch.c setsid.c switch_root.c $(tunelp_SOURCES) unshare.c
- DIST_SOURCES = arch.c ctrlaltdel.c $(cytune_SOURCES) $(dmesg_SOURCES) \
- $(am__fallocate_SOURCES_DIST) flock.c fsfreeze.c \
- $(fstrim_SOURCES) ipcmk.c ipcrm.c ipcs.c ldattach.c \
-- $(am__lscpu_SOURCES_DIST) pivot_root.c readprofile.c renice.c \
-+ pivot_root.c readprofile.c renice.c \
- $(rtcwake_SOURCES) setarch.c setsid.c switch_root.c \
- $(tunelp_SOURCES) unshare.c
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-@@ -242,7 +234,7 @@
- MANS = $(dist_man_MANS) $(man_MANS)
- am__dist_noinst_DATA_DIST = flock.1 ipcrm.1 ipcs.1 ipcmk.1 renice.1 \
- setsid.1 readprofile.1 dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \
-- ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8 fstrim.8 lscpu.1 \
-+ ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8 fstrim.8 \
- fallocate.1 pivot_root.8 switch_root.8 unshare.1 arch.1
- DATA = $(dist_noinst_DATA)
- ETAGS = etags
-@@ -438,7 +430,6 @@
- readprofile.1 $(am__append_5) $(am__append_7) $(am__append_9) \
- $(am__append_11) $(am__append_13) $(am__append_15) \
- $(am__append_17)
--@HAVE_CPU_SET_T_TRUE@@LINUX_TRUE@lscpu_SOURCES = lscpu.c $(top_srcdir)/lib/cpuset.c
- cytune_SOURCES = cytune.c cyclades.h
- tunelp_SOURCES = tunelp.c lp.h
- fstrim_SOURCES = fstrim.c $(top_srcdir)/lib/strutils.c
-@@ -693,9 +684,6 @@
- ldattach$(EXEEXT): $(ldattach_OBJECTS) $(ldattach_DEPENDENCIES)
- @rm -f ldattach$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(ldattach_OBJECTS) $(ldattach_LDADD) $(LIBS)
--lscpu$(EXEEXT): $(lscpu_OBJECTS) $(lscpu_DEPENDENCIES)
-- @rm -f lscpu$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(lscpu_OBJECTS) $(lscpu_LDADD) $(LIBS)
- pivot_root$(EXEEXT): $(pivot_root_OBJECTS) $(pivot_root_DEPENDENCIES)
- @rm -f pivot_root$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(pivot_root_OBJECTS) $(pivot_root_LDADD) $(LIBS)
-@@ -743,7 +731,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipcrm.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipcs.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldattach.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lscpu.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pivot_root.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readprofile.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/renice.Po@am__quote@
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 02/25] gnutls: remove gettext patch for non-GPLv3
2012-01-06 7:56 [CONSOLIDATED PULL 00/25] Various Patches Saul Wold
2012-01-06 7:56 ` [CONSOLIDATED PULL 01/25] util-linux: Update patch for non-GPLv3 Saul Wold
@ 2012-01-06 7:56 ` Saul Wold
2012-01-06 7:56 ` [CONSOLIDATED PULL 03/25] buildhistory: add script to check for significant changes Saul Wold
` (23 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2012-01-06 7:56 UTC (permalink / raw)
To: openembedded-core
GPLv2 version of gnutls does not need the gettext 0.18 patch
since it still uses the over version of gettext that is also
GPLv2.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-support/gnutls/gnutls_2.12.14.bb | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-support/gnutls/gnutls_2.12.14.bb b/meta/recipes-support/gnutls/gnutls_2.12.14.bb
index 045ba69..21fd187 100644
--- a/meta/recipes-support/gnutls/gnutls_2.12.14.bb
+++ b/meta/recipes-support/gnutls/gnutls_2.12.14.bb
@@ -1,10 +1,17 @@
require gnutls.inc
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.4"
SRC_URI += "file://gnutls-openssl.patch \
- file://configure-fix.patch \
- file://fix-gettext-version.patch"
+ file://configure-fix.patch"
+
+python() {
+ if not ((d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1):
+ # if GPLv3 add patch
+ src_uri = (d.getVar("SRC_URI", False) or "").split()
+ src_uri.append("file://fix-gettext-version.patch")
+ d.setVar("SRC_URI", " ".join(src_uri))
+}
SRC_URI[md5sum] = "555687a7ffefba0bd9de1e71cb61402c"
SRC_URI[sha256sum] = "5ee72ba6de7a23cf315792561954451e022dac8730149ca95f93c61e95be2ce3"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 03/25] buildhistory: add script to check for significant changes
2012-01-06 7:56 [CONSOLIDATED PULL 00/25] Various Patches Saul Wold
2012-01-06 7:56 ` [CONSOLIDATED PULL 01/25] util-linux: Update patch for non-GPLv3 Saul Wold
2012-01-06 7:56 ` [CONSOLIDATED PULL 02/25] gnutls: remove gettext " Saul Wold
@ 2012-01-06 7:56 ` Saul Wold
2012-01-06 7:56 ` [CONSOLIDATED PULL 04/25] classes/buildhistory: add hostname to commit message Saul Wold
` (22 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2012-01-06 7:56 UTC (permalink / raw)
To: openembedded-core
From: Paul Eggleton <paul.eggleton@linux.intel.com>
Adds a buildhistory-diff script which can be used to analyse changes in
the buildhistory git repository (as produced by buildhistory.bbclass),
and report significant ones that may need manual checking to ensure they
aren't regressions (e.g. package size changed by more than a certain
percentage, files added/removed/changed in the image, etc.)
The implementation is actually split into a small script and a Python
module, in order to make the logic re-usable in a future web-based
interface.
Implements the first part of [YOCTO #1566].
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/lib/oe/buildhistory_analysis.py | 240 ++++++++++++++++++++++++++++++++++
scripts/buildhistory-diff | 43 ++++++
2 files changed, 283 insertions(+), 0 deletions(-)
create mode 100644 meta/lib/oe/buildhistory_analysis.py
create mode 100755 scripts/buildhistory-diff
diff --git a/meta/lib/oe/buildhistory_analysis.py b/meta/lib/oe/buildhistory_analysis.py
new file mode 100644
index 0000000..9f42fe3
--- /dev/null
+++ b/meta/lib/oe/buildhistory_analysis.py
@@ -0,0 +1,240 @@
+# Report significant differences in the buildhistory repository since a specific revision
+#
+# Copyright (C) 2012 Intel Corporation
+# Author: Paul Eggleton <paul.eggleton@linux.intel.com>
+#
+# Note: requires GitPython 0.3.1+
+#
+# You can use this from the command line by running scripts/buildhistory-diff
+#
+
+import sys
+import os.path
+import difflib
+import git
+
+
+# How to display fields
+pkg_list_fields = ['DEPENDS', 'RDEPENDS', 'RRECOMMENDS', 'PACKAGES', 'FILES', 'FILELIST']
+pkg_numeric_fields = ['PKGSIZE']
+# Fields to monitor
+pkg_monitor_fields = ['RDEPENDS', 'RRECOMMENDS', 'PACKAGES', 'FILELIST', 'PKGSIZE']
+# Percentage change to alert for numeric fields
+pkg_monitor_numeric_threshold = 20
+# Image files to monitor
+img_monitor_files = ['installed-package-names.txt', 'files-in-image.txt']
+
+
+class ChangeRecord:
+ def __init__(self, path, fieldname, oldvalue, newvalue):
+ self.path = path
+ self.fieldname = fieldname
+ self.oldvalue = oldvalue
+ self.newvalue = newvalue
+ self.filechanges = None
+
+ def __str__(self):
+ if self.fieldname in pkg_list_fields:
+ aitems = self.oldvalue.split(' ')
+ bitems = self.newvalue.split(' ')
+ removed = list(set(aitems) - set(bitems))
+ added = list(set(bitems) - set(aitems))
+ return '%s: %s:%s%s' % (self.path, self.fieldname, ' removed "%s"' % ' '.join(removed) if removed else '', ' added "%s"' % ' '.join(added) if added else '')
+ elif self.fieldname in pkg_numeric_fields:
+ aval = int(self.oldvalue)
+ bval = int(self.newvalue)
+ percentchg = ((bval - aval) / float(aval)) * 100
+ return '%s: %s changed from %d to %d (%s%d%%)' % (self.path, self.fieldname, aval, bval, '+' if percentchg > 0 else '', percentchg)
+ elif self.fieldname in img_monitor_files:
+ out = 'Changes to %s (%s):\n ' % (self.path, self.fieldname)
+ if self.filechanges:
+ out += '\n '.join(['%s' % i for i in self.filechanges])
+ else:
+ alines = self.oldvalue.splitlines()
+ blines = self.newvalue.splitlines()
+ diff = difflib.unified_diff(alines, blines, self.fieldname, self.fieldname, lineterm='')
+ out += '\n '.join(list(diff))
+ out += '\n --'
+ return out
+ else:
+ return '%s: %s changed from "%s" to "%s"' % (self.path, self.self.fieldname, self.oldvalue, self.newvalue)
+
+
+class FileChange:
+ changetype_add = 'A'
+ changetype_remove = 'R'
+ changetype_type = 'T'
+ changetype_perms = 'P'
+ changetype_ownergroup = 'O'
+ changetype_link = 'L'
+
+ def __init__(self, path, changetype, oldvalue = None, newvalue = None):
+ self.path = path
+ self.changetype = changetype
+ self.oldvalue = oldvalue
+ self.newvalue = newvalue
+
+ def _ftype_str(self, ftype):
+ if ftype == '-':
+ return 'file'
+ elif ftype == 'd':
+ return 'directory'
+ elif ftype == 'l':
+ return 'symlink'
+ elif ftype == 'c':
+ return 'char device'
+ elif ftype == 'b':
+ return 'block device'
+ elif ftype == 'p':
+ return 'fifo'
+ elif ftype == 's':
+ return 'socket'
+ else:
+ return 'unknown (%s)' % ftype
+
+ def __str__(self):
+ if self.changetype == self.changetype_add:
+ return '%s was added' % self.path
+ elif self.changetype == self.changetype_remove:
+ return '%s was removed' % self.path
+ elif self.changetype == self.changetype_type:
+ return '%s changed type from %s to %s' % (self.path, self._ftype_str(self.oldvalue), self._ftype_str(self.newvalue))
+ elif self.changetype == self.changetype_perms:
+ return '%s changed permissions from %s to %s' % (self.path, self.oldvalue, self.newvalue)
+ elif self.changetype == self.changetype_ownergroup:
+ return '%s changed owner/group from %s to %s' % (self.path, self.oldvalue, self.newvalue)
+ elif self.changetype == self.changetype_link:
+ return '%s changed symlink target from %s to %s' % (self.path, self.oldvalue, self.newvalue)
+ else:
+ return '%s changed (unknown)' % self.path
+
+
+def blob_to_dict(blob):
+ alines = blob.data_stream.read().splitlines()
+ adict = {}
+ for line in alines:
+ splitv = [i.strip() for i in line.split('=',1)]
+ if splitv.count > 1:
+ adict[splitv[0]] = splitv[1]
+ return adict
+
+
+def file_list_to_dict(lines):
+ adict = {}
+ for line in lines:
+ # Leave the last few fields intact so we handle file names containing spaces
+ splitv = line.split(None,4)
+ # Grab the path and remove the leading .
+ path = splitv[4][1:].strip()
+ # Handle symlinks
+ if(' -> ' in path):
+ target = path.split(' -> ')[1]
+ path = path.split(' -> ')[0]
+ adict[path] = splitv[0:3] + [target]
+ else:
+ adict[path] = splitv[0:3]
+ return adict
+
+
+def compare_file_lists(alines, blines):
+ adict = file_list_to_dict(alines)
+ bdict = file_list_to_dict(blines)
+ filechanges = []
+ for path, splitv in adict.iteritems():
+ newsplitv = bdict.pop(path, None)
+ if newsplitv:
+ # Check type
+ oldvalue = splitv[0][0]
+ newvalue = newsplitv[0][0]
+ if oldvalue != newvalue:
+ filechanges.append(FileChange(path, FileChange.changetype_type, oldvalue, newvalue))
+ # Check permissions
+ oldvalue = splitv[0][1:]
+ newvalue = newsplitv[0][1:]
+ if oldvalue != newvalue:
+ filechanges.append(FileChange(path, FileChange.changetype_perms, oldvalue, newvalue))
+ # Check owner/group
+ oldvalue = '%s/%s' % (splitv[1], splitv[2])
+ newvalue = '%s/%s' % (newsplitv[1], newsplitv[2])
+ if oldvalue != newvalue:
+ filechanges.append(FileChange(path, FileChange.changetype_ownergroup, oldvalue, newvalue))
+ # Check symlink target
+ if newsplitv[0][0] == 'l':
+ if splitv.count > 3:
+ oldvalue = splitv[3]
+ else:
+ oldvalue = None
+ newvalue = newsplitv[3]
+ if oldvalue != newvalue:
+ filechanges.append(FileChange(path, FileChange.changetype_link, oldvalue, newvalue))
+ else:
+ filechanges.append(FileChange(path, FileChange.changetype_remove))
+
+ # Whatever is left over has been added
+ for path in bdict:
+ filechanges.append(FileChange(path, FileChange.changetype_add))
+
+ return filechanges
+
+
+def compare_lists(alines, blines):
+ removed = list(set(alines) - set(blines))
+ added = list(set(blines) - set(alines))
+
+ filechanges = []
+ for pkg in removed:
+ filechanges.append(FileChange(pkg, FileChange.changetype_remove))
+ for pkg in added:
+ filechanges.append(FileChange(pkg, FileChange.changetype_add))
+
+ return filechanges
+
+
+def process_changes(repopath, revision1, revision2 = 'HEAD', report_all = False):
+ repo = git.Repo(repopath)
+ assert repo.bare == False
+ commit = repo.commit(revision1)
+ diff = commit.diff(revision2)
+
+ changes = []
+ for d in diff.iter_change_type('M'):
+ path = os.path.dirname(d.a_blob.path)
+ if path.startswith('packages/'):
+ adict = blob_to_dict(d.a_blob)
+ bdict = blob_to_dict(d.b_blob)
+
+ for key in adict:
+ if report_all or key in pkg_monitor_fields:
+ if adict[key] != bdict[key]:
+ if (not report_all) and key in pkg_numeric_fields:
+ aval = int(adict[key])
+ bval = int(bdict[key])
+ percentchg = ((bval - aval) / float(aval)) * 100
+ if percentchg < pkg_monitor_numeric_threshold:
+ continue
+ chg = ChangeRecord(path, key, adict[key], bdict[key])
+ changes.append(chg)
+ elif path.startswith('images/'):
+ filename = os.path.basename(d.a_blob.path)
+ if filename in img_monitor_files:
+ if filename == 'files-in-image.txt':
+ alines = d.a_blob.data_stream.read().splitlines()
+ blines = d.b_blob.data_stream.read().splitlines()
+ filechanges = compare_file_lists(alines,blines)
+ if filechanges:
+ chg = ChangeRecord(path, filename, None, None)
+ chg.filechanges = filechanges
+ changes.append(chg)
+ elif filename == 'installed-package-names.txt':
+ alines = d.a_blob.data_stream.read().splitlines()
+ blines = d.b_blob.data_stream.read().splitlines()
+ filechanges = compare_lists(alines,blines)
+ if filechanges:
+ chg = ChangeRecord(path, filename, None, None)
+ chg.filechanges = filechanges
+ changes.append(chg)
+ else:
+ chg = ChangeRecord(path, filename, d.a_blob.data_stream.read(), d.b_blob.data_stream.read())
+ changes.append(chg)
+
+ return changes
diff --git a/scripts/buildhistory-diff b/scripts/buildhistory-diff
new file mode 100755
index 0000000..6b344eb
--- /dev/null
+++ b/scripts/buildhistory-diff
@@ -0,0 +1,43 @@
+#!/usr/bin/env python
+
+# Report significant differences in the buildhistory repository since a specific revision
+#
+# Copyright (C) 2012 Intel Corporation
+# Author: Paul Eggleton <paul.eggleton@linux.intel.com>
+
+import sys
+import os.path
+
+# Ensure PythonGit is installed (buildhistory_analysis needs it)
+try:
+ import git
+except ImportError:
+ print("Please install PythonGit 0.3.1 or later in order to use this script")
+ sys.exit(1)
+
+
+def main():
+ if (len(sys.argv) < 3):
+ print("Report significant differences in the buildhistory repository")
+ print("Syntax: %s <buildhistory-path> <since-revision> [to-revision]" % os.path.basename(sys.argv[0]))
+ print("If to-revision is not specified, it defaults to HEAD")
+ sys.exit(1)
+
+ # Set path to OE lib dir so we can import the buildhistory_analysis module
+ newpath = os.path.abspath(os.path.dirname(os.path.abspath(sys.argv[0])) + '/../meta/lib')
+ sys.path = sys.path + [newpath]
+ import oe.buildhistory_analysis
+
+ if len(sys.argv) > 3:
+ torev = sys.argv[3]
+ else:
+ torev = 'HEAD'
+ changes = oe.buildhistory_analysis.process_changes(sys.argv[1], sys.argv[2], torev)
+ for chg in changes:
+ print('%s' % chg)
+
+ sys.exit(0)
+
+
+if __name__ == "__main__":
+ main()
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 04/25] classes/buildhistory: add hostname to commit message
2012-01-06 7:56 [CONSOLIDATED PULL 00/25] Various Patches Saul Wold
` (2 preceding siblings ...)
2012-01-06 7:56 ` [CONSOLIDATED PULL 03/25] buildhistory: add script to check for significant changes Saul Wold
@ 2012-01-06 7:56 ` Saul Wold
2012-01-06 7:56 ` [CONSOLIDATED PULL 05/25] classes/buildhistory: make the package version backwards error non-fatal Saul Wold
` (21 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2012-01-06 7:56 UTC (permalink / raw)
To: openembedded-core
From: Paul Eggleton <paul.eggleton@linux.intel.com>
If we're building on multiple hosts then it's useful to have the
hostname in the commit message.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/classes/buildhistory.bbclass | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 06d3510..ba20914 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -356,7 +356,8 @@ buildhistory_commit() {
repostatus=`git status --porcelain`
if [ "$repostatus" != "" ] ; then
git add ${BUILDHISTORY_DIR}/*
- git commit ${BUILDHISTORY_DIR}/ -m "Build ${BUILDNAME} for machine ${MACHINE} configured for ${DISTRO} ${DISTRO_VERSION}" --author "${BUILDHISTORY_COMMIT_AUTHOR}" > /dev/null
+ HOSTNAME=`cat /etc/hostname 2>/dev/null || echo unknown`
+ git commit ${BUILDHISTORY_DIR}/ -m "Build ${BUILDNAME} of ${DISTRO} ${DISTRO_VERSION} for machine ${MACHINE} on $HOSTNAME" --author "${BUILDHISTORY_COMMIT_AUTHOR}" > /dev/null
if [ "${BUILDHISTORY_PUSH_REPO}" != "" ] ; then
git push -q ${BUILDHISTORY_PUSH_REPO}
fi
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 05/25] classes/buildhistory: make the package version backwards error non-fatal
2012-01-06 7:56 [CONSOLIDATED PULL 00/25] Various Patches Saul Wold
` (3 preceding siblings ...)
2012-01-06 7:56 ` [CONSOLIDATED PULL 04/25] classes/buildhistory: add hostname to commit message Saul Wold
@ 2012-01-06 7:56 ` Saul Wold
2012-01-06 7:56 ` [CONSOLIDATED PULL 06/25] classes/buildhistory: remove redundant package history checking stub Saul Wold
` (20 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2012-01-06 7:56 UTC (permalink / raw)
To: openembedded-core
From: Paul Eggleton <paul.eggleton@linux.intel.com>
Just make it a bb.error when a package version goes backwards, it
doesn't make sense to fail the build immediately; the error(s) will
still be reflected in bitbake's exit code.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/classes/buildhistory.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index ba20914..f618903 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -158,7 +158,7 @@ python buildhistory_emit_pkghistory() {
last_pr = lastversion.pr
r = bb.utils.vercmp((pe, pv, pr), (last_pe, last_pv, last_pr))
if r < 0:
- bb.fatal("Package version for package %s went backwards which would break package feeds from (%s:%s-%s to %s:%s-%s)" % (pkg, last_pe, last_pv, last_pr, pe, pv, pr))
+ bb.error("Package version for package %s went backwards which would break package feeds from (%s:%s-%s to %s:%s-%s)" % (pkg, last_pe, last_pv, last_pr, pe, pv, pr))
pkginfo = PackageInfo(pkg)
pkginfo.pe = pe
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 06/25] classes/buildhistory: remove redundant package history checking stub
2012-01-06 7:56 [CONSOLIDATED PULL 00/25] Various Patches Saul Wold
` (4 preceding siblings ...)
2012-01-06 7:56 ` [CONSOLIDATED PULL 05/25] classes/buildhistory: make the package version backwards error non-fatal Saul Wold
@ 2012-01-06 7:56 ` Saul Wold
2012-01-06 7:56 ` [CONSOLIDATED PULL 07/25] kern-tools: import flexible branching support Saul Wold
` (19 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2012-01-06 7:56 UTC (permalink / raw)
To: openembedded-core
From: Paul Eggleton <paul.eggleton@linux.intel.com>
The code that would have gone here has been superseded by the
buildhistory analysis functionality implemented in
meta/lib/oe/buildhistory_analysis.py and scripts/buildhistory-diff, so
remove it.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/classes/buildhistory.bbclass | 11 -----------
1 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index f618903..34cc297 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -182,21 +182,10 @@ python buildhistory_emit_pkghistory() {
write_pkghistory(pkginfo, d)
- if lastversion:
- check_pkghistory(pkginfo, lastversion)
-
write_latestlink(pkg, pe, pv, pr, d)
}
-def check_pkghistory(pkginfo, lastversion):
-
- bb.debug(2, "Checking package history")
- # RDEPENDS removed?
- # PKG changed?
- # Each file list of each package for file removals?
-
-
def write_recipehistory(rcpinfo, d):
bb.debug(2, "Writing recipe history")
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 07/25] kern-tools: import flexible branching support
2012-01-06 7:56 [CONSOLIDATED PULL 00/25] Various Patches Saul Wold
` (5 preceding siblings ...)
2012-01-06 7:56 ` [CONSOLIDATED PULL 06/25] classes/buildhistory: remove redundant package history checking stub Saul Wold
@ 2012-01-06 7:56 ` Saul Wold
2012-01-06 7:56 ` [CONSOLIDATED PULL 08/25] linux-yocto: bump kernel version to v3.0.14 Saul Wold
` (18 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2012-01-06 7:56 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@windriver.com>
The commit:
kern-tools: update SRCREV to pickup git operation fixes
Brought in the ability to trap failed git operations on the working tree,
but what it missed were some branching changes that allow arbitrary
branch points and the ability to create a branch multiple times (if a feature
is included multiple times). The graphics driver branches used by some
BSPs need this part of the change to properly handle graphics driver
branches.
Updating the SRCREV to pickup the associated kern-tools changes for this
support.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
.../kern-tools/kern-tools-native_git.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index 6bb9c85..2711465 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=e2bf4415f3d8
DEPENDS = "git-native guilt-native"
-SRCREV = "806f1452eeced0bbd05433456ac0d6786d5362dc"
+SRCREV = "52d929b5435d32097bce22b3f3662440f73a33b5"
PR = r12
PV = "0.1+git${SRCPV}"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 08/25] linux-yocto: bump kernel version to v3.0.14
2012-01-06 7:56 [CONSOLIDATED PULL 00/25] Various Patches Saul Wold
` (6 preceding siblings ...)
2012-01-06 7:56 ` [CONSOLIDATED PULL 07/25] kern-tools: import flexible branching support Saul Wold
@ 2012-01-06 7:56 ` Saul Wold
2012-01-06 7:56 ` [CONSOLIDATED PULL 09/25] linux-yocto: use src_patches for out of tree kernel feature support Saul Wold
` (17 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2012-01-06 7:56 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Updating the 3.0 kernel recipe to contain v3.0.14 -stable.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 8 ++++----
meta/recipes-kernel/linux/linux-yocto_3.0.bb | 18 +++++++++---------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
index 81d22d0..c8983c4 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
@@ -11,12 +11,12 @@ KMACHINE_qemumips = "mti-malta32-be"
KBRANCH = "yocto/standard/preempt-rt/base"
KBRANCH_qemuppc = "yocto/standard/preempt-rt/qemu-ppc32"
-LINUX_VERSION ?= "3.0.12"
+LINUX_VERSION ?= "3.0.14"
LINUX_KERNEL_TYPE = "preempt-rt"
-SRCREV_machine ?= "6e96ccbbf19a4a7b67d98fdcd74d2c9da2c7c463"
-SRCREV_machine_qemuppc ?= "8ea61de7fd201ff0001a039f2fda8ec2e4a562a1"
-SRCREV_meta ?= "c979f1365b1eb74e882b2cbbc8407ec536ab6eb8"
+SRCREV_machine ?= "bcf4107c7f22d10952618a2ad146e6149d240cd2"
+SRCREV_machine_qemuppc ?= "1e5511ea2cb5f150ffce86071035a81c0499494b"
+SRCREV_meta ?= "6ae3d992cf546184010e87a0349810198f1d167c"
PR = "r1"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
index b650c84..921c258 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
@@ -10,15 +10,15 @@ KMACHINE_qemuarm = "yocto/standard/arm-versatile-926ejs"
KBRANCH = ${KMACHINE}
-LINUX_VERSION ?= "3.0.12"
-
-SRCREV_machine_qemuarm ?= "b2a7d668b963f1c5f9876f130278dd9fb7df4831"
-SRCREV_machine_qemumips ?= "62bb04e5ba19b5b8aacd9079fdfbcb8284cd9fc8"
-SRCREV_machine_qemuppc ?= "7ecece328c5987112de2959f8f998dfcedaf7210"
-SRCREV_machine_qemux86 ?= "a611ba462ac51b2bfdac1c5c6538dac95ad9b4dd"
-SRCREV_machine_qemux86-64 ?= "b15a9b67089e31ef9780fdbd0481f48ef7facdba"
-SRCREV_machine ?= "f389d310965a56091f688b28ea8be6d9cbb7fbbe"
-SRCREV_meta ?= "c979f1365b1eb74e882b2cbbc8407ec536ab6eb8"
+LINUX_VERSION ?= "3.0.14"
+
+SRCREV_machine_qemuarm ?= "c498cc6e4b56784b3c2c547cb9a7af435b9412c1"
+SRCREV_machine_qemumips ?= "791c3f4124a238a798e2360340800f4989fad695"
+SRCREV_machine_qemuppc ?= "10e808d1c304b14cf42903fd637f239766b78476"
+SRCREV_machine_qemux86 ?= "e04f9f8e564c60b1ce907d64074c18730f8dab4e"
+SRCREV_machine_qemux86-64 ?= "53c2fa060d34e9a0b59e19398aeebbe73f24d89b"
+SRCREV_machine ?= "fe80c1e343bf8f038328a612cef7f821d7ec8dbf"
+SRCREV_meta ?= "6ae3d992cf546184010e87a0349810198f1d167c"
PR = "r2"
PV = "${LINUX_VERSION}+git${SRCPV}"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 09/25] linux-yocto: use src_patches for out of tree kernel feature support
2012-01-06 7:56 [CONSOLIDATED PULL 00/25] Various Patches Saul Wold
` (7 preceding siblings ...)
2012-01-06 7:56 ` [CONSOLIDATED PULL 08/25] linux-yocto: bump kernel version to v3.0.14 Saul Wold
@ 2012-01-06 7:56 ` Saul Wold
2012-01-06 7:56 ` [CONSOLIDATED PULL 10/25] qt4-graphics-system: add Saul Wold
` (16 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2012-01-06 7:56 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@windriver.com>
To support larger out of tree kernel features and enhanced patching schemes,
this changeset modifies the linux-yocto patching routines to call the
recently factored out 'src_patches' routine. Using the returned list of local
URIs for all valid patches, the logic can then determine whether or not
patches can be used in place, or need to be migrated and have re-usable
kernel features created. The results are then fed to the existing
infrastructure to be applied and commited to the tree.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/classes/kernel-yocto.bbclass | 67 +++++++++++++++++++++++++++++++++++-
1 files changed, 65 insertions(+), 2 deletions(-)
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index f78caaf..1b73e6e 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -1,5 +1,15 @@
S = "${WORKDIR}/linux"
+
+def find_patches(d):
+ patches=src_patches(d)
+ patch_list=[]
+ for p in patches:
+ _, _, local, _, _, _ = bb.decodeurl(p)
+ patch_list.append(local)
+
+ return patch_list
+
do_patch() {
cd ${S}
if [ -f ${WORKDIR}/defconfig ]; then
@@ -31,14 +41,67 @@ do_patch() {
exit 1
fi
- # updates or generates the target description
+ patches="${@" ".join(find_patches(d))}"
+
+ # This loops through all patches, and looks for directories that do
+ # not already have feature descriptions. If a directory doesn't have
+ # a feature description, we switch to the ${WORKDIR} variant of the
+ # feature (so we can write to it) and generate a feature for those
+ # patches. The generated feature will respect the patch order.
+ #
+ # By leaving source patch directories that already have .scc files
+ # as-is it means that a SRC_URI can only contain a .scc file, and all
+ # patches that the .scc references will be picked up, without having
+ # to be repeated on the SRC_URI line .. which is more intutive
+ set +e
+ patch_dirs=
+ for p in ${patches}; do
+ pdir=`dirname ${p}`
+ pname=`basename ${p}`
+ scc=`find ${pdir} -maxdepth 1 -name '*.scc'`
+ if [ -z "${scc}" ]; then
+ # there is no scc file. We need to switch to someplace that we know
+ # we can create content (the workdir)
+ workdir_subdir=`echo ${pdir} | sed "s%^.*/${PN}%%" | sed 's%^/%%'`
+ suggested_dir="${WORKDIR}/${workdir_subdir}"
+ echo ${gen_feature_dirs} | grep -q ${suggested_dir}
+ if [ $? -ne 0 ]; then
+ gen_feature_dirs="${gen_feature_dirs} ${suggested_dir}"
+ fi
+ # we call the file *.scc_tmp, so the test above will continue to find
+ # that patches from a common subdirectory don't have a scc file and
+ # they'll be placed in order, into this file. We'll rename it later.
+ echo "patch ${pname}" >> ${suggested_dir}/gen_${workdir_subdir}_desc.scc_tmp
+ else
+ suggested_dir="${pdir}"
+ fi
+ echo ${patch_dirs} | grep -q ${suggested_dir}
+ if [ $? -ne 0 ]; then
+ patch_dirs="${patch_dirs} ${suggested_dir}"
+ fi
+ done
+
+ # go through the patch directories and look for any scc feature files
+ # that were constructed above. If one is found, rename it to ".scc" so
+ # the kernel patching can see it.
+ for pdir in ${patch_dirs}; do
+ scc=`find ${pdir} -maxdepth 1 -name '*.scc_tmp'`
+ if [ -n "${scc}" ]; then
+ new_scc=`echo ${scc} | sed 's/_tmp//'`
+ mv -f ${scc} ${new_scc}
+ fi
+ done
+
+ # add any explicitly referenced features onto the end of the feature
+ # list that is passed to the kernel build scripts.
if [ -n "${KERNEL_FEATURES}" ]; then
for feat in ${KERNEL_FEATURES}; do
addon_features="$addon_features --feature $feat"
done
fi
+ # updates or generates the target description
updateme --branch ${kbranch} -DKDESC=${KMACHINE}:${LINUX_KERNEL_TYPE} \
- ${addon_features} ${ARCH} ${KMACHINE} ${WORKDIR}
+ ${addon_features} ${ARCH} ${KMACHINE} ${patch_dirs}
if [ $? -ne 0 ]; then
echo "ERROR. Could not update ${kbranch}"
exit 1
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 10/25] qt4-graphics-system: add
2012-01-06 7:56 [CONSOLIDATED PULL 00/25] Various Patches Saul Wold
` (8 preceding siblings ...)
2012-01-06 7:56 ` [CONSOLIDATED PULL 09/25] linux-yocto: use src_patches for out of tree kernel feature support Saul Wold
@ 2012-01-06 7:56 ` Saul Wold
2012-01-06 7:56 ` [CONSOLIDATED PULL 11/25] qt4e.bbclass: add QT_BASE_NAME for use in recipes Saul Wold
` (15 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2012-01-06 7:56 UTC (permalink / raw)
To: openembedded-core
From: Otavio Salvador <otavio@ossystems.com.br>
Allow setting default runtime graphics system engine for Qt4
applications per machine.
Depending on the GPU and Xorg driver, this can boost and impact
significantly the drawing performance. The default setting is to
'raster' as this offer best performance for most machines GPUs.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
.../qt4-graphics-system/qt4-graphics-system_1.0.bb | 27 ++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb
diff --git a/meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb b/meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb
new file mode 100644
index 0000000..b3aa1e5
--- /dev/null
+++ b/meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Set default Qt4 Graphics System to ${QT_GRAPHICS_SYSTEM}"
+SECTION = "x11/base"
+LICENSE = "MIT-X"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+QT_GRAPHICS_SYSTEM ?= "raster"
+
+# xserver-common, x11-common
+VIRTUAL-RUNTIME_xserver_common ?= "x11-common"
+
+def _get_extra_rdepends(d):
+ gs = d.getVar('QT_GRAPHICS_SYSTEM', 1)
+ if gs == "opengl":
+ return "qt4-plugin-graphicssystems-glgraphicssystem"
+
+ return ""
+
+do_install () {
+ install -d ${D}/${sysconfdir}/X11/Xsession.d/
+ cfg_file=${D}/${sysconfdir}/X11/Xsession.d/85xqt-graphicssystem
+ echo "export QT_GRAPHICSSYSTEM=${QT_GRAPHICS_SYSTEM}" > $cfg_file
+ chmod +x $cfg_file
+}
+
+RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_xserver_common} ${@_get_extra_rdepends(d)}"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 11/25] qt4e.bbclass: add QT_BASE_NAME for use in recipes
2012-01-06 7:56 [CONSOLIDATED PULL 00/25] Various Patches Saul Wold
` (9 preceding siblings ...)
2012-01-06 7:56 ` [CONSOLIDATED PULL 10/25] qt4-graphics-system: add Saul Wold
@ 2012-01-06 7:56 ` Saul Wold
2012-01-06 7:56 ` [CONSOLIDATED PULL 12/25] qt4x11.bbclass: " Saul Wold
` (14 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2012-01-06 7:56 UTC (permalink / raw)
To: openembedded-core
From: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/classes/qt4e.bbclass | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/classes/qt4e.bbclass b/meta/classes/qt4e.bbclass
index d955aca..f3d5caa 100644
--- a/meta/classes/qt4e.bbclass
+++ b/meta/classes/qt4e.bbclass
@@ -2,6 +2,7 @@ DEPENDS_prepend = "${@["qt4-embedded ", ""][(d.getVar('PN', 1)[:12] == 'qt4-embe
inherit qmake2
+QT_BASE_NAME = "qt4-embedded"
QT_DIR_NAME = "qtopia"
QT_LIBINFIX = "E"
# override variables set by qmake-base to compile Qt/Embedded apps
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 12/25] qt4x11.bbclass: add QT_BASE_NAME for use in recipes
2012-01-06 7:56 [CONSOLIDATED PULL 00/25] Various Patches Saul Wold
` (10 preceding siblings ...)
2012-01-06 7:56 ` [CONSOLIDATED PULL 11/25] qt4e.bbclass: add QT_BASE_NAME for use in recipes Saul Wold
@ 2012-01-06 7:56 ` Saul Wold
2012-01-06 7:56 ` [CONSOLIDATED PULL 13/25] qt4-embedded.inc: use QT_BASE_NAME from qt4e.bbclass Saul Wold
` (13 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2012-01-06 7:56 UTC (permalink / raw)
To: openembedded-core
From: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/classes/qt4x11.bbclass | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/classes/qt4x11.bbclass b/meta/classes/qt4x11.bbclass
index 3f955d4..610397d 100644
--- a/meta/classes/qt4x11.bbclass
+++ b/meta/classes/qt4x11.bbclass
@@ -2,6 +2,7 @@ DEPENDS_prepend = "${@["qt4-x11-free ", ""][(d.getVar('BPN', True)[:12] == 'qt4-
inherit qmake2
+QT_BASE_NAME = "qt4"
QT_DIR_NAME = "qt4"
QT_LIBINFIX = ""
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 13/25] qt4-embedded.inc: use QT_BASE_NAME from qt4e.bbclass
2012-01-06 7:56 [CONSOLIDATED PULL 00/25] Various Patches Saul Wold
` (11 preceding siblings ...)
2012-01-06 7:56 ` [CONSOLIDATED PULL 12/25] qt4x11.bbclass: " Saul Wold
@ 2012-01-06 7:56 ` Saul Wold
2012-01-06 7:56 ` [CONSOLIDATED PULL 14/25] qt4-x11-free.inc: use QT_BASE_NAME from qt4x11.bbclass Saul Wold
` (12 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2012-01-06 7:56 UTC (permalink / raw)
To: openembedded-core
From: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/recipes-qt/qt4/qt4-embedded.inc | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index 39f7398..e472af5 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -2,9 +2,8 @@ DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is
SECTION = "libs"
HOMEPAGE = "http://qt.nokia.com"
DEPENDS += "directfb tslib"
-INC_PR = "r39"
+INC_PR = "r40"
-QT_BASE_NAME ?= "qt4-embedded"
QT_BASE_LIB ?= "libqt-embedded"
# Set necessary variables in the profile
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 14/25] qt4-x11-free.inc: use QT_BASE_NAME from qt4x11.bbclass
2012-01-06 7:56 [CONSOLIDATED PULL 00/25] Various Patches Saul Wold
` (12 preceding siblings ...)
2012-01-06 7:56 ` [CONSOLIDATED PULL 13/25] qt4-embedded.inc: use QT_BASE_NAME from qt4e.bbclass Saul Wold
@ 2012-01-06 7:56 ` Saul Wold
2012-01-06 7:56 ` [CONSOLIDATED PULL 15/25] initscripts: avoid mounting /sys if it is already mounted Saul Wold
` (11 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2012-01-06 7:56 UTC (permalink / raw)
To: openembedded-core
From: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/recipes-qt/qt4/qt4-x11-free.inc | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 5b93a98..40939de 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,13 +5,12 @@ HOMEPAGE = "http://qt.nokia.com"
SECTION = "x11/libs"
DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
-INC_PR = "r36"
+INC_PR = "r37"
QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
QT_GLFLAGS_qemux86 = "-opengl"
QT_GLFLAGS_qemuppc = "-opengl"
QT_CONFIG_FLAGS += "-no-xinerama -no-xkb"
-QT_BASE_NAME ?= "qt4"
QT_BASE_LIB ?= "libqt"
inherit qt4x11
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 15/25] initscripts: avoid mounting /sys if it is already mounted
2012-01-06 7:56 [CONSOLIDATED PULL 00/25] Various Patches Saul Wold
` (13 preceding siblings ...)
2012-01-06 7:56 ` [CONSOLIDATED PULL 14/25] qt4-x11-free.inc: use QT_BASE_NAME from qt4x11.bbclass Saul Wold
@ 2012-01-06 7:56 ` Saul Wold
2012-01-06 7:56 ` [CONSOLIDATED PULL 16/25] udev: ensure /dev/pts and /dev/shm does exists Saul Wold
` (10 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2012-01-06 7:56 UTC (permalink / raw)
To: openembedded-core
From: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
.../initscripts/initscripts-1.0/sysfs.sh | 4 ++--
meta/recipes-core/initscripts/initscripts_1.0.bb | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh b/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh
index be28bb3..bd87dcd 100644
--- a/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh
@@ -14,6 +14,6 @@ if [ -e /proc ] && ! [ -e /proc/mounts ]; then
mount -t proc proc /proc
fi
-if [ -e /sys ] && grep -q sysfs /proc/filesystems; then
- mount sysfs /sys -t sysfs
+if [ -e /sys ] && grep -q sysfs /proc/filesystems && ! [ -e /sys/class ]; then
+ mount -t sysfs sysfs /sys
fi
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index ffca817..98f5e9b 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Initscripts provide the basic system startup initialization scrip
SECTION = "base"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-PR = "r127"
+PR = "r128"
INHIBIT_DEFAULT_DEPS = "1"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 16/25] udev: ensure /dev/pts and /dev/shm does exists
2012-01-06 7:56 [CONSOLIDATED PULL 00/25] Various Patches Saul Wold
` (14 preceding siblings ...)
2012-01-06 7:56 ` [CONSOLIDATED PULL 15/25] initscripts: avoid mounting /sys if it is already mounted Saul Wold
@ 2012-01-06 7:56 ` Saul Wold
2012-01-06 7:56 ` [CONSOLIDATED PULL 17/25] udev: improve udev-cache robustness Saul Wold
` (9 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2012-01-06 7:56 UTC (permalink / raw)
To: openembedded-core
From: Otavio Salvador <otavio@ossystems.com.br>
---
meta/recipes-core/udev/udev/init | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/udev/udev/init b/meta/recipes-core/udev/udev/init
index bfbac0d..6a4464c 100644
--- a/meta/recipes-core/udev/udev/init
+++ b/meta/recipes-core/udev/udev/init
@@ -30,9 +30,10 @@ echo "Starting udev"
# mount the tmpfs on /dev, if not already done
LANG=C awk '$2 == "/dev" && ($3 == "tmpfs" || $3 == "devtmpfs") { exit 1 }' /proc/mounts && {
mount -n -o mode=0755 -t tmpfs none "/dev"
- mkdir -m 0755 /dev/pts
- mkdir -m 1777 /dev/shm
}
+[ -e /dev/pts ] || mkdir -m 0755 /dev/pts
+[ -e /dev/shm ] || mkdir -m 1777 /dev/shm
+
if [ -e /etc/dev.tar ]; then
(cd /; tar xf /etc/dev.tar 2>&1 | grep -v 'time stamp' || true)
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 17/25] udev: improve udev-cache robustness
2012-01-06 7:56 [CONSOLIDATED PULL 00/25] Various Patches Saul Wold
` (15 preceding siblings ...)
2012-01-06 7:56 ` [CONSOLIDATED PULL 16/25] udev: ensure /dev/pts and /dev/shm does exists Saul Wold
@ 2012-01-06 7:56 ` Saul Wold
2012-01-06 7:56 ` [CONSOLIDATED PULL 18/25] python-pycairo: fix for x32 Saul Wold
` (8 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2012-01-06 7:56 UTC (permalink / raw)
To: openembedded-core
From: Otavio Salvador <otavio@ossystems.com.br>
* allow udev-cache to be disabled at runtime (using
/etc/default/udev-cache);
* make cache invalidated if kernel, bootparams or device list
changes;
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/recipes-core/udev/udev.inc | 11 ++++++++++-
meta/recipes-core/udev/udev/init | 18 +++++++++++++++---
meta/recipes-core/udev/udev/udev-cache | 20 +++++++++++++++++---
meta/recipes-core/udev/udev/udev-cache.default | 4 ++++
4 files changed, 46 insertions(+), 7 deletions(-)
create mode 100644 meta/recipes-core/udev/udev/udev-cache.default
diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
index 0e571d6..65000b7 100644
--- a/meta/recipes-core/udev/udev.inc
+++ b/meta/recipes-core/udev/udev.inc
@@ -25,6 +25,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
file://network.sh \
file://local.rules \
file://udev-cache \
+ file://udev-cache.default \
file://init"
inherit autotools pkgconfig update-rc.d
@@ -58,7 +59,7 @@ FILES_libgudev = "${base_libdir}/libgudev*.so.* ${libdir}/libgudev*.so.*"
FILES_libgudev-dbg = "${base_libdir}/.debug/libgudev*.so.* ${libdir}/.debug/libgudev*.so.*"
FILES_libgudev-dev = "${includedir}/gudev* ${libdir}/libgudev*.so ${libdir}/libgudev*.la \
${libdir}/libgudev*.a ${libdir}/pkgconfig/gudev*.pc"
-FILES_udev-cache = "${sysconfdir}/init.d/udev-cache"
+FILES_udev-cache = "${sysconfdir}/init.d/udev-cache ${sysconfdir}/default/udev-cache"
FILES_udev-acl = "${base_libdir}/udev/udev-acl ${base_libdir}/udev/rules.d/70-acl.rules"
@@ -72,6 +73,14 @@ do_install_append () {
install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
install -m 0755 ${WORKDIR}/udev-cache ${D}${sysconfdir}/init.d/udev-cache
+ install -d ${D}${sysconfdir}/default
+ install -m 0755 ${WORKDIR}/udev-cache.default ${D}${sysconfdir}/default/udev-cache
+
+ touch ${D}${sysconfdir}/udev/saved.uname
+ touch ${D}${sysconfdir}/udev/saved.cmdline
+ touch ${D}${sysconfdir}/udev/saved.devices
+ touch ${D}${sysconfdir}/udev/saved.atags
+
install -d ${D}${sysconfdir}/udev/rules.d/
install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules
diff --git a/meta/recipes-core/udev/udev/init b/meta/recipes-core/udev/udev/init
index 6a4464c..3e6e062 100644
--- a/meta/recipes-core/udev/udev/init
+++ b/meta/recipes-core/udev/udev/init
@@ -14,6 +14,7 @@ export TZ=/etc/localtime
[ -d /sys/class ] || exit 1
[ -r /proc/mounts ] || exit 1
[ -x /sbin/udevd ] || exit 1
+[ -f /etc/default/udev-cache ] && . /etc/default/udev-cache
[ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf
kill_udevd() {
@@ -35,9 +36,20 @@ LANG=C awk '$2 == "/dev" && ($3 == "tmpfs" || $3 == "devtmpfs") { exit 1 }' /pro
[ -e /dev/shm ] || mkdir -m 1777 /dev/shm
-if [ -e /etc/dev.tar ]; then
- (cd /; tar xf /etc/dev.tar 2>&1 | grep -v 'time stamp' || true)
- not_first_boot=1
+if [ "$DEVCACHE" != "" ]; then
+ # Invalidate udev cache if the kernel or its bootargs/cmdline have changed
+ [ -x /bin/uname ] && /bin/uname -mrspv > /dev/shm/uname || touch /dev/shm/uname
+ [ -r /proc/cmdline ] && cat /proc/cmdline > /dev/shm/cmdline || touch /dev/shm/cmdline
+ [ -r /proc/devices ] && cat /proc/devices > /dev/shm/devices || touch /dev/shm/devices
+ [ -r /proc/atags ] && cat /proc/atags > /dev/shm/atags || touch /dev/shm/atags
+ if [ -e $DEVCACHE ] && \
+ cmp -s /dev/shm/uname /etc/udev/saved.uname && \
+ cmp -s /dev/shm/cmdline /etc/udev/saved.cmdline && \
+ cmp -s /dev/shm/devices /etc/udev/saved.devices && \
+ cmp -s /dev/shm/atags /etc/udev/saved.atags; then
+ (cd /; tar xf $DEVCACHE > /dev/null 2>&1)
+ not_first_boot=1
+ fi
fi
# make_extra_nodes
diff --git a/meta/recipes-core/udev/udev/udev-cache b/meta/recipes-core/udev/udev/udev-cache
index 77bbda6..d3a7dee 100644
--- a/meta/recipes-core/udev/udev/udev-cache
+++ b/meta/recipes-core/udev/udev/udev-cache
@@ -9,12 +9,26 @@
# Short-Description: cache /dev to speedup the udev next boot
### END INIT INFO
-[ -d /sys/class ] || exit 1
+export TZ=/etc/localtime
+
[ -r /proc/mounts ] || exit 1
[ -x /sbin/udevd ] || exit 1
+[ -d /sys/class ] || exit 1
+
+[ -f /etc/default/udev-cache ] && . /etc/default/udev-cache
-if [ ! -e /etc/dev.tar ]; then
- (cd /; tar cf /etc/dev.tar dev)
+if [ "$DEVCACHE" != "" ]; then
+ echo "Populating dev cache"
+ (cd /; tar cf $DEVCACHE dev)
+ mv /dev/shm/uname /etc/udev/saved.uname
+ mv /dev/shm/cmdline /etc/udev/saved.cmdline
+ mv /dev/shm/devices /etc/udev/saved.devices
+ mv /dev/shm/atags /etc/udev/saved.atags
+else
+ rm -f /dev/shm/uname
+ rm -f /dev/shm/cmdline
+ rm -f /dev/shm/devices
+ rm -f /dev/shm/atags
fi
exit 0
diff --git a/meta/recipes-core/udev/udev/udev-cache.default b/meta/recipes-core/udev/udev/udev-cache.default
new file mode 100644
index 0000000..5c4937a
--- /dev/null
+++ b/meta/recipes-core/udev/udev/udev-cache.default
@@ -0,0 +1,4 @@
+# Default for /etc/init.d/udev
+
+# Comment this out to disable device cache
+DEVCACHE="/etc/dev.tar"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 18/25] python-pycairo: fix for x32
2012-01-06 7:56 [CONSOLIDATED PULL 00/25] Various Patches Saul Wold
` (16 preceding siblings ...)
2012-01-06 7:56 ` [CONSOLIDATED PULL 17/25] udev: improve udev-cache robustness Saul Wold
@ 2012-01-06 7:56 ` Saul Wold
2012-01-06 7:56 ` [CONSOLIDATED PULL 19/25] libevent: fix compilation " Saul Wold
` (7 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2012-01-06 7:56 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Add the libdir to configure so that path like /usr/libx32 can work.
Also passing parallel make flags to the building process.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
.../python/python-pycairo_1.10.0.bb | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/python/python-pycairo_1.10.0.bb b/meta/recipes-devtools/python/python-pycairo_1.10.0.bb
index 812acfb..7d1b6c1 100644
--- a/meta/recipes-devtools/python/python-pycairo_1.10.0.bb
+++ b/meta/recipes-devtools/python/python-pycairo_1.10.0.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f2e071ab72978431b294a0d696327421 \
# cairo >= 1.8.8
DEPENDS = "cairo"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://cairographics.org/releases/py2cairo-${PV}.tar.bz2"
@@ -21,11 +21,11 @@ S = "${WORKDIR}/py2cairo-${PV}"
inherit distutils pkgconfig
do_configure() {
- BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} ./waf configure --prefix=${D}${prefix}
+ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} ./waf configure --prefix=${D}${prefix} --libdir=${D}${libdir}
}
do_compile() {
- ./waf build
+ ./waf build ${PARALLEL_MAKE}
}
do_install() {
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 19/25] libevent: fix compilation for x32
2012-01-06 7:56 [CONSOLIDATED PULL 00/25] Various Patches Saul Wold
` (17 preceding siblings ...)
2012-01-06 7:56 ` [CONSOLIDATED PULL 18/25] python-pycairo: fix for x32 Saul Wold
@ 2012-01-06 7:56 ` Saul Wold
2012-01-06 7:56 ` [CONSOLIDATED PULL 20/25] vte: update patch header Saul Wold
` (6 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2012-01-06 7:56 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Pull a patch from gentoo to avoid sysctl syscall which is not
defined for x32.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
.../libevent/libevent-2.0.16_fix_for_x32.patch | 47 ++++++++++++++++++++
meta/recipes-support/libevent/libevent_2.0.16.bb | 5 +-
2 files changed, 50 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-support/libevent/libevent/libevent-2.0.16_fix_for_x32.patch
diff --git a/meta/recipes-support/libevent/libevent/libevent-2.0.16_fix_for_x32.patch b/meta/recipes-support/libevent/libevent/libevent-2.0.16_fix_for_x32.patch
new file mode 100644
index 0000000..ef42863
--- /dev/null
+++ b/meta/recipes-support/libevent/libevent/libevent-2.0.16_fix_for_x32.patch
@@ -0,0 +1,47 @@
+Upstream-Status: pending
+
+Pulled the patch from gentoo: from here:
+http://sources2.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/libevent/files/libevent-2.0.16-sysctl.patch?revision=1.1
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
+2012/01/04
+
+From 358c745e5432f7648b6f8b3188f32b5551cbf9d6 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 8 Dec 2011 11:39:48 -0500
+Subject: [PATCH] check for sysctl before we use it
+
+Not all C libraries under Linux support the sysctl() func.
+---
+ arc4random.c | 2 +-
+ configure.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arc4random.c b/arc4random.c
+index 4833169..ef10fa8 100644
+--- a/arc4random.c
++++ b/arc4random.c
+@@ -166,7 +166,7 @@ arc4_seed_win32(void)
+ }
+ #endif
+
+-#if defined(_EVENT_HAVE_SYS_SYSCTL_H)
++#if defined(_EVENT_HAVE_SYS_SYSCTL_H) && defined(_EVENT_HAVE_SYSCTL)
+ #if _EVENT_HAVE_DECL_CTL_KERN && _EVENT_HAVE_DECL_KERN_RANDOM && _EVENT_HAVE_DECL_RANDOM_UUID
+ #define TRY_SEED_SYSCTL_LINUX
+ static int
+diff --git a/configure.in b/configure.in
+index da08cf4..4e24444 100644
+--- a/configure.in
++++ b/configure.in
+@@ -267,7 +267,7 @@ AC_HEADER_TIME
+
+ dnl Checks for library functions.
+ AC_CHECK_FUNCS([gettimeofday vasprintf fcntl clock_gettime strtok_r strsep])
+-AC_CHECK_FUNCS([getnameinfo strlcpy inet_ntop inet_pton signal sigaction strtoll inet_aton pipe eventfd sendfile mmap splice arc4random arc4random_buf issetugid geteuid getegid getprotobynumber setenv unsetenv putenv])
++AC_CHECK_FUNCS([getnameinfo strlcpy inet_ntop inet_pton signal sigaction strtoll inet_aton pipe eventfd sendfile mmap splice arc4random arc4random_buf issetugid geteuid getegid getprotobynumber setenv unsetenv putenv sysctl])
+
+ AC_CACHE_CHECK(
+ [for getaddrinfo],
+--
+1.7.6.1
diff --git a/meta/recipes-support/libevent/libevent_2.0.16.bb b/meta/recipes-support/libevent/libevent_2.0.16.bb
index 6da3d94..38d42f0 100644
--- a/meta/recipes-support/libevent/libevent_2.0.16.bb
+++ b/meta/recipes-support/libevent/libevent_2.0.16.bb
@@ -7,9 +7,10 @@ SECTION = "libs"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://LICENSE;md5=50aad300de703db62baae12146832b45"
-PR = "r0"
+PR = "r1"
-SRC_URI = "http://github.com/downloads/libevent/libevent/${BPN}-${PV}-stable.tar.gz"
+SRC_URI = "http://github.com/downloads/libevent/libevent/${BPN}-${PV}-stable.tar.gz \
+ file://libevent-2.0.16_fix_for_x32.patch"
SRC_URI[md5sum] = "899efcffccdb3d5111419df76e7dc8df"
SRC_URI[sha256sum] = "a578c7bcaf3bab1cc7924bd4d219f2ea621ab8c51dfc4f886e234b6ef4d38295"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 20/25] vte: update patch header
2012-01-06 7:56 [CONSOLIDATED PULL 00/25] Various Patches Saul Wold
` (18 preceding siblings ...)
2012-01-06 7:56 ` [CONSOLIDATED PULL 19/25] libevent: fix compilation " Saul Wold
@ 2012-01-06 7:56 ` Saul Wold
2012-01-06 7:56 ` [CONSOLIDATED PULL 21/25] automake-1.11.2: backport pkglibexec_SCRIPTS fix Saul Wold
` (5 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2012-01-06 7:56 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
No functional change here. Just updating the headers of the patch.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
meta/recipes-support/vte/vte/introspection.patch | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-support/vte/vte/introspection.patch b/meta/recipes-support/vte/vte/introspection.patch
index 76a841c..890ba31 100644
--- a/meta/recipes-support/vte/vte/introspection.patch
+++ b/meta/recipes-support/vte/vte/introspection.patch
@@ -1,3 +1,11 @@
+Upstream-Status: Inappropriate [configuration]
+
+Get this m4 file from introspection, so that we can configure without
+depending on the introspection package.
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
+2011/01/03
+
Index: vte-0.28.2/m4/introspection.m4
===================================================================
--- /dev/null
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 21/25] automake-1.11.2: backport pkglibexec_SCRIPTS fix
2012-01-06 7:56 [CONSOLIDATED PULL 00/25] Various Patches Saul Wold
` (19 preceding siblings ...)
2012-01-06 7:56 ` [CONSOLIDATED PULL 20/25] vte: update patch header Saul Wold
@ 2012-01-06 7:56 ` Saul Wold
2012-01-06 7:56 ` [CONSOLIDATED PULL 22/25] mc: remove not needed fix for automake 1.11.2 Saul Wold
` (4 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2012-01-06 7:56 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
automake-1.11.2 made variable libexec_SCRIPTS valid while
pkglibexec_SCRIPTS invalid. Both should be either allowed
or not allowed. This issue is fixed in the automake
developement branch, and now backported into our automake
1.11.2 recipe.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
...utomake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch | 118 ++++++++++++++++++++
meta/recipes-devtools/automake/automake_1.11.2.bb | 5 +-
2 files changed, 121 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-devtools/automake/automake/automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch
diff --git a/meta/recipes-devtools/automake/automake/automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch b/meta/recipes-devtools/automake/automake/automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch
new file mode 100644
index 0000000..f06dfe3
--- /dev/null
+++ b/meta/recipes-devtools/automake/automake/automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch
@@ -0,0 +1,118 @@
+Upstream-Status: Backport
+
+Backporting this patch from automake devel git tree.
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
+2012/01/05
+
+
+From 4e4dae500390d2ace681e4e4bc4c590ecdca38c6 Mon Sep 17 00:00:00 2001
+From: Stefano Lattarini <stefano.lattarini@gmail.com>
+Date: Tue, 03 Jan 2012 08:06:09 +0000
+Subject: install: pkglibexec_SCRIPTS is a valid prefix/primary combination
+
+It makes little sense for `libexec_SCRIPTS' to be accepted as valid
+while `pkglibexec_SCRIPTS' is not. So fix this inconsistency by
+explicitly allowing `pkglibexec_SCRIPTS' as well. It is worth
+noting that the inconsistency has been there for a long time,
+but only the quite recent commit `v1.11-373-g9ca6326' "Warnings
+about primary/prefix mismatch fixed and extended" has made it
+noisy enough to be noticed.
+
+* automake.in (handle_scripts): Also list `pkglibexec' among the
+prefixes valid for the `SCRIPTS' primary.
+* doc/automake.texi (Scripts): Likewise.
+* tests/primary-prefix-valid-couples.test: Update.
+* THANKS: Likewise.
+* NEWS: Likewise.
+
+Reported by Dennis Schridde on the automake list:
+<http://lists.gnu.org/archive/html/automake/2012-01/msg00002.html>
+---
+diff --git a/NEWS b/NEWS
+index 599f19f..2e572e4 100644
+--- a/NEWS
++++ b/NEWS
+@@ -82,6 +82,11 @@ New in 1.11.0a:
+
+ Bugs fixed in 1.11.0a:
+
++* Bugs introduced by 1.11.2:
++
++ - Automake now correctly recognizes the prefix/primary combination
++ `pkglibexec_SCRIPTS' as valid.
++
+ * Bugs introduced by 1.11:
+
+ - The `parallel-tests' test driver works around a GNU make 3.80 bug with
+diff --git a/THANKS b/THANKS
+index e9da06c..e9c6db8 100644
+--- a/THANKS
++++ b/THANKS
+@@ -78,6 +78,7 @@ David Pashley david@davidpashley.com
+ David Zaroski cz253@cleveland.Freenet.Edu
+ Dean Povey dpovey@wedgetail.com
+ Dennis J. Linse Dennis.J.Linse@SAIC.com
++Dennis Schridde devurandom@gmx.net
+ Derek R. Price derek.price@openavenue.com
+ Diab Jerius djerius@cfa.harvard.edu
+ Didier Cassirame faded@free.fr
+diff --git a/automake.in b/automake.in
+index a852195..a689b63 100644
+--- a/automake.in
++++ b/automake.in
+@@ -3091,7 +3091,7 @@ sub handle_scripts
+ # useful to sometimes distribute scripts verbatim. This happens
+ # e.g. in Automake itself.
+ &am_install_var ('-candist', 'scripts', 'SCRIPTS',
+- 'bin', 'sbin', 'libexec', 'pkgdata',
++ 'bin', 'sbin', 'libexec', 'pkglibexec', 'pkgdata',
+ 'noinst', 'check');
+ }
+
+diff --git a/doc/automake.texi b/doc/automake.texi
+index cebe084..0c4dc01 100644
+--- a/doc/automake.texi
++++ b/doc/automake.texi
+@@ -7099,11 +7099,12 @@ prefix as with other primaries.
+ @vindex sbin_SCRIPTS
+ @vindex libexec_SCRIPTS
+ @vindex pkgdata_SCRIPTS
++@vindex pkglibexec_SCRIPTS
+ @vindex noinst_SCRIPTS
+ @vindex check_SCRIPTS
+
+ Scripts can be installed in @code{bindir}, @code{sbindir},
+-@code{libexecdir}, or @code{pkgdatadir}.
++@code{libexecdir}, @code{pkglibexecdir}, or @code{pkgdatadir}.
+
+ Scripts that need not be installed can be listed in
+ @code{noinst_SCRIPTS}, and among them, those which are needed only by
+diff --git a/tests/primary-prefix-invalid-couples.test b/tests/primary-prefix-invalid-couples.test
+index 88e0817..c3d6471 100755
+--- a/tests/primary-prefix-invalid-couples.test
++++ b/tests/primary-prefix-invalid-couples.test
+@@ -79,7 +79,7 @@ for primary in $primaries; do
+ prefixes_ok='bin sbin libexec pkglibexec'
+ ;;
+ SCRIPTS)
+- prefixes_ok='bin sbin libexec pkgdata'
++ prefixes_ok='bin sbin libexec pkglibexec pkgdata'
+ ;;
+ DATA)
+ prefixes_ok='data dataroot pkgdata doc html dvi pdf ps
+diff --git a/tests/primary-prefix-valid-couples.test b/tests/primary-prefix-valid-couples.test
+index 36ff5d8..6eb4149 100755
+--- a/tests/primary-prefix-valid-couples.test
++++ b/tests/primary-prefix-valid-couples.test
+@@ -57,7 +57,7 @@ for p in lib pkglib; do
+ echo "${p}_LTLIBRARIES = libd-$p.la" >> Makefile.am
+ done
+
+-for p in bin sbin libexec pkgdata; do
++for p in bin sbin libexec pkglibexec pkgdata; do
+ echo "${p}_SCRIPTS = $p.sh" >> Makefile.am
+ done
+
+--
+cgit v0.9.0.2
diff --git a/meta/recipes-devtools/automake/automake_1.11.2.bb b/meta/recipes-devtools/automake/automake_1.11.2.bb
index 0a65f24..4534c39 100644
--- a/meta/recipes-devtools/automake/automake_1.11.2.bb
+++ b/meta/recipes-devtools/automake/automake_1.11.2.bb
@@ -36,9 +36,10 @@ PATHFIXPATCH_virtclass-nativesdk = ""
SRC_URI += "${PATHFIXPATCH} \
file://prefer-cpio-over-pax-for-ustar-archives.patch \
- file://python-libdir.patch"
+ file://python-libdir.patch \
+ file://automake_1.11.2_fix_for_pkglibexec_SCRIPTS.patch"
-PR = "r0"
+PR = "r1"
SRC_URI[md5sum] = "18194e804d415767bae8f703c963d456"
SRC_URI[sha256sum] = "4f46d1f9380c8a3506280750f630e9fc915cb1a435b724be56b499d016368718"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 22/25] mc: remove not needed fix for automake 1.11.2
2012-01-06 7:56 [CONSOLIDATED PULL 00/25] Various Patches Saul Wold
` (20 preceding siblings ...)
2012-01-06 7:56 ` [CONSOLIDATED PULL 21/25] automake-1.11.2: backport pkglibexec_SCRIPTS fix Saul Wold
@ 2012-01-06 7:56 ` Saul Wold
2012-01-06 7:56 ` [CONSOLIDATED PULL 23/25] systemtap: " Saul Wold
` (3 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2012-01-06 7:56 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
The pkglibexec_SCRIPTS pair is valid. the 1.11.2 introduced an bug
to make it invalid. Now the automake 1.11.2 recipe is fixed, so
no need for this fix for mc recipe.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
.../mc/files/fix_for_automake_1.11.2.patch | 69 --------------------
meta/recipes-extended/mc/mc_4.8.1.bb | 3 +-
2 files changed, 1 insertions(+), 71 deletions(-)
delete mode 100644 meta/recipes-extended/mc/files/fix_for_automake_1.11.2.patch
diff --git a/meta/recipes-extended/mc/files/fix_for_automake_1.11.2.patch b/meta/recipes-extended/mc/files/fix_for_automake_1.11.2.patch
deleted file mode 100644
index 9b610ca..0000000
--- a/meta/recipes-extended/mc/files/fix_for_automake_1.11.2.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Upstream-Status: Pending
-
-As Nitin said, "automake version 1.11.2 has made use of dir variables
-more strict, the pkglibexec var can not have SCRIPTS suffix. Using pkgdata
-instead."
-
-Fixes this error:
-| contrib/Makefile.am:10: `pkglibexecdir' is not a legitimate directory for `SCRIPTS'
-| autoreconf: automake failed with exit status: 1
-NOTE: package mc-4.8.1-r0: task do_configure: Failed
-
-Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
-Wed Jan 4 17:04:47 CST 2012
-
-diff -Nru mc-4.8.1.orig//contrib/Makefile.am mc-4.8.1/contrib/Makefile.am
---- mc-4.8.1.orig//contrib/Makefile.am 2011-11-30 15:44:40.000000000 +0800
-+++ mc-4.8.1/contrib/Makefile.am 2012-01-04 17:03:16.926911680 +0800
-@@ -7,7 +7,7 @@
- SCRIPTS_IN = mc.csh.in mc.sh.in mc-wrapper.csh.in mc-wrapper.sh.in
- SCRIPTS_OUT = mc.csh mc.sh mc-wrapper.csh mc-wrapper.sh
-
--pkglibexec_SCRIPTS = $(SCRIPTS_OUT)
-+pkgdata_SCRIPTS = $(SCRIPTS_OUT)
- pkglibexecdir = $(libexecdir)/@PACKAGE@
-
- cfgdir = $(sysconfdir)/@PACKAGE@
-diff -Nru mc-4.8.1.orig//contrib/Makefile.in mc-4.8.1/contrib/Makefile.in
---- mc-4.8.1.orig//contrib/Makefile.in 2011-12-13 18:10:52.000000000 +0800
-+++ mc-4.8.1/contrib/Makefile.in 2012-01-04 17:03:16.926911680 +0800
-@@ -112,7 +112,7 @@
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(cfgdir)"
--SCRIPTS = $(pkglibexec_SCRIPTS)
-+SCRIPTS = $(pkgdata_SCRIPTS)
- AM_V_GEN = $(am__v_GEN_$(V))
- am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
- am__v_GEN_0 = @echo " GEN " $@;
-@@ -372,7 +372,7 @@
- noinst_DATA = README.xterm
- SCRIPTS_IN = mc.csh.in mc.sh.in mc-wrapper.csh.in mc-wrapper.sh.in
- SCRIPTS_OUT = mc.csh mc.sh mc-wrapper.csh mc-wrapper.sh
--pkglibexec_SCRIPTS = $(SCRIPTS_OUT)
-+pkgdata_SCRIPTS = $(SCRIPTS_OUT)
- cfgdir = $(sysconfdir)/@PACKAGE@
- cfg_DATA = \
- $(LIBFILES_ADD)
-@@ -417,10 +417,10 @@
- $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(am__aclocal_m4_deps):
--install-pkglibexecSCRIPTS: $(pkglibexec_SCRIPTS)
-+install-pkglibexecSCRIPTS: $(pkgdata_SCRIPTS)
- @$(NORMAL_INSTALL)
- test -z "$(pkglibexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibexecdir)"
-- @list='$(pkglibexec_SCRIPTS)'; test -n "$(pkglibexecdir)" || list=; \
-+ @list='$(pkgdata_SCRIPTS)'; test -n "$(pkglibexecdir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-@@ -445,7 +445,7 @@
-
- uninstall-pkglibexecSCRIPTS:
- @$(NORMAL_UNINSTALL)
-- @list='$(pkglibexec_SCRIPTS)'; test -n "$(pkglibexecdir)" || exit 0; \
-+ @list='$(pkgdata_SCRIPTS)'; test -n "$(pkglibexecdir)" || exit 0; \
- files=`for p in $$list; do echo "$$p"; done | \
- sed -e 's,.*/,,;$(transform)'`; \
- test -n "$$list" || exit 0; \
diff --git a/meta/recipes-extended/mc/mc_4.8.1.bb b/meta/recipes-extended/mc/mc_4.8.1.bb
index b66c170..78bbc9d 100644
--- a/meta/recipes-extended/mc/mc_4.8.1.bb
+++ b/meta/recipes-extended/mc/mc_4.8.1.bb
@@ -6,10 +6,9 @@ SECTION = "console/utils"
DEPENDS = "ncurses glib-2.0"
RDEPENDS_${PN} = "ncurses-terminfo"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2"
-SRC_URI += "file://fix_for_automake_1.11.2.patch"
SRC_URI[md5sum] = "7d60c87d87b359831d976fa28034935e"
SRC_URI[sha256sum] = "8f9bd09750c65a7786197a8f7e5a10a6dabf8c8737c564079ca393d8ecaf944d"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 23/25] systemtap: remove not needed fix for automake 1.11.2
2012-01-06 7:56 [CONSOLIDATED PULL 00/25] Various Patches Saul Wold
` (21 preceding siblings ...)
2012-01-06 7:56 ` [CONSOLIDATED PULL 22/25] mc: remove not needed fix for automake 1.11.2 Saul Wold
@ 2012-01-06 7:56 ` Saul Wold
2012-01-06 7:56 ` [CONSOLIDATED PULL 24/25] xorg-driver: add xf86-video-fbdev from meta-openembedded Saul Wold
` (2 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2012-01-06 7:56 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
The pkglibexec_SCRIPTS pair is valid. the 1.11.2 introduced an bug
to make it invalid. Now the automake 1.11.2 recipe is fixed, so
no need for this fix for systemtap recipe.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
.../systemtap/fix_for_automake_1.11.2.patch | 46 --------------------
meta/recipes-kernel/systemtap/systemtap_git.bb | 6 +--
2 files changed, 2 insertions(+), 50 deletions(-)
delete mode 100644 meta/recipes-kernel/systemtap/systemtap/fix_for_automake_1.11.2.patch
diff --git a/meta/recipes-kernel/systemtap/systemtap/fix_for_automake_1.11.2.patch b/meta/recipes-kernel/systemtap/systemtap/fix_for_automake_1.11.2.patch
deleted file mode 100644
index 99e72b2..0000000
--- a/meta/recipes-kernel/systemtap/systemtap/fix_for_automake_1.11.2.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Upstream-Status: Pending
-
-automake version 1.11.2 has made use of dir variables more strict.
-The pkglibexec var can not have SCRIPTS suffix. Using pkgdata
-instead.
-
-Fixes this error:
-| Makefile.am:25: `pkglibexecdir' is not a legitimate directory for `SCRIPTS'
-| autoreconf: automake failed with exit status: 1
-| ERROR: autoreconf execution failed.
-NOTE: package systemtap-1.6+git1+820f2d22fc47fad6e09ba886efb9b91e1247cb39-r0: task do_configure: Failed
-
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
-2011/12/29
-
-Index: git/Makefile.am
-===================================================================
---- git.orig/Makefile.am
-+++ git/Makefile.am
-@@ -22,7 +22,7 @@ dtrace.1 stap-merge.1\
- stappaths.7
-
- bin_SCRIPTS = stap-report
--pkglibexec_SCRIPTS = stap-env
-+pkgdata_SCRIPTS = stap-env
- oldinclude_HEADERS = includes/sys/sdt.h includes/sys/sdt-config.h
-
- bin_PROGRAMS =
-@@ -41,7 +41,7 @@ if BUILD_SERVER
- man_MANS += stap-server.8
- pkglibexec_PROGRAMS += stap-serverd stap-gen-cert
- bin_SCRIPTS += stap-server
--pkglibexec_SCRIPTS += stap-start-server stap-stop-server
-+pkgdata_SCRIPTS += stap-start-server stap-stop-server
- endif
- endif
-
-@@ -127,7 +127,7 @@ install-scripts: install-binSCRIPTS inst
- for f in $(bin_SCRIPTS); do \
- sed -i -e "s,\$${PKGLIBEXECDIR},$(pkglibexecdir)/," $(DESTDIR)$(bindir)/$$f; \
- done
-- for f in $(pkglibexec_SCRIPTS); do \
-+ for f in $(pkgdata_SCRIPTS); do \
- sed -i -e "/INSTALL-HOOK/d;s,sysconfdir=.*,sysconfdir=$(sysconfdir),;s,pkglibexecdir=.*,pkglibexecdir=$(pkglibexecdir)/,;s,localstatedir=.*,localstatedir=$(localstatedir),;s,\$${PKGLIBEXECDIR},$(pkglibexecdir)/," $(DESTDIR)$(pkglibexecdir)/$$f; \
- done
- endif
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
index 1c64be6..ebacc43 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap_git.bb
@@ -5,12 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
DEPENDS = "elfutils sqlite3"
SRCREV = "820f2d22fc47fad6e09ba886efb9b91e1247cb39"
-PR = "r1"
+PR = "r2"
PV = "1.6+git${SRCPV}"
-SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git \
- file://fix_for_automake_1.11.2.patch \
- "
+SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git"
EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \
ac_cv_file__usr_include_nss=no \
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 24/25] xorg-driver: add xf86-video-fbdev from meta-openembedded
2012-01-06 7:56 [CONSOLIDATED PULL 00/25] Various Patches Saul Wold
` (22 preceding siblings ...)
2012-01-06 7:56 ` [CONSOLIDATED PULL 23/25] systemtap: " Saul Wold
@ 2012-01-06 7:56 ` Saul Wold
2012-01-06 7:56 ` [CONSOLIDATED PULL 25/25] x11-common: remove extraneous BSP customizations Saul Wold
2012-01-06 12:22 ` [CONSOLIDATED PULL 00/25] Various Patches Richard Purdie
25 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2012-01-06 7:56 UTC (permalink / raw)
To: openembedded-core
From: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
.../xorg-driver/xf86-video-fbdev_0.4.2.bb | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb b/meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb
new file mode 100644
index 0000000..a3a4796
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb
@@ -0,0 +1,8 @@
+require xorg-driver-video.inc
+LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8"
+
+DESCRIPTION = "X.Org X server -- fbdev display driver"
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "53a533d9e0c2da50962282526bace074"
+SRC_URI[sha256sum] = "93b271b4b41d7e5ca108849a583b9523e96c51813d046282285355b7001f82d5"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 25/25] x11-common: remove extraneous BSP customizations
2012-01-06 7:56 [CONSOLIDATED PULL 00/25] Various Patches Saul Wold
` (23 preceding siblings ...)
2012-01-06 7:56 ` [CONSOLIDATED PULL 24/25] xorg-driver: add xf86-video-fbdev from meta-openembedded Saul Wold
@ 2012-01-06 7:56 ` Saul Wold
2012-01-06 12:22 ` [CONSOLIDATED PULL 00/25] Various Patches Richard Purdie
25 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2012-01-06 7:56 UTC (permalink / raw)
To: openembedded-core
From: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
.../x11-common/x11-common/etc/X11/Xserver | 24 --------------------
1 files changed, 0 insertions(+), 24 deletions(-)
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver
index 57923e6..cea733e 100644
--- a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver
+++ b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver
@@ -18,14 +18,6 @@ fi
. /etc/profile
-module_id() {
- ## used to read from assets, but sometimes assets is corrupted
- # grep "Module ID" /proc/hal/assets | sed "s/.*://"
- ## used to read from /proc/hal/model, but that is removed in 2.6
- # echo ' iPAQ' `cat /proc/hal/model`
- awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
-}
-
ARGS=" -br -pn"
if [ "$XSERVER" != "/usr/bin/Xorg" ]; then
@@ -44,22 +36,6 @@ if [ "$XSERVER" != "/usr/bin/Xorg" ]; then
ARGS="$ARGS -mouse tslib"
fi
- # start off server in conventional location.
- case `module_id` in
- "Generic OMAP1510/1610/1710")
- ARGS="$ARGS -mouse /dev/input/event0" ;;
- "Compulab CM-x270")
- #modprobe mbxfb
- #ARGS="$ARGS -fb /dev/fb1"
- ;;
- "Nokia N800")
- ARGS="$ARGS -mouse tslib" ;;
- "Nokia 770")
- ARGS="$ARGS -mouse tslib" ;;
- *)
- ;;
- esac
-
ARGS="$ARGS -screen ${DISPLAY_WIDTH_PIXELS}x${DISPLAY_HEIGHT_PIXELS}@${DISPLAY_ORIENTATION}x${DISPLAY_BPP}"
if [ ! -z "$DISPLAY_DPI" ]; then
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [CONSOLIDATED PULL 00/25] Various Patches
2012-01-06 7:56 [CONSOLIDATED PULL 00/25] Various Patches Saul Wold
` (24 preceding siblings ...)
2012-01-06 7:56 ` [CONSOLIDATED PULL 25/25] x11-common: remove extraneous BSP customizations Saul Wold
@ 2012-01-06 12:22 ` Richard Purdie
2012-01-06 14:40 ` Koen Kooi
25 siblings, 1 reply; 28+ messages in thread
From: Richard Purdie @ 2012-01-06 12:22 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, 2012-01-05 at 23:56 -0800, Saul Wold wrote:
> The following changes since commit 4a85312568a6bb052cc511c15b4ae842ff7f8e59:
>
> image-mklibs/package_ipk: Remove bashisms (2012-01-05 22:26:20 +0000)
>
> are available in the git repository at:
> git://git.openembedded.org/openembedded-core-contrib sgw/stage
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
>
> Andrea Adami (2):
> xorg-driver: add xf86-video-fbdev from meta-openembedded
> x11-common: remove extraneous BSP customizations
>
> Bruce Ashfield (3):
> kern-tools: import flexible branching support
> linux-yocto: bump kernel version to v3.0.14
> linux-yocto: use src_patches for out of tree kernel feature support
>
> Nitin A Kamble (6):
> python-pycairo: fix for x32
> libevent: fix compilation for x32
> vte: update patch header
> automake-1.11.2: backport pkglibexec_SCRIPTS fix
> mc: remove not needed fix for automake 1.11.2
> systemtap: remove not needed fix for automake 1.11.2
>
> Otavio Salvador (8):
> qt4-graphics-system: add
> qt4e.bbclass: add QT_BASE_NAME for use in recipes
> qt4x11.bbclass: add QT_BASE_NAME for use in recipes
> qt4-embedded.inc: use QT_BASE_NAME from qt4e.bbclass
> qt4-x11-free.inc: use QT_BASE_NAME from qt4x11.bbclass
> initscripts: avoid mounting /sys if it is already mounted
> udev: ensure /dev/pts and /dev/shm does exists
>
> Paul Eggleton (4):
> buildhistory: add script to check for significant changes
> classes/buildhistory: add hostname to commit message
> classes/buildhistory: make the package version backwards error
> non-fatal
> classes/buildhistory: remove redundant package history checking stub
>
> Saul Wold (2):
> util-linux: Update patch for non-GPLv3
> gnutls: remove gettext patch for non-GPLv3
I took all the above
> udev: improve udev-cache robustness
but I didn't take this. We need a better solution.
Cheers,
Richard
^ permalink raw reply [flat|nested] 28+ messages in thread