Changeset 1367 in ProjectBuilder for devel

Timestamp:

Nov 27, 2011, 3:44:49 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Fix a bug in the recursive function pb_list_bfiles where file handle should not be global
• patch command and option are now variables in p.conf under ospatchcmd and ospatchopt
• Add support for patches for deb family of distributions

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (1 diff)
• pb-modules/etc/pb.conf.pod (modified) (1 diff)
• pb/bin/pb (modified) (5 diffs)
• pb/lib/ProjectBuilder/Filter.pm (modified) (2 diffs)

devel/pb-modules/etc/pb.conf

@@ -532 +532 @@
 oschkcmd deb = /usr/bin/lintian
 oschkopt deb = 
+ospatchcmd default = /usr/bin/patch
+ospatchopt default = -s -p1
 
 # sha method for yum repo

devel/pb-modules/etc/pb.conf.pod

@@ -150 +150 @@
  Conffile: pb
  Example: osnover gentoo = true
+
+=item B<ospatchcmd>
+
+ Nature: Optional
+ Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch).
+ Value: package patch command. For RPM is implicit.
+ Conffile: pb
+ Example: ospatchcmd deb = /usr/bin/patch
+
+=item B<ospatchopt>
+
+ Nature: Optional
+ Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch).
+ Value: package patch options.
+ Conffile: pb
+ Example: ospatchcmd deb = -s -p1
 
 =item B<ospathcmd-*>

devel/pb/bin/pb

@@ -954 +954 @@
                         # Filter potential patches (local + remote)
                         pb_mkdir_p("$dest/pbconf/$v/pbpatch");
+                        # If Debian based distribution, then prepare what will be done at build time
+                        my ($patchcmd,$patchopt);
+                        if ($pbos->{'type'} eq "deb") {
+                            ($patchcmd,$patchopt) = pb_distro_get_param($pbos,pb_conf_get_if("ospatchcmd","ospatchopt"));
+                            open(SCRIPT,"> $dest/pbconf/$v/pbpatch/pbapplypatch") || die "Unable to create $dest/pbconf/$v/pbpatch/pbapplypatch";
+                            print SCRIPT "#!/bin/bash\n";
+                            print SCRIPT "set -x\n" if ($pbdebug gt 1);
+                        }
                         foreach my $pf (split(/,/,$pb->{'patches'}->{$v})) {
                             my $pp = basename($pf);
@@ -959 +967 @@
                             pb_filter_file_inplace($ptr,"$dest/pbconf/$v/pbpatch/$pp",$pb);
                             pb_system("gzip -9f $dest/pbconf/$v/pbpatch/$pp","","quiet");
+                            if ($pbos->{'type'} eq "deb") {
+                                # If Debian based distribution, then prepare what will be done at build time
+                                # by applying the patches that will be available under the debian/patches dir
+                                print SCRIPT "$patchcmd $patchopt \< debian/patches/$pp\n";
+                            }
                         }
+                        if ($pbos->{'type'} eq "deb") {
+                            close(SCRIPT);
+                            chmod 0755,"$dest/pbconf/$v/pbpatch/pbapplypatch";
+                        }
+                        #pb_system("cat $dest/pbconf/$v/pbpatch/pbapplypatch","APPLY","verbose");
                     }
                     if (defined $pb->{'sources'}->{$v}) {
@@ -1263 +1281 @@
             my @f = pb_extract_build_files($src2,"$pbpkg-$pbver/pbconf/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}/pbpatch/","debian/patches","patch");
 
-            # If we use quilt to manage patches, we then setup the env correctly as per http://pkg-perl.alioth.debian.org/howto/quilt.html
-            # Generate Debian patch series for quilt
-            # If we use dpatch to manage patches, we then setup the 00list file as well
-            open(SERIE,"> debian/patches/series") || die "Unable to write in debian/patches/series";
-            open(LIST,"> debian/patches/00list") || die "Unable to write in debian/patches/00list";
+            # By default we use format 1.0 - Cf man dpkg-source
+            my $debsrcfmt = "1.0";
+            my $debsrcfile = "debian/source/format";
+            if (-f $debsrcfile) {
+                $debsrcfmt = pb_get_content($debsrcfile);
+            }
+                
+            if ($debsrcfmt =~ /^3.*quilt/) {
+                # If we use quilt to manage patches, we then setup the env correctly 
+                # as per http://pkg-perl.alioth.debian.org/howto/quilt.html
+                # Generate Debian patch series for quilt
+                open(SERIE,"> debian/patches/series") || die "Unable to write in debian/patches/series";
+                $ENV{'QUILT_PATCHES'}="debian/patches";
+            } else {
+                # If we use dpatch to manage patches, we then setup the 00list file as well
+                open(SERIE,"> debian/patches/00list") || die "Unable to write in debian/patches/00list";
+            }
             foreach my $f (sort @f) {
-                # We also need to ncompress them
+                # Skip the script made to apply the patches to the Debian tree
+                next if ($f =~ /pbapplypatch/);
+                # We also need to uncompress them
+                pb_system("gzip -d $f","","quiet");
+                $f =~ s/\.gz$//;
                 print SERIE "$f\n";
-                print LIST "$f\n";
             }
             close(SERIE);
-            close(LIST);
-            $ENV{'QUILT_PATCHES'}="debian/patches";
+            if ($debsrcfmt =~ /^1.*/) {
+                # In that case we need to apply the patches ourselves locally
+                pb_system("cat debian/patches/pbapplypatch","APPLY","verbose");
+                pb_system("debian/patches/pbapplypatch","Applying patches to $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'} tree");
+            }
+            if (@f) {
+                # We have patches, so modify the name of files to be Debian compliant
+                move("../$src","../$pbpkg-$pbver.orig.tar.gz");
+            }
 
             # We need to handle potential additional sources to upstream sources
@@ -3477 +3517 @@
 # subdir to keep if recursive mode, empty by default
 my $subdir = shift || "";
+# In a recursive function , we need a local var as DIR handle
+my $bdir;
 
 pb_log(2,"DEBUG: entering pb_list_bfiles in $dir: ".Dumper($bfiles)."\n");
-opendir(BDIR,"$dir") || die "Unable to open dir $dir: $!";
-foreach my $f (readdir(BDIR)) {
+opendir($bdir,"$dir") || die "Unable to open dir $dir: $!";
+foreach my $f (readdir($bdir)) {
     pb_log(3,"DEBUG: pb_list_bfiles found $f\n");
     next if ($f =~ /^\./);
@@ -3499 +3541 @@
     }
 }
-closedir(BDIR);
+closedir($bdir);
 pb_log(2,"DEBUG: exiting pb_list_bfiles: ".Dumper($bfiles)."\n");
 }

devel/pb/lib/ProjectBuilder/Filter.pm

@@ -20 +20 @@
 use ProjectBuilder::Version;
 use ProjectBuilder::Base;
+use ProjectBuilder::Conf;
+use ProjectBuilder::Distribution;
 use ProjectBuilder::Changelog;
 
@@ -215 +217 @@
             my $i = 0;
             if (defined $pb->{'patches'}->{$tuple}) {
+                my ($patchcmd,$patchopt) = pb_distro_get_param($pb->{'pbos'},pb_conf_get_if("ospatchcmd","ospatchopt"));
                 foreach my $p (split(/,/,$pb->{'patches'}->{$tuple})) {
                     pb_log(3,"DEBUG($tuple) Adding patch command $i\n");
-                    print DEST "%patch$i -p1\n";
+                    print DEST "%patch$i $patchopt\n";
                     $i++;
                 }