Changeset 29638

Timestamp:

2014-12-15T15:56:33+13:00 (9 years ago)

Author:

Jeremy Symon

Message:

Building for correct architecture for RPM. Kind of. Subpackage architectures don't work due to a flaw in RPM subpackages (see rant in perllib/Greenstone/Package/_rpm.pm for details)

Location:

main/trunk/package-kits/linux

Files:

• distros/arch (modified) (1 diff)
• distros/fedora (modified) (1 diff)
• distros/ubuntu (modified) (1 diff)
• managers/apt/conf (modified) (1 diff)
• managers/pacman/conf (modified) (1 diff)
• managers/rpm/conf (modified) (1 diff)
• perllib/Greenstone/Package/_rpm.pm (modified) (2 diffs)

main/trunk/package-kits/linux/distros/arch

@@ -11 +11 @@
 TOMCAT_USER:            tomcat7
 GLI:                    %GREENSTONE_HOME%/gli
-
-ARCH_NATIVE:
-    'x86_64'
-    'i686'
-
-ARCH_ANY:
-    'any'
 
 PKG_SVN:

main/trunk/package-kits/linux/distros/fedora

@@ -11 +11 @@
 TOMCAT_USER:            tomcat
 GLI:                    %GREENSTONE_HOME%/gli
-
-ARCH_NATIVE:
-    x86_64
-    i686
-
-ARCH_ANY:
-    any
 
 PKG_SVN:

main/trunk/package-kits/linux/distros/ubuntu

@@ -11 +11 @@
 TOMCAT_USER:            tomcat7
 GLI:                    %GREENSTONE_HOME%/gli
-
-ARCH_NATIVE:
-    any
-
-ARCH_ANY:
-    all
 
 PKG_SVN:

main/trunk/package-kits/linux/managers/apt/conf

@@ -1 +1 @@
 BUILD_LIB_DIR:  %SYSTEMLIB%
 BUILD_BIN_DIR:  %SYSTEMBIN%
+
+ARCH_NATIVE:            any
+ARCH_ANY:               all

main/trunk/package-kits/linux/managers/pacman/conf

@@ -1 +1 @@
 BUILD_LIB_DIR:  %SYSTEMLIB%
 BUILD_BIN_DIR:  %SYSTEMBIN%
+
+ARCH_NATIVE:            'x86_64' 'i686'
+ARCH_ANY:               'any'

main/trunk/package-kits/linux/managers/rpm/conf

@@ -1 +1 @@
 BUILD_LIB_DIR:  %{_libdir}/*
 BUILD_BIN_DIR:  %{_bindir}/*
+
+ARCH_NATIVE:            
+ARCH_ANY:               noarch

main/trunk/package-kits/linux/perllib/Greenstone/Package/_rpm.pm

@@ -53 +53 @@
         my @optional;
         scalar(@{$self->{config}->{DEPENDS}}) gt 0 and
-            push @optional, 'Requires:  %DEPENDS%';
+            push @optional, 'Requires:      %DEPENDS%';
+        # Cannot set architecture for subpackages because RPM's subpackages
+        #  implementation is broken.
+        # Greenstone core gets split into three packages:
+        #  - The main web servlets (java classes)       - noarch
+        #  - The native libraries used by the servlets  - native
+        #  - The tools for building collections         - native
+        # As RPM forces subpackages to inherit their name from a root package,
+        #  the main web servlets must be set as the root package
+        #  (in order for everything to get the right name).
+        # This means that the root package should be noarch, and the subpackages
+        #  must be native.
+        # But this is impossible with RPM (subpackages must be either the same
+        #  architecture as the root package, or noarch)
+        # To avoid this until someone fixes RPM into an actual working package
+        #  manager, we will just make the core greenstone package pretend to
+        #  be native.
+        unless (defined $packages) {
+            $self->{config}->{ARCHITECTURE} eq $self->{config}->{ARCH_ANY} and
+                push @optional, 'BuildArch:     %ARCHITECTURE%';
+        }
         for my $line (
             'Name:          %NAME%',
@@ -95 +115 @@
             $self->{config} = $package;
             my @optional;
-            scalar(@{$package->{DEPENDS}}) gt 0 and
-                push @optional, 'Requires:  %DEPENDS%';
+            scalar(@{$self->{config}->{DEPENDS}}) gt 0 and
+                push @optional, 'Requires:      %DEPENDS%';
             for my $line (
                 '%package %NAME%',
-                'Summary:   %DESCRIPTION_SHORT%',
+                'Summary:       %DESCRIPTION_SHORT%',
                 'AutoReqProv:   no',
                 @optional,