ubiquity

Merge lp:~xnox/ubiquity/parallel into lp:ubiquity

  1. parallel
  2. Merge into trunk
Proposed by Dimitri John Ledkov
Status: Rejected
Rejected by: Dimitri John Ledkov
Proposed branch: lp:~xnox/ubiquity/parallel
Merge into: lp:ubiquity
Diff against target: 116 lines (+22/-24)
5 files modified
d-i/Makefile (+12/-19)
d-i/update-control (+1/-0)
debian/changelog (+6/-0)
debian/control (+1/-1)
debian/rules (+2/-4)
To merge this branch: bzr merge lp:~xnox/ubiquity/parallel
Reviewer Review Type Date Requested Status
Dimitri John Ledkov Needs Resubmitting
Review via email: mp+173730@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

meh

review: Disapprove
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

The development of ubiquity has moved to git, still hosted on launchpad. If this merge proposal is still relevant, please resubmit it against the git branches found at https://code.launchpad.net/ubiquity

Sorry for any inconvenience caused.

review: Needs Resubmitting

Unmerged revisions

5953. By Dimitri John Ledkov

Use GNU parallel, to speed up d-i build and checks.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'd-i/Makefile'
2--- d-i/Makefile 2010-02-12 20:27:37 +0000
3+++ d-i/Makefile 2013-07-09 14:21:27 +0000
4@@ -4,6 +4,14 @@
5 LISTDIR := lists
6 SOURCEDIR := source
7
8+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
9+NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
10+else
11+NUMJOBS = 1
12+endif
13+
14+PARALLEL = parallel --gnu -k -j $(NUMJOBS)
15+
16 ifndef DEB_HOST_ARCH
17 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
18 endif
19@@ -36,34 +44,19 @@
20 rm -rf $(SOURCEDIR)
21
22 build:
23- set -e; for package in $(PACKAGES); do \
24- if [ -d "$(SOURCEDIR)/$$package" ]; then \
25- (cd "$(SOURCEDIR)/$$package" && \
26- debian/rules build) || exit 1; \
27- fi; \
28- done
29+ $(PARALLEL) make -f debian/rules -C $(SOURCEDIR)/{} build ::: $(PACKAGES)
30
31 clean:
32 rm -rf $(APTDIR)
33- for dir in $(SOURCEDIR)/*; do \
34- if [ "$${dir##*/}" != console-setup ] && [ -d "$$dir" ]; then \
35- (cd "$$dir" && debian/rules clean) || exit 1; \
36- fi; \
37- done
38+ $(PARALLEL) make -f debian/rules -C {} clean ::: $(filter-out $(SOURCEDIR)/console-setup $(SOURCEDIR)/README, $(wildcard $(SOURCEDIR)/*))
39 $(MAKE) -C $(SOURCEDIR)/console-setup/Keyboard clean
40 rm -f $(SOURCEDIR)/*.deb $(SOURCEDIR)/*.udeb
41 rm -f manifest.old
42 rm -rf udeb-control templates
43
44 install:
45- set -e; for package in $(PACKAGES); do \
46- if [ -d "$(SOURCEDIR)/$$package" ]; then \
47- (export NO_PKG_MANGLE=1; \
48- cd "$(SOURCEDIR)/$$package" && \
49- debian/rules binary && \
50- rm -rf debian/*/DEBIAN) || exit 1; \
51- fi; \
52- done
53+ $(PARALLEL) 'export NO_PKG_MANGLE=1 && make -f debian/rules -C $(SOURCEDIR)/{} binary' ::: $(PACKAGES)
54+ $(PARALLEL) rm -rf $(SOURCEDIR)/{}/debian/*/DEBIAN ::: $(PACKAGES)
55 rm -rf udeb-control templates
56 mkdir -p udeb-control
57 set -e; for udeb in $(SOURCEDIR)/*.udeb; do \
58
59=== modified file 'd-i/update-control'
60--- d-i/update-control 2013-07-01 11:32:25 +0000
61+++ d-i/update-control 2013-07-09 14:21:27 +0000
62@@ -52,6 +52,7 @@
63 'liblocale-gettext-perl',
64 'gobject-introspection',
65 'pep8',
66+ 'parallel',
67 'pkg-config',
68 'po-debconf (>= 1.0)',
69 'pyflakes (>= 0.7.2)',
70
71=== modified file 'debian/changelog'
72--- debian/changelog 2013-07-09 11:22:26 +0000
73+++ debian/changelog 2013-07-09 14:21:27 +0000
74@@ -1,3 +1,9 @@
75+ubiquity (2.15.9ubuntu1) UNRELEASED; urgency=low
76+
77+ * Use GNU parallel, to speed up d-i build and checks.
78+
79+ -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> Tue, 09 Jul 2013 15:18:48 +0100
80+
81 ubiquity (2.15.9) saucy; urgency=low
82
83 [ Dmitrijs Ledkovs ]
84
85=== modified file 'debian/control'
86--- debian/control 2013-07-01 11:32:25 +0000
87+++ debian/control 2013-07-09 14:21:27 +0000
88@@ -3,7 +3,7 @@
89 Priority: optional
90 Maintainer: Ubuntu Installer Team <ubuntu-installer@lists.ubuntu.com>
91 Uploaders: Colin Watson <cjwatson@ubuntu.com>, Evan Dandrea <ev@ubuntu.com>
92-Build-Depends: apt, autopoint, bf-utf-source, dctrl-tools, debconf (>= 1.5.43), debconf-utils, debhelper (>= 9), devio, dh-autoreconf, dh-di (>= 3), dpkg-dev (>= 1.15.7), gir1.2-gnomekeyring-1.0, gir1.2-soup-2.4, gir1.2-timezonemap-1.0, gir1.2-webkit-3.0, gir1.2-xkl-1.0, gnome-icon-theme, gobject-introspection, intltool (>= 0.40.0), intltool-debian (>= 0.30+20040212), iso-codes, isoquery, keymapper (>= 0.5.3-7), libbogl-dev, libcairo2-dev, libdebconfclient0-dev (>= 0.68), libdebian-installer4-dev (>= 0.76), libgirepository1.0-dev, libglib2.0-dev, libgtk-3-dev, libindicator3-dev, libiw-dev (>= 27+28pre9), liblocale-gettext-perl, libparted-dev, libparted0-dev (>= 2.2), locales, pep8, pkg-config, po-debconf (>= 1.0), pyflakes (>= 0.7.2), python-gi-dev, python-scour, python3-all (>= 3.1), python3-apt (>= 0.7.100.3~), python3-cairo, python3-dbus, python3-gi, python3-gi-cairo, python3-mock (>= 0.7.0), python3-oauthlib, python3-pyicu (>= 1.0), tzdata, ubuntu-artwork, udev, wget, xkb-data (>= 0.9), xkb-data-i18n, xvfb
93+Build-Depends: apt, autopoint, bf-utf-source, dctrl-tools, debconf (>= 1.5.43), debconf-utils, debhelper (>= 9), devio, dh-autoreconf, dh-di (>= 3), dpkg-dev (>= 1.15.7), gir1.2-gnomekeyring-1.0, gir1.2-soup-2.4, gir1.2-timezonemap-1.0, gir1.2-webkit-3.0, gir1.2-xkl-1.0, gnome-icon-theme, gobject-introspection, intltool (>= 0.40.0), intltool-debian (>= 0.30+20040212), iso-codes, isoquery, keymapper (>= 0.5.3-7), libbogl-dev, libcairo2-dev, libdebconfclient0-dev (>= 0.68), libdebian-installer4-dev (>= 0.76), libgirepository1.0-dev, libglib2.0-dev, libgtk-3-dev, libindicator3-dev, libiw-dev (>= 27+28pre9), liblocale-gettext-perl, libparted-dev, libparted0-dev (>= 2.2), locales, parallel, pep8, pkg-config, po-debconf (>= 1.0), pyflakes (>= 0.7.2), python-gi-dev, python-scour, python3-all (>= 3.1), python3-apt (>= 0.7.100.3~), python3-cairo, python3-dbus, python3-gi, python3-gi-cairo, python3-mock (>= 0.7.0), python3-oauthlib, python3-pyicu (>= 1.0), tzdata, ubuntu-artwork, udev, wget, xkb-data (>= 0.9), xkb-data-i18n, xvfb
94 Standards-Version: 3.9.4
95 X-Python3-Version: >= 3.1
96 XS-Testsuite: autopkgtest
97
98=== modified file 'debian/rules'
99--- debian/rules 2013-06-12 16:41:04 +0000
100+++ debian/rules 2013-07-09 14:21:27 +0000
101@@ -43,13 +43,11 @@
102
103 check:
104 # Sanity-check before upload.
105- find -name debian -prune -o -name \*.py -print | xargs py3compile
106+ find -name debian -prune -o -name \*.py -print | parallel --gnu py3compile
107 find -type f \( -name \*.pyc -o -name \*.pyo \) -print0 | xargs -0r rm -f
108 find -name __pycache__ -print0 | xargs -0r rm -rf
109 # Check the syntax of any shell scripts.
110- set -e; for x in $$(find -type f \! -name \*.po \! -name \*.pot -print0 | xargs -0 file -i | grep "text/x-shellscript" | cut -d':' -f1); do \
111- sh -n $$x; \
112- done
113+ find -type f \! -name \*.po \! -name \*.pot -print0 | xargs -0 file -i | grep "text/x-shellscript" | cut -d':' -f1 | parallel --gnu sh -n
114 # Check the syntax of any Python scripts.
115 ./tests/run-pyflakes
116 ./tests/run-pep8

Subscribers

People subscribed via source and target branches

to status/vote changes: