Skip to content

C
chromebrew
Commit bed4effe authored by saltedcoffii's avatar saltedcoffii Committed by GitHub
Browse files
Options

[New Package] flatpak (#5144) 

* [Fix Package] bubblewrap

* [New Package] flatpak

* Bump version

* change /usr/local to #{CREW_PREFIX}

* Add binaries

* Added lto, built binaries, fixed version string,

* new binaries + wrapper script

* Disable setuid

* add dconf dependency

* modify wrapper

* current working build

- no sound
- The X11 DISPLAY variable isn't getting through.
- This is the sort of command that works after installing: flatpak run --socket=wayland org.videolan.VLC

* lint

* Current working build

* Need to unset GDK_PIXBUF_MODULE_FILE

* env variables need to be unset before running flatpak, not bubblewrap

* Add backported fixes patch, add unset variables to wrapper

* Update flatpak.rb

* Fix sha256sum on source

* add xdg_base to dependency list

* Fix patching

* Add wayland socket if running a package

* add user flag for non-run commands

* Update flatpak.rb

* Make sound work

* make sure CREW_OPTIONS is in configure line

* add xdg variables in postinstall

* more XDG variable logic
Co-authored-by: default avatarsatmandu <satadru@gmail.com>
parent c39702d1
Hide whitespace changes
Inline Side-by-side
Showing with 158 additions and 13 deletions
packages/bubblewrap.rb
View file @ bed4effe
...@@ -3,30 +3,53 @@ require 'package' ...@@ -3,30 +3,53 @@ require 'package'
class Bubblewrap < Package class Bubblewrap < Package
description 'bubblewrap works by creating a new, completely empty, mount namespace' description 'bubblewrap works by creating a new, completely empty, mount namespace'
homepage 'https://github.com/containers/bubblewrap' homepage 'https://github.com/containers/bubblewrap'
version '0.4.1' @_ver = '0.4.1'
version "#{@_ver}-1"
compatibility 'all' compatibility 'all'
source_url 'https://github.com/containers/bubblewrap/releases/download/v0.4.1/bubblewrap-0.4.1.tar.xz' source_url "https://github.com/containers/bubblewrap/releases/download/v#{@_ver}/bubblewrap-#{@_ver}.tar.xz"
source_sha256 'b9c69b9b1c61a608f34325c8e1a495229bacf6e4a07cbb0c80cf7a814d7ccc03' source_sha256 'b9c69b9b1c61a608f34325c8e1a495229bacf6e4a07cbb0c80cf7a814d7ccc03'
binary_url ({ binary_url({
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/bubblewrap-0.4.1-chromeos-armv7l.tar.xz', aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/bubblewrap-0.4.1-1-chromeos-armv7l.tar.xz',
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/bubblewrap-0.4.1-chromeos-armv7l.tar.xz', armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/bubblewrap-0.4.1-1-chromeos-armv7l.tar.xz',
i686: 'https://dl.bintray.com/chromebrew/chromebrew/bubblewrap-0.4.1-chromeos-i686.tar.xz', i686: 'https://dl.bintray.com/chromebrew/chromebrew/bubblewrap-0.4.1-1-chromeos-i686.tar.xz',
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/bubblewrap-0.4.1-chromeos-x86_64.tar.xz', x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/bubblewrap-0.4.1-1-chromeos-x86_64.tar.xz'
}) })
binary_sha256 ({ binary_sha256({
aarch64: 'eba5493670c286fae9c71814b32613d7c7a951b037680a3f2fbf853c69c53db7', aarch64: '7c3f2c4a332342b9d7aa15d6aa776a38d1dc94a8c4c904a81a64f7e7ca45cedd',
armv7l: 'eba5493670c286fae9c71814b32613d7c7a951b037680a3f2fbf853c69c53db7', armv7l: '7c3f2c4a332342b9d7aa15d6aa776a38d1dc94a8c4c904a81a64f7e7ca45cedd',
i686: '325f997d3d68713b29b8db744b278a9d9b3fe5649d934cfb2f3091a8b66a9b50', i686: '75795e2c15720ad488335de59b94c3577102b8ba3ca5e855b5b132f3f213cce7',
x86_64: '4bdc8a377adb978ddd56a3600e07eed238837e39011b3c8c72f69ef1cf9dc6a8', x86_64: '4c3f0aaec3afc4a1ba48d10dfb87208b47d11f2047fe11d6dce5056ff4dce79f'
}) })
depends_on 'libcap' => :build
depends_on 'dconf'
def self.patch
system "sed -i '/SUDO_BIN/d' Makefile.in"
end
def self.build def self.build
system "./configure #{CREW_OPTIONS} --disable-maintainer-mode --disable-man" system './configure --help'
system "env CFLAGS='-flto=auto' CXXFLAGS='-flto=auto' LDFLAGS='-flto=auto' \
./configure #{CREW_OPTIONS} \
--disable-maintainer-mode \
--disable-man \
--with-priv-mode=setuid \
--enable-sudo"
system 'make' system 'make'
end end
def self.install def self.install
system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install' system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
FileUtils.install "#{CREW_DEST_PREFIX}/bin/bwrap", "#{CREW_DEST_PREFIX}/bin/bwrap.elf", mode: 0o755
@bwrap_sh = <<~BWRAP_HEREDOC
#!/bin/bash
sudo chown root "#{CREW_PREFIX}/bin/bwrap.elf"
sudo chmod +s "#{CREW_PREFIX}/bin/bwrap.elf"
#{CREW_PREFIX}/bin/bwrap.elf "\$@"
sudo chown chronos "#{CREW_PREFIX}/bin/bwrap.elf"
BWRAP_HEREDOC
IO.write("#{CREW_DEST_PREFIX}/bin/bwrap", @bwrap_sh, perm: 0o755)
end end
end end
packages/flatpak.rb 0 → 100644
View file @ bed4effe
require 'package'
class Flatpak < Package
description 'Flatpak is a system for building, distributing, and running sandboxed desktop applications on Linux.'
homepage 'https://flatpak.org'
@_ver = '1.10.1'
version @_ver
compatibility 'all'
source_url "https://github.com/flatpak/flatpak/releases/download/#{@_ver}/flatpak-#{@_ver}.tar.xz"
source_sha256 'c70215792b7cbece83c489dab86adc9bfaf9b140c506affe2a48c92afa3d69b7'
binary_url({
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/flatpak-1.10.1-chromeos-armv7l.tar.xz',
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/flatpak-1.10.1-chromeos-armv7l.tar.xz',
i686: 'https://dl.bintray.com/chromebrew/chromebrew/flatpak-1.10.1-chromeos-i686.tar.xz',
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/flatpak-1.10.1-chromeos-x86_64.tar.xz'
})
binary_sha256({
aarch64: '6927a9717a15f4d52e1b2316e159a2f43026431bc91a68627bc6fce5f9634b31',
armv7l: '6927a9717a15f4d52e1b2316e159a2f43026431bc91a68627bc6fce5f9634b31',
i686: '56abe90a29219a9937b2939a71b4413d90198d7eabc1cb802b3fc6a759a93335',
x86_64: '588c3a2c502e0cc6088b4d17e3b133103fdeb0dc653bad0bef79674709b7bf22'
})
depends_on 'xdg_base'
depends_on 'bubblewrap'
depends_on 'libostree'
depends_on 'polkit'
depends_on 'appstream_glib'
depends_on 'libseccomp'
depends_on 'pyparsing'
depends_on 'dconf'
depends_on 'pulseaudio'
def self.patch
patch_description = 'backported fixes'
patch_url = 'https://patch-diff.githubusercontent.com/raw/flatpak/flatpak/pull/4132.patch'
patch_sha256 = '8230491be909a027fdb5a03ff0fa638331c940289fa6d68a21489d78c6f7f6b0'
patch_filename = 'patch'
puts "Downloading patch: #{patch_description}".yellow
system('curl', '-s', '--insecure', '-L', '-#', patch_url, '-o', patch_filename)
abort 'Checksum mismatch. :/ Try again.'.lightred unless
Digest::SHA256.hexdigest(File.read(patch_filename)) == patch_sha256
puts 'patch downloaded'.lightgreen
system 'patch -p 1 --forward < patch || true'
end
def self.build
system 'env NOCONFIGURE=1 ./autogen.sh'
system 'filefix'
system "env BWRAP=#{CREW_PREFIX}/bin/bwrap CFLAGS='-flto=auto' CXXFLAGS='-flto=auto' LDFLAGS='-flto=auto' \
./configure #{CREW_OPTIONS} \
--with-system-install-dir=#{CREW_PREFIX}/var/lib/flatpak \
--enable-sandboxed-triggers \
--with-priv-mode=none \
--without-systemd \
--with-system-fonts-dir=#{CREW_PREFIX}/share/fonts:/usr/share/fonts \
--with-system-font-cache-dirs=/usr/share/cache/fontconfig:#{CREW_PREFIX}/cache/fontconfig \
--disable-documentation \
--disable-maintainer-mode \
--with-system-bubblewrap"
system 'make'
end
def self.install
system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
FileUtils.install "#{CREW_DEST_PREFIX}/bin/flatpak", "#{CREW_DEST_PREFIX}/bin/flatpak.elf", mode: 0o755
@flatpak_sh = <<~FLATPAK_HEREDOC
#!/bin/bash
# Flatpak needs to be able to see fonts in #{CREW_PREFIX}/share/fonts
if [ -L "~/.local/share/fonts" ] && [ ! -e "~/.local/share/fonts" ]; then
rm -f ~/.local/share/fonts
fi
if [ ! \\( -e ~/.local/share/fonts \\) ]; then
ln -s #{CREW_PREFIX}/share/fonts ~/.local/share/
fi
# Start pulseaudio if it is not running.
pgrep -x pulseaudio >/dev/null || pulseaudio -D
if [[ "\$*" == *run* ]]
then
FLATPAK_FLAGS='--socket=wayland'
else
FLATPAK_FLAGS='--user'
fi
unset GDK_PIXBUF_MODULE_FILE
unset GDK_PIXBUF_MODULEDIR
unset GDK_BACKEND
unset FONTCONFIG_PATH
#{CREW_PREFIX}/bin/flatpak.elf \$FLATPAK_FLAGS "\$@"
FLATPAK_HEREDOC
IO.write("#{CREW_DEST_PREFIX}/bin/flatpak", @flatpak_sh, perm: 0o755)
end
def self.postinstall
puts
puts 'Configuring flathub'.lightblue
system 'flatpak.elf remote-add --if-not-exists --user flathub https://flathub.org/repo/flathub.flatpakrepo'
puts
# Check to see if xdg_base put variables in ~/.bashrc. If not, put
# them in.
xdgbaseconfig_in_bashrc = `grep -c "XDG_CONFIG_HOME" ~/.bashrc || true`
unless xdgbaseconfig_in_bashrc.to_i.positive?
puts 'Putting XDG Environment Variables in ~/.bashrc'.lightblue
system "echo '# XDG Base Directory Specification Environment Variables' >> ~/.bashrc"
system "echo '# See https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html' >> ~/.bashrc"
system "echo 'export XDG_DATA_HOME=#{HOME}/.local/share' >> ~/.bashrc"
system "echo 'export XDG_CONFIG_HOME=#{HOME}/.config' >> ~/.bashrc"
system "echo 'export XDG_DATA_DIRS=#{CREW_PREFIX}/share:#{HOME}/.local/share/flatpak/exports/share:#{CREW_PREFIX}/var/lib/flatpak/exports/share' >> ~/.bashrc"
system "echo 'export XDG_CONFIG_DIRS=#{CREW_PREFIX}/etc/xdg' >> ~/.bashrc"
system "echo 'export XDG_CACHE_HOME=#{HOME}/.cache' >> ~/.bashrc"
system "echo 'export XDG_RUNTIME_DIR=/var/run/chrome' >> ~/.bashrc"
puts 'To complete the installation, execute the following:'.orange
puts 'source ~/.bashrc'.orange
end
# If xdg_base put in variables without flatpak modifications, add
# them.
flatpak_xdgdirconfig_in_bashrc = `grep -c "#{CREW_PREFIX}/var/lib/flatpak/exports/share" ~/.bashrc || true`
unless flatpak_xdgdirconfig_in_bashrc.to_i.positive?
system "sed -i 's,XDG_DATA_DIRS=.*,XDG_DATA_DIRS=#{CREW_PREFIX}/share:#{HOME}/.local/share/flatpak/exports/share:#{CREW_PREFIX}/var/lib/flatpak/exports/share,g' ~/.bashrc"
end
end
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7