Changeset 541 in ProjectBuilder

Timestamp:

Sep 15, 2008, 1:39:21 PM (16 years ago)

Author:

Bruno Cornec

Message:

Working on the correct .deb generation for virtual/real packages

Files:

• devel/pb/bin/pb (modified) (4 diffs)
• pbconf/devel/ProjectBuilder/deb/control (modified) (2 diffs)
• pbconf/devel/ProjectBuilder/deb/rules (modified) (2 diffs)
• pbconf/devel/ProjectBuilder/rpm/perl-ProjectBuilder.spec (modified) (3 diffs)
• pbconf/devel/pbfilter/all.pbf (modified) (2 diffs)
• pbconf/devel/project-builder/rpm/project-builder.spec (modified) (1 diff)

devel/pb/bin/pb

@@ -563 +563 @@
             my $pbrealpkg = pb_cms_get_real_pkg($pbpkg,$pb{'dtype'});
             $pb{'realpkg'} = $pbrealpkg;
+            pb_log(1,"Virtual package $pbpkg has a real package name of $pbrealpkg on $ddir-$dver\n") if ($pbrealpkg ne $pbpkg);
 
             # Filter build files from the less precise up to the most with overloading
@@ -792 +793 @@
                 $made="$made $_";
             }
-
-            if (-f "/usr/bin/rpmlint") {
-                pb_system("rpmlint $made","Checking validity of rpms with rpmlint","verbose");
-            }
+            close(LOG);
+
         } elsif ($dtype eq "deb") {
             chdir "$ENV{'PBBUILDDIR'}" || die "Unable to chdir to $ENV{'PBBUILDDIR'}";
@@ -811 +810 @@
             pb_system("dpkg-buildpackage -us -uc -rfakeroot","Building package","verbose");
             $made="$made $pbpkg"."_*.deb $pbpkg"."_*.dsc $pbpkg"."_*.tar.gz";
-            if (-f "/usr/bin/lintian") {
-                pb_system("lintian $made","Checking validity of debs with lintian","verbose");
-            }
         } elsif ($dtype eq "ebuild") {
             my @ebuildfile;
@@ -881 +877 @@
         }
     }
+    # Packages check if needed
+    if ($dtype eq "rpm") {
+        if (-f "/usr/bin/rpmlint") {
+            pb_system("rpmlint $made","Checking validity of rpms with rpmlint","verbose");
+        }
+    } elsif ($dtype eq "deb") {
+        if (-f "/usr/bin/lintian") {
+            pb_system("lintian $made","Checking validity of debs with lintian","verbose");
+        }
+    } else {
+        pb_log(0, "No check done for $dtype yet");
+    }
+
     # Keep track of what is generated so that we can get them back from VMs
     open(KEEP,"> $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}") || die "Unable to create $ENV{'PBBUILDDIR'}/pbgen-$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}";

pbconf/devel/ProjectBuilder/deb/control

@@ -1 @@
-Source: PBPKG
+Source: PBREALPKG
 Section: PBGRP
 Priority: optional
@@ -6 +6 @@
 Standards-Version: 3.6.1
 
-Package: PBPKG
+Package: PBREALPKG
 Architecture: all
 Section: PBGRP

pbconf/devel/ProjectBuilder/deb/rules

@@ -11 +11 @@
 
 # Define package name variable for a one-stop change.
-PACKAGE_NAME = PBPKG
+PACKAGE_NAME = PBREALPKG
 
 # These are used for cross-compiling and for saving the configure script
@@ -55 +55 @@
         dh_installdirs
 
-        # Add here commands to install the package into debian/linuxcoe-sd
-        $(MAKE) install DESTDIR=$(CURDIR)/debian/PBPKG
+        # Add here commands to install the package into debian/PBREALPKG
+        $(MAKE) install DESTDIR=$(CURDIR)/debian/PBREALPKG
 
 # Build architecture-independent files here.

pbconf/devel/ProjectBuilder/rpm/perl-ProjectBuilder.spec

@@ -3 +3 @@
 #
 %define perlvendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
+%define srcname PBPKG
 
 Summary:    Perl module providing support and deal with Linux distributions
 Summary(fr):    Module Perl fournissant des fonctions de support et aidant à traiter de diverses distributions Linux
 
-Name:       PBPKG
+Name:       PBREALPKG
 Version:    PBVER
 Release:    PBTAGPBSUF
@@ -14 +15 @@
 Url:        http://trac.project-builder.org
 Source:     PBREPO/PBSRC
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
+BuildRoot:  %{_tmppath}/%{srcname}-%{version}-%{release}-root-%(id -u -n)
 BuildArch:  noarch
 Requires:   perl >= 5.8.4, PBDEP
@@ -22 +23 @@
 
 %description -l fr
-perl-ProjectBuilder est un ensemble de fonctions pour aider à développer des projets perl et à traiter de diverses distributions Linux.
+PBREALPKG est un ensemble de fonctions pour aider à développer des projets perl et à traiter de diverses distributions Linux.
 
 %prep
-%setup -q
+%setup -q -n %{srcname}-%{version}
 
 %build

pbconf/devel/pbfilter/all.pbf

@@ -8 +8 @@
 
 # PBSRC is replaced by the source package format
-filter PBSRC = src/%{name}-%{version}.tar.gz
+filter PBSRC = src/%{srcname}-%{version}.tar.gz
 
 # PBVER is replaced by the version ($pb->{'ver'} in code)
@@ -28 +28 @@
 filter PBPKG = $pb->{'pkg'}
 
+# PBPKG is replaced by the package name ($pb->{'realpkg'} in code)
+filter PBREALPKG = $pb->{'realpkg'}
+
 # PBPACKAGER is replaced by the packager name ($pb->{'packager'} in code)
 filter PBPACKAGER = $pb->{'packager'}

pbconf/devel/project-builder/rpm/project-builder.spec

@@ -3 +3 @@
 #
 %define perlvendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
+%define srcname   PBPKG
 
 Summary:    Project Builder aka pb is a tool to produce packages for multiple distributions