From 27fff4288b9c99083e148fd61da0e651f65b757d Mon Sep 17 00:00:00 2001
From: Simon Hong <shong@igalia.com>
Date: Sat, 30 Jun 2018 15:44:48 +0900
Subject: [PATCH 1/2] Only creates dist package for specified channel on linux

---
 BUILD.gn | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/BUILD.gn b/BUILD.gn
index 01a31210291c..9325b81d2061 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -74,8 +74,15 @@ group("create_dist") {
     deps += [ "build/mac:create_dist_mac" ]
   }
   if (is_linux) {
+    _linux_channel = brave_channel
+    if (brave_channel == "") {
+      _linux_channel = "stable"
+    } else if (brave_channel == "dev") {
+      _linux_channel = "unstable"
+    }
+
     deps += [
-      "//chrome/installer/linux",
+      "//chrome/installer/linux:$_linux_channel",
       "//brave/app/linux:dist_resources",
     ]
   }

From 0b780bff53330621cfd4736aac2b5fefee3d1b7d Mon Sep 17 00:00:00 2001
From: Simon Hong <shong@igalia.com>
Date: Tue, 3 Jul 2018 14:28:08 +0900
Subject: [PATCH 2/2] Move linux channel mapping logic to
 //brave/build/config.gni

---
 BUILD.gn         |  9 +--------
 build/config.gni | 12 ++++++++++++
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index 9325b81d2061..ea30468ea650 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -74,15 +74,8 @@ group("create_dist") {
     deps += [ "build/mac:create_dist_mac" ]
   }
   if (is_linux) {
-    _linux_channel = brave_channel
-    if (brave_channel == "") {
-      _linux_channel = "stable"
-    } else if (brave_channel == "dev") {
-      _linux_channel = "unstable"
-    }
-
     deps += [
-      "//chrome/installer/linux:$_linux_channel",
+      "//chrome/installer/linux:$brave_linux_channel",
       "//brave/app/linux:dist_resources",
     ]
   }
diff --git a/build/config.gni b/build/config.gni
index 2e93228cc827..5ec06c72c24b 100644
--- a/build/config.gni
+++ b/build/config.gni
@@ -25,6 +25,18 @@ if (is_win) {
   brave_exe = "$chrome_product_full_name.app"
 }
 
+if (is_linux) {
+  # Our channle name and upstream linux channel name is different.
+  brave_linux_channel = ""
+  if (brave_channel == "") {
+    brave_linux_channel = "stable"
+  } else if (brave_channel == "dev") {
+    brave_linux_channel = "unstable"
+  } else {
+    assert(brave_channel == "beta", "Not supported channel name: $brave_channel")
+  }
+}
+
 brave_icon_dir = "nightly"
 if (is_component_build) {
   brave_icon_dir = "dev"