From 9fab1c4f9f24137260fa02482bfa240526d7243b Mon Sep 17 00:00:00 2001 From: Daniel Aleksandersen Date: Wed, 12 Oct 2016 21:57:23 +0200 Subject: [PATCH] Change RPM builds architecture to 'x86_64' Red Hat/RPM universe expects 'x86_64' whereas Debian expects 'amd64'. This closes #3774. --- README.md | 4 ++++ docs/buildingReleases.md | 1 + docs/linuxInstall.md | 4 ++-- tools/buildInstaller.js | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 3063bc7fb74..c805c492eb2 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,10 @@ Please see the [Building on Windows wiki entry](https://github.com/brave/browser * `apt-get install libgnome-keyring-dev build-essential` +OR + +* `dnf install libgnome-keyring-devel rpm-build` + ## Installation After installing the prerequisites: diff --git a/docs/buildingReleases.md b/docs/buildingReleases.md index 8647a542b90..6697f6d9fd5 100644 --- a/docs/buildingReleases.md +++ b/docs/buildingReleases.md @@ -51,6 +51,7 @@ Check virus scan: https://www.virustotal.com/en/ ``` ./node_modules/.bin/webpack CHANNEL=dev npm run build-package +CHANNEL=dev npm run build-installer tar -jcvf Brave.tar.bz2 ./Brave-linux-x64 ``` diff --git a/docs/linuxInstall.md b/docs/linuxInstall.md index 6821d64813a..6c84516874f 100644 --- a/docs/linuxInstall.md +++ b/docs/linuxInstall.md @@ -23,12 +23,12 @@ wget -O brave.deb https://laptop-updates.brave.com/latest/mint64 sudo dpkg -i ./brave.deb ``` -## Fedora AMD64: +## Fedora x86_64: ``` sudo dnf install lsb wget -O brave.rpm https://laptop-updates.brave.com/latest/fedora64 -sudo rpm -i ./brave.rpm +sudo dnf install ./brave.rpm ``` ## OpenSUSE AMD64: diff --git a/tools/buildInstaller.js b/tools/buildInstaller.js index 35ad92e1cf2..0f559558b7d 100644 --- a/tools/buildInstaller.js +++ b/tools/buildInstaller.js @@ -82,7 +82,7 @@ if (isDarwin) { }, (e) => console.log(`No dice: ${e.message}`)) } else if (isLinux) { console.log('Install with sudo dpkg -i dist/brave_' + VersionInfo.braveVersion + '_amd64.deb') - console.log('Or install with sudo rpm -i dist/brave_' + VersionInfo.braveVersion + '.amd64.rpm') + console.log('Or install with sudo dnf install dist/brave_' + VersionInfo.braveVersion + '.x86_64.rpm') cmds = [ // .deb file 'electron-installer-debian' + @@ -94,7 +94,7 @@ if (isDarwin) { 'electron-installer-redhat' + ' --src Brave-linux-x64/' + ' --dest dist/' + - ' --arch amd64' + + ' --arch x86_64' + ' --config res/linuxPackaging.json', // .tar.bz2 file 'tar -jcvf dist/Brave.tar.bz2 ./Brave-linux-x64'