Fix building i386 packages

.editorconfig

@@ -9,6 +9,11 @@ indent_style = space
 indent_size = 2
 trim_trailing_whitespace = true
 
+[Rakefile]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+
 [*.sh]
 indent_style = tab
 trim_trailing_whitespace = true

build

@@ -11,7 +11,7 @@ CACHE_DIR=
 OUTPUT_DIR=
 CONCURRENCY=1
 DISTRIBUTIONS="el6 el7"
-ARCHITECTURES="i686 x86_64"
+ARCHITECTURES="i386 x86_64"
 FETCH_PASSENGER_TARBALL_FROM_CACHE=true
 CLEAR_WORK_DIR=true
 SHOW_OVERVIEW_PERIODICALLY=false

internal/build/Rakefile

@@ -154,6 +154,8 @@ namespace :rpm do
     distro = DISTRO_BUILD_PARAMS[distro_id]
 
     ARCHITECTURES.each do |arch|
+      next if !distro_architecture_allowed?(distro_id, arch)
+
       task "all" => "^rpm:passenger:#{distro_id}:#{arch}"
       task "passenger:all" => "^rpm:passenger:#{distro_id}:#{arch}"
       register_tracking_task(:rpm, "passenger:#{distro_id}:#{arch}")
@@ -181,6 +183,8 @@ namespace :rpm do
     distro = DISTRO_BUILD_PARAMS[distro_id]
 
     ARCHITECTURES.each do |arch|
+      next if !distro_architecture_allowed?(distro_id, arch)
+
       task "all" => "^rpm:nginx:#{distro_id}:#{arch}"
       task "nginx:all" => "^rpm:nginx:#{distro_id}:#{arch}"
       register_tracking_task(:rpm, "nginx:#{distro_id}:#{arch}")

internal/build/rakefile_support.rb

@@ -93,12 +93,9 @@ def passenger_enterprise?
   defined?(PhusionPassenger::PASSENGER_IS_ENTERPRISE)
 end
 
-def infer_next_passenger_version(passenger_version)
-  components = passenger_version.split(".")
-  components.last.sub!(/[0-9]+$/) do |number|
-    (number.to_i + 1).to_s
-  end
-  components.join(".")
+def distro_architecture_allowed?(distro_id, arch)
+  # Red Hat 7 does not support x86
+  distro_id != "el7" || arch == "x86_64"
 end
 
 def passenger_srpm_name(distro_id)