[SCM] dpkg's main repository branch, master, updated. 1.14.14-18-g9e5cec4
The branch, master has been updated
via 9e5cec40fd27da067687c1e36aa30f18b1440cb5 (commit)
from 9ca339d341ab39043d26be6baa028b6b9012c747 (commit)
- Shortlog
9e5cec4 dpkg-buildpackage: Fix build message for non-gz compressed sources
Summary of changes:
ChangeLog|5 +
debian/changelog |2 ++
scripts/dpkg-buildpackage.pl |9 +
3 files changed, 12 insertions(+), 4 deletions(-)
---
Details of changes:
commit 9e5cec40fd27da067687c1e36aa30f18b1440cb5
Author: Guillem Jover [EMAIL PROTECTED]
Date: Tue Jan 1 20:25:39 2008 +0200
dpkg-buildpackage: Fix build message for non-gz compressed sources
Closes: #458519
diff --git a/ChangeLog b/ChangeLog
index 4243fd9..78edaf9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-01 Guillem Jover [EMAIL PROTECTED]
+
+ * scripts/dpkg-buildpackage.pl: Use Dpkg::Compression. Use $comp_regex
+ to match compressed diffs and tarballs.
+
2008-01-01 Samuel Thibault [EMAIL PROTECTED]
* utils/start-stop-daemon.c (do_stop): Do not print 'failed to kill'
diff --git a/debian/changelog b/debian/changelog
index d08e289..df02cec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ dpkg (1.14.15) UNRELEASED; urgency=low
* Do not print 'failed to kill' warning in start-stop-daemon when polling
the pid. Closes: #157305, #352554
Thanks to Samuel Thibault.
+ * Properly print build message in dpkg-buildpackage for lzma and bzip2
+compressed sources. Closes: #458519
[ Updated dpkg translations ]
* Norwegian Bokmål (Hans Fredrik Nordhaug). Closes: #457918
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 9d07efa..dfa0041 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -11,6 +11,7 @@ use Dpkg::Gettext;
use Dpkg::ErrorHandling qw(warning error failure syserr subprocerr usageerr
$warnable_error);
use Dpkg::BuildOptions;
+use Dpkg::Compression;
push (@INC, $dpkglibdir);
require 'controllib.pl';
@@ -438,9 +439,9 @@ sub fileomitted {
my $srcmsg;
if (fileomitted '\.deb') {
# source only upload
-if (fileomitted '\.diff\.gz') {
+if (fileomitted \.diff\.$comp_regex) {
$srcmsg = _g('source only upload: Debian-native package');
-} elsif (fileomitted '\.orig\.tar\.gz') {
+} elsif (fileomitted \.orig\.tar\.$comp_regex) {
$srcmsg = _g('source only, diff-only upload (original source NOT
included)');
} else {
$srcmsg = _g('source only upload (original source is included)');
@@ -449,9 +450,9 @@ if (fileomitted '\.deb') {
$srcmsg = _g('full upload (original source is included)');
if (fileomitted '\.dsc') {
$srcmsg = _g('binary only upload (no source included)');
-} elsif (fileomitted '\.diff\.gz') {
+} elsif (fileomitted \.diff\.$comp_regex) {
$srcmsg = _g('full upload; Debian-native package (full source is
included)');
-} elsif (fileomitted '\.orig\.tar\.gz') {
+} elsif (fileomitted \.orig\.tar\.$comp_regex) {
$srcmsg = _g('binary and diff upload (original source NOT included)');
} else {
$srcmsg = _g('full upload (original source is included)');
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
[SCM] dpkg's main repository branch, master, updated. 1.14.14-24-g19173d2
The branch, master has been updated via 19173d231c66bd222631a4a86033aa36d88d01a4 (commit) via 0f2b6521146c96e83387ce854425d21a4f5979fc (commit) via 9bcc24992c7f61ba5ad230f9214554d90dde574f (commit) via c04a83af4a07f5efa7bd56c82183f81b75fd5c7c (commit) via 47d1d738543c63564f60e885d57639f6766424f5 (commit) via 73aa35745d57c6c682fe742642ce1d7639f1194e (commit) from 9e5cec40fd27da067687c1e36aa30f18b1440cb5 (commit) - Shortlog 19173d2 Add lzma to dpkg-dev Depends 0f2b652 s-s-d: Remove redundant function declarations 9bcc249 Add a 'struct stat' forward declaration to fix a compilation warning c04a83a Add missing PRINTFFORMAT attribute to few function declarations 47d1d73 Use NONRETURNING and PRINTFFORMAT instead of NONRETURNPRINTFFORMAT attribute 73aa357 Promote bzip2 Recommends to Depends for dpkg-dev Summary of changes: ChangeLog | 31 +++ debian/changelog |2 ++ debian/control|4 ++-- lib/dpkg-db.h |2 +- lib/dpkg.h| 25 + src/main.h|2 ++ utils/start-stop-daemon.c |9 + 7 files changed, 52 insertions(+), 23 deletions(-) --- Details of changes: commit 19173d231c66bd222631a4a86033aa36d88d01a4 Author: Guillem Jover [EMAIL PROTECTED] Date: Wed Jan 2 07:24:24 2008 +0200 Add lzma to dpkg-dev Depends diff --git a/debian/changelog b/debian/changelog index 6681e7f..3f2dea3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,7 @@ dpkg (1.14.15) UNRELEASED; urgency=low * Properly print build message in dpkg-buildpackage for lzma and bzip2 compressed sources. Closes: #458519 * Promote bzip2 Recommends to Depends for dpkg-dev. Closes: #458521 + * Add lzma to dpkg-dev Depends. [ Updated dpkg translations ] * Norwegian Bokmål (Hans Fredrik Nordhaug). Closes: #457918 diff --git a/debian/control b/debian/control index 284964e..9ff6986 100644 --- a/debian/control +++ b/debian/control @@ -34,7 +34,7 @@ Package: dpkg-dev Section: utils Priority: optional Architecture: all -Depends: dpkg (= 1.14.6), perl5, perl-modules, cpio (= 2.4.2-2), bzip2, +Depends: dpkg (= 1.14.6), perl5, perl-modules, cpio (= 2.4.2-2), bzip2, lzma, patch (= 2.2-1), make, binutils Recommends: gcc | c-compiler Suggests: gnupg, debian-keyring commit 0f2b6521146c96e83387ce854425d21a4f5979fc Author: Guillem Jover [EMAIL PROTECTED] Date: Wed Jan 2 06:52:46 2008 +0200 s-s-d: Remove redundant function declarations diff --git a/ChangeLog b/ChangeLog index 294274a..883e436 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2008-01-02 Guillem Jover [EMAIL PROTECTED] + * utils/start-stop-daemon.c [!__GNUC__] (fatal, badusage): Remove + redundant function declarations. + +2008-01-02 Guillem Jover [EMAIL PROTECTED] + * src/main.h (struct stat): New forward declaration. 2008-01-02 Guillem Jover [EMAIL PROTECTED] diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c index e4bbc41..b5cf162 100644 --- a/utils/start-stop-daemon.c +++ b/utils/start-stop-daemon.c @@ -176,15 +176,10 @@ static int pid_is_exec(pid_t pid, const struct stat *esb); #endif -#ifdef __GNUC__ static void fatal(const char *format, ...) NONRETURNING PRINTFFORMAT(1, 2); static void badusage(const char *msg) NONRETURNING; -#else -static void fatal(const char *format, ...); -static void badusage(const char *msg); -#endif /* This next part serves only to construct the TVCALC macro, which * is used for doing arithmetic on struct timeval's. It works like this: commit 9bcc24992c7f61ba5ad230f9214554d90dde574f Author: Guillem Jover [EMAIL PROTECTED] Date: Wed Jan 2 06:46:28 2008 +0200 Add a 'struct stat' forward declaration to fix a compilation warning diff --git a/ChangeLog b/ChangeLog index 7ae840d..294274a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2008-01-02 Guillem Jover [EMAIL PROTECTED] + * src/main.h (struct stat): New forward declaration. + +2008-01-02 Guillem Jover [EMAIL PROTECTED] + * lib/dpkg.h (warningf): Add PRINTFFORMAT attribute. (buffer_copy_setup_PtrInt): Likewise. (buffer_copy_setup_PtrPtr): Likewise. diff --git a/src/main.h b/src/main.h index 1011094..15a8303 100644 --- a/src/main.h +++ b/src/main.h @@ -178,6 +178,8 @@ void cu_closepipe(int argc, void **argv); void cu_closedir(int argc, void **argv); void cu_closefd(int argc, void **argv); +struct stat; + int ignore_depends(struct pkginfo *pkg); int force_breaks(struct deppossi *possi); int force_depends(struct deppossi *possi); commit c04a83af4a07f5efa7bd56c82183f81b75fd5c7c Author: Guillem Jover [EMAIL PROTECTED] Date: Wed Jan 2 06:40:27 2008 +0200 Add missing PRINTFFORMAT attribute
www.selfbanking.com.ar
Please see this site in Subject
Review of controllib-removal branch requested
Hello, I just finished the necessary work to get rid off controllib.pl. I pushed it in a new branch controllib-removal: http://git.debian.org/?p=dpkg/dpkg.git;a=shortlog;h=controllib-removal This branch also includes the parsechangelog branch of djpig and does one more change on top of it by adding a parse_changelog function to Dpkg::Changelog which was needed to replace controllib.pl's parsechangelog. I welcome some review on the changes (it amounts to 35 changesets of which half comes from djpig's parsechangelog branch). My plan is to merge this branch this week-end/early next week so that we'll run this code long enough to catch potential problems before the next upload. I'm running this version already here but a few more users/testers would be good. BTW, while we're doing important changes that need testing, it might also be a good idea to merge the work of Ian Jackson on triggers. And then maybe we can have an intermediary experimental upload. Cheers, -- Raphaël Hertzog Le best-seller français mis à jour pour Debian Etch : http://www.ouaza.com/livre/admin-debian/ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: Documentation for Breaks in dpkg
Ian Jackson [EMAIL PROTECTED] writes: Package: debian-policy Version: 3.7.2.1 Severity: wishlist Tags: patch As I report in #379140 (against dpkg), I have implemented Breaks in dpkg. The attached patch is the corresponding change to the manual. It would probably not be wise to apply this patch until we have settled on a deployment plan for Breaks in Debian; as I say in #379140, I hope to get around to that this weekend. Here is an updated patch. The changes from Ian's original patch are: * Add a statement saying that Breaks should not be used until support is present in Debian stable, which I think was the consensus of recent discussion on the policy list, and also note this near the mention of Breaks in the Conflicts section. * Just remove the entire paragraph about suidmanager from the dpkg-statoverride section rather than changing it to use Breaks. suidmanager predates oldstable at this point; I don't think there's any reason to mention it ever existed at this point. dpkg folks, could you please review this patch as a final double-check that it matches the dpkg implementation as was committed and released? I want to be sure that nothing changed from the original patch so that we don't document the wrong thing in Policy. Other policy readers, comments or seconds? --- orig/policy.sgml +++ mod/policy.sgml @@ -2545,7 +2545,8 @@ sect1 headingPackage interrelationship fields: ttDepends/tt, ttPre-Depends/tt, - ttRecommends/tt, ttSuggests/tt, ttConflicts/tt, + ttRecommends/tt, ttSuggests/tt, + ttBreaks/tt, ttConflicts/tt, ttProvides/tt, ttReplaces/tt, ttEnhances/tt /heading @@ -3336,8 +3337,8 @@ vardeconfigured's-postinst/var ttabort-deconfigure/tt ttin-favour/tt varfailed-install-package/var varversion/var - ttremoving/tt varconflicting-package/var - varversion/var + [ttremoving/tt varconflicting-package/var + varversion/var] /item /list @@ -3362,9 +3363,9 @@ item vardeconfigured's-prerm/var ttdeconfigure/tt ttin-favour/tt varpackage-being-installed/var - varversion/var ttremoving/tt + varversion/var [ttremoving/tt varconflicting-package/var - varversion/var + varversion/var] /item /list @@ -3445,11 +3446,30 @@ /item item - If a conflicting package is being removed at the same time: + If a conflicting package is being removed at the same time, + or if any package will be broken (due to ttBreaks/tt): enumlist item - If any packages depended on that conflicting - package and tt--auto-deconfigure/tt is + If tt--auto-deconfigure/tt is + specified, call, for each package to be deconfigured + due to ttBreaks/tt: + example compact=compact +vardeconfigured's-prerm/var deconfigure \ + in-favour varpackage-being-installed/var varversion/var + /example + Error unwind: + example compact=compact +vardeconfigured's-postinst/var abort-deconfigure \ + in-favour varpackage-being-installed-but-failed/var varversion/var + /example + The deconfigured packages are marked as + requiring configuration, so that if + tt--install/tt is used they will be + configured again if possible. + /item + item + If any packages depended on a conflicting + package being removed and tt--auto-deconfigure/tt is specified, call, for each such package: example compact=compact vardeconfigured's-prerm/var deconfigure \ @@ -3468,7 +3488,7 @@ configured again if possible. /item item - To prepare for removal of the conflicting package, call: + To prepare for removal of each conflicting package, call: example compact=compact varconflictor's-prerm/var remove \ in-favour varpackage/var varnew-version/var @@ -3962,16 +3982,19 @@ p This is done using the ttDepends/tt, ttPre-Depends/tt, - ttRecommends/tt, ttSuggests/tt, ttEnhances/tt and - ttConflicts/tt control file fields. + ttRecommends/tt, ttSuggests/tt, ttEnhances/tt, + ttBreaks/tt and ttConflicts/tt control file fields. /p p - These six fields are used to declare a dependency + These seven fields are used to declare
www.pataconia.com.ar
Please see this site in Subject
Bug#458519: dpkg-dev: dpkg-buildpackage does not print correct build messages with .orig.tar.bz2 sources
Package: dpkg-dev
Version: 1.14.14
Severity: normal
Tags: patch
This patch makes the messages be reported correctly:
--- /usr/bin/dpkg-buildpackage 2007-12-27 11:14:11.0 +
+++ /tmp/dpkg-buildpackage 2008-01-01 11:33:29.051451711 +
@@ -440,7 +440,7 @@
# source only upload
if (fileomitted '\.diff\.gz') {
$srcmsg = _g('source only upload: Debian-native package');
-} elsif (fileomitted '\.orig\.tar\.gz') {
+} elsif (fileomitted '\.orig\.tar\.(gz|bz2)') {
$srcmsg = _g('source only, diff-only upload (original source NOT
included)');
} else {
$srcmsg = _g('source only upload (original source is included)');
@@ -451,7 +451,7 @@
$srcmsg = _g('binary only upload (no source included)');
} elsif (fileomitted '\.diff\.gz') {
$srcmsg = _g('full upload; Debian-native package (full source is
included)');
-} elsif (fileomitted '\.orig\.tar\.gz') {
+} elsif (fileomitted '\.orig\.tar\.(gz|bz2)') {
$srcmsg = _g('binary and diff upload (original source NOT included)');
} else {
$srcmsg = _g('full upload (original source is included)');
-- System Information:
Debian Release: lenny/sid
APT prefers unstable
APT policy: (990, 'unstable')
Architecture: powerpc (ppc)
Kernel: Linux 2.6.23-1-powerpc
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages dpkg-dev depends on:
ii binutils2.18.1~cvs20071027-1 The GNU assembler, linker and bina
ii cpio2.9-7GNU cpio -- a program to manage ar
ii dpkg1.14.14 package maintenance system for Deb
ii make3.81-3 The GNU version of the make util
ii patch 2.5.9-4 Apply a diff file to an original
ii perl [perl5]5.8.8-12 Larry Wall's Practical Extraction
ii perl-modules5.8.8-12 Core Perl modules
Versions of packages dpkg-dev recommends:
ii bzip2 1.0.3-7high-quality block-sorting file co
ii gcc [c-compiler] 4:4.2.2-1 The GNU C compiler
ii gcc-4.1 [c-compiler] 4.1.2-18 The GNU C compiler
ii gcc-4.2 [c-compiler] 4.2.2-4The GNU C compiler
-- no debconf information
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#458521: dpkg-dev: Depends on bzip2 needed for .orig.tar.bz2 unpacking and building
Package: dpkg-dev Version: 1.14.14 Severity: important With .orig.tar.bz2 sources being allowed, dpkg-source and dpkg-buildpackage need to be able to process them, and this requires a dependency on the bzip2 package to do that. Please could you add a dependency for this? Thanks, Roger -- System Information: Debian Release: lenny/sid APT prefers unstable APT policy: (990, 'unstable') Architecture: powerpc (ppc) Kernel: Linux 2.6.23-1-powerpc Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages dpkg-dev depends on: ii binutils2.18.1~cvs20071027-1 The GNU assembler, linker and bina ii cpio2.9-7GNU cpio -- a program to manage ar ii dpkg1.14.14 package maintenance system for Deb ii make3.81-3 The GNU version of the make util ii patch 2.5.9-4 Apply a diff file to an original ii perl [perl5]5.8.8-12 Larry Wall's Practical Extraction ii perl-modules5.8.8-12 Core Perl modules Versions of packages dpkg-dev recommends: ii bzip2 1.0.3-7high-quality block-sorting file co ii gcc [c-compiler] 4:4.2.2-1 The GNU C compiler ii gcc-4.1 [c-compiler] 4.1.2-18 The GNU C compiler ii gcc-4.2 [c-compiler] 4.2.2-4The GNU C compiler -- no debconf information -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#458523: dpkg-query: Missing newline make output hard/impossible to parse
Package: dpkg
Version: 1.14.14
Severity: important
When trying to list all obsolete init.d scripts that are conffiles, I
ran into a problem with the output from dpkg-query. The reason is
that there is no newline between the list of files between different
packages.
Here is an example to demonstrate the problem:
minerva:/# dpkg-query -W -f='${Conffiles}' | grep /etc/init.d/init.d |grep
obsolete|head -2
/etc/init.d/loadcpufreq 5cf8c5572d789beaf18d79fc52f95665 obsolete
/etc/fonts/conf.d/unhinted.conf 4070b0651a9e3e0d26a77d6cc6f7e575 obsolete
/etc/init.d/fuse 0a6a4540ffd72926dbb9f12d9f1ad31d
minerva:/#
Notice how there is no newline between 'obsolete' and
'/etc/init.d/fuse'.
Please change the output from dpkg-query to add a newline between
entries for different packages.
Happy hacking,
--
Petter Reinholdtsen
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#458523: marked as done (dpkg-query: Missing newline make output hard/impossible to parse)
Your message dated Tue, 1 Jan 2008 14:07:51 +0100
with message-id [EMAIL PROTECTED]
and subject line Bug#458523: dpkg-query: Missing newline make output
hard/impossible to parse
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
---BeginMessage---
Package: dpkg
Version: 1.14.14
Severity: important
When trying to list all obsolete init.d scripts that are conffiles, I
ran into a problem with the output from dpkg-query. The reason is
that there is no newline between the list of files between different
packages.
Here is an example to demonstrate the problem:
minerva:/# dpkg-query -W -f='${Conffiles}' | grep /etc/init.d/init.d |grep
obsolete|head -2
/etc/init.d/loadcpufreq 5cf8c5572d789beaf18d79fc52f95665 obsolete
/etc/fonts/conf.d/unhinted.conf 4070b0651a9e3e0d26a77d6cc6f7e575 obsolete
/etc/init.d/fuse 0a6a4540ffd72926dbb9f12d9f1ad31d
minerva:/#
Notice how there is no newline between 'obsolete' and
'/etc/init.d/fuse'.
Please change the output from dpkg-query to add a newline between
entries for different packages.
Happy hacking,
--
Petter Reinholdtsen
---End Message---
---BeginMessage---
On Tue, 01 Jan 2008, Petter Reinholdtsen wrote:
Here is an example to demonstrate the problem:
minerva:/# dpkg-query -W -f='${Conffiles}' | grep /etc/init.d/init.d |grep
obsolete|head -2
/etc/init.d/loadcpufreq 5cf8c5572d789beaf18d79fc52f95665 obsolete
/etc/fonts/conf.d/unhinted.conf 4070b0651a9e3e0d26a77d6cc6f7e575 obsolete
/etc/init.d/fuse 0a6a4540ffd72926dbb9f12d9f1ad31d
minerva:/#
Notice how there is no newline between 'obsolete' and
'/etc/init.d/fuse'.
Please change the output from dpkg-query to add a newline between
entries for different packages.
Please use dpkg-query -W -f='${Conffiles}\n' then.
I don't think that always adding a newline is a good idea as it's not
backwards compatible. And fields never end with an newline character (even
multi-line fields).
Cheers,
--
Raphaël Hertzog
Le best-seller français mis à jour pour Debian Etch :
http://www.ouaza.com/livre/admin-debian/
---End Message---
Bug#439979: extra setting for Architecture:all pkgconfig data
The full setting for PKG_CONFIG_LIBDIR is:
$ENV{PKG_CONFIG_LIBDIR}=/usr/$(DEB_HOST_GNU_TYPE)/lib/pkgconfig/:/usr/share/pkgconfig/;
Adding /usr/share/ allows the few Architecture: all packages that
contain pkgconfig data to be located during cross builds. (e.g.
gnome-mime-data).
--
Neil Williams
=
http://www.data-freedom.org/
http://www.nosoftwarepatents.com/
http://www.linux.codehelp.co.uk/
pgpY6CEFJ1uNo.pgp
Description: PGP signature
Bug#170825: coattail sushi
Greetings, would you wont bigger member http://www.saltutieod.com Rhoda -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#192043: brings cranford
Hi, dont you expect big slong http://www.racumesalto.com Horacio -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#178735: rust streptomycin
Greetings, would you expect big member http://www.rapkocrats.com Mauricio -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#458589: dpkg-buildpackage should not call debian/rules with -j when DEB_BUILD_OPTIONS contains parallel=n
Package: dpkg-dev
Version: 1.14.14
Severity: important
Hi,
dpkg-buildpackage now handles parallel builds with the following code:
if ($parallel || $ENV{DEB_BUILD_OPTIONS}) {
my $build_opts = Dpkg::BuildOptions::parse();
$parallel ||= $build_opts-{parallel};
if (defined $parallel) {
$ENV{MAKEFLAGS} ||= '';
if ($parallel eq '-1') {
$ENV{MAKEFLAGS} .= -j;
} else {
$ENV{MAKEFLAGS} .= -j$parallel;
}
}
$build_opts-{parallel} = $parallel;
Dpkg::BuildOptions::set($build_opts);
}
However, many packages don't support parallel building yet. I can see
two use cases for parallel builds:
(1) a developper that knows that his package builds fine in parallel,
and that uses dpkg-buildpackage -j.
(2) archive-wide rebuilds, or fast buildds.
In case (2), the current code is harmful. The safe way to do parallel
builds was to set parallel=n in DEB_BUILD_OPTIONS, so the 10 or 20
packages where parallel building is supported can use it, and all the
others will just build using one thread.
I think that the current code should be changed to:
--- dpkg-buildpackage.pl.orig 2008-01-01 23:06:39.0 +0100
+++ dpkg-buildpackage.pl2008-01-01 23:07:41.0 +0100
@@ -240,10 +240,9 @@
warning(_g(unknown sign command, assuming pgp style interface));
}
-if ($parallel || $ENV{DEB_BUILD_OPTIONS}) {
+if ($parallel) {
my $build_opts = Dpkg::BuildOptions::parse();
-$parallel ||= $build_opts-{parallel};
if (defined $parallel) {
$ENV{MAKEFLAGS} ||= '';
if ($parallel eq '-1') {
This way, dpkg-buildpackage would simply ignore parallel=n in
DEB_BUILD_OPTIONS.
An example of package that supports parallel=n but fails to build with
dpkg-buildpackage -j is glibc.
This change is very annoying: it makes it impossible for me to run
archive-wide rebuilds using parallel=n...
--
| Lucas Nussbaum
| [EMAIL PROTECTED] http://www.lucas-nussbaum.net/ |
| jabber: [EMAIL PROTECTED] GPG: 1024D/023B3F4F |
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#108587: eulerian poisson
Greetings, would you wont large cock http://www.xugarhesist.com Lyman -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#192043: syrinx desire
Hi, would you have gigantic member http://www.quarshse.com Gavin -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Processed: setting package to dpkg dpkg-dev dselect, tagging 458519, tagging 458521
Processing commands for [EMAIL PROTECTED]: # Automatically generated email from bts, devscripts version 2.10.11 package dpkg dpkg-dev dselect Ignoring bugs not assigned to: dselect dpkg-dev dpkg tags 458519 + pending Bug#458519: dpkg-dev: dpkg-buildpackage does not print correct build messages with .orig.tar.bz2 sources Tags were: patch Tags added: pending tags 458521 + pending Bug#458521: dpkg-dev: Depends on bzip2 needed for .orig.tar.bz2 unpacking and building There were no tags set. Tags added: pending End of message, stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database) -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#10520: auction consent
Hello, wouldn't you have extroardinary slong http://www.fijieans.com Charmaine -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
