Merge pull request #87243 from euank/steam-runtime-update
steam: switch to the newer steam-runtime packaging
This commit is contained in:
Christoph Hrdinka
GitHub
commit
a2889d6de3
@ -1,98 +0,0 @@
|
||||
#!/usr/bin/env python2
|
||||
#
|
||||
# Script to build and install packages into the Steam runtime
|
||||
# Patched version of https://github.com/ValveSoftware/steam-runtime/blob/master/build-runtime.py
|
||||
|
||||
import os
|
||||
import re
|
||||
import sys
|
||||
import subprocess
|
||||
import argparse
|
||||
import json
|
||||
|
||||
# The top level directory
|
||||
top = sys.path[0]
|
||||
|
||||
def parse_args():
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument("-r", "--runtime", help="specify runtime path", default=os.path.join(top,"runtime"))
|
||||
parser.add_argument("-i", "--input", help="packages JSON", required=True)
|
||||
return parser.parse_args()
|
||||
|
||||
|
||||
def install_deb (basename, deb, dest_dir):
|
||||
installtag_dir=os.path.join(dest_dir, "installed")
|
||||
if not os.access(installtag_dir, os.W_OK):
|
||||
os.makedirs(installtag_dir)
|
||||
|
||||
#
|
||||
# Unpack the package into the dest_dir
|
||||
#
|
||||
os.chdir(top)
|
||||
subprocess.check_call(['dpkg-deb', '-x', deb, dest_dir])
|
||||
|
||||
|
||||
#
|
||||
# Walks through the files in the runtime directory and converts any absolute symlinks
|
||||
# to their relative equivalent
|
||||
#
|
||||
def fix_symlinks ():
|
||||
for dir, subdirs, files in os.walk(args.runtime):
|
||||
for name in files:
|
||||
filepath=os.path.join(dir,name)
|
||||
if os.path.islink(filepath):
|
||||
target = os.readlink(filepath)
|
||||
if os.path.isabs(target):
|
||||
#
|
||||
# compute the target of the symlink based on the 'root' of the architecture's runtime
|
||||
#
|
||||
target2 = os.path.join(args.runtime,target[1:])
|
||||
|
||||
#
|
||||
# Set the new relative target path
|
||||
#
|
||||
os.unlink(filepath)
|
||||
os.symlink(os.path.relpath(target2,dir), filepath)
|
||||
|
||||
#
|
||||
# Creates the usr/lib/debug/.build-id/xx/xxxxxxxxx.debug symlink tree for all the debug
|
||||
# symbols
|
||||
#
|
||||
def fix_debuglinks ():
|
||||
for dir, subdirs, files in os.walk(os.path.join(args.runtime,"usr/lib/debug")):
|
||||
if ".build-id" in subdirs:
|
||||
subdirs.remove(".build-id") # don't recurse into .build-id directory we are creating
|
||||
|
||||
for file in files:
|
||||
|
||||
#
|
||||
# scrape the output of readelf to find the buildid for this binary
|
||||
#
|
||||
p = subprocess.Popen(["readelf", '-n', os.path.join(dir,file)], stdout=subprocess.PIPE)
|
||||
for line in iter(p.stdout.readline, ""):
|
||||
m = re.search('Build ID: (\w{2})(\w+)',line)
|
||||
if m:
|
||||
linkdir = os.path.join(args.runtime,"usr/lib/debug/.build-id",m.group(1))
|
||||
if not os.access(linkdir, os.W_OK):
|
||||
os.makedirs(linkdir)
|
||||
link = os.path.join(linkdir,m.group(2))
|
||||
print "SYMLINKING symbol file %s to %s" % (link, os.path.relpath(os.path.join(dir,file),linkdir))
|
||||
if os.path.lexists(link):
|
||||
os.unlink(link)
|
||||
os.symlink(os.path.relpath(os.path.join(dir,file), linkdir),link)
|
||||
|
||||
|
||||
args = parse_args()
|
||||
|
||||
|
||||
print ("Creating Steam Runtime in %s" % args.runtime)
|
||||
|
||||
with open(args.input) as pkgfile:
|
||||
pkgs = json.load(pkgfile)
|
||||
for pkg in pkgs:
|
||||
install_deb(pkg["name"], pkg["source"], args.runtime)
|
||||
|
||||
fix_debuglinks()
|
||||
fix_symlinks()
|
||||
|
||||
# vi: set noexpandtab:
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,20 +0,0 @@
|
||||
{ pkgs ? import <nixpkgs> {} }:
|
||||
|
||||
let
|
||||
inherit (pkgs) lib;
|
||||
rt = import ./runtime-generated.nix { inherit (pkgs) fetchurl; };
|
||||
convRt = x: {
|
||||
path = lib.removePrefix "mirror://steamrt/" x.url;
|
||||
file = x.source;
|
||||
};
|
||||
files = builtins.map convRt (lib.concatLists (lib.attrValues rt));
|
||||
|
||||
in pkgs.stdenv.mkDerivation {
|
||||
name = "steam-runtime-mirror";
|
||||
buildCommand = ''
|
||||
mkdir $out
|
||||
'' + lib.concatMapStringsSep "\n" (x: ''
|
||||
mkdir -p $(dirname $out/${x.path})
|
||||
ln -sf ${x.file} $out/${x.path}
|
||||
'') files;
|
||||
}
|
||||
@ -1,17 +1,25 @@
|
||||
{ stdenv, steamArch, fetchurl, writeText, python2, dpkg }:
|
||||
{ stdenv, steamArch, fetchurl, }:
|
||||
|
||||
let input = builtins.getAttr steamArch (import ./runtime-generated.nix { inherit fetchurl; });
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
inputFile = writeText "steam-runtime.json" (builtins.toJSON input);
|
||||
name = "steam-runtime";
|
||||
# from https://repo.steampowered.com/steamrt-images-scout/snapshots/
|
||||
version = "0.20200417.0";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
name = "steam-runtime-2016-08-13";
|
||||
|
||||
nativeBuildInputs = [ python2 dpkg stdenv.cc.bintools ];
|
||||
src =
|
||||
if steamArch == "amd64" then fetchurl {
|
||||
url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/com.valvesoftware.SteamRuntime.Platform-amd64,i386-scout-runtime.tar.gz";
|
||||
sha256 = "0kps8i5v23sycqm69xz389n8k831jd7ncsmlrkky7nib2q91rbvj";
|
||||
name = "scout-runtime-${version}.tar.gz";
|
||||
} else fetchurl {
|
||||
url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/com.valvesoftware.SteamRuntime.Platform-i386-scout-runtime.tar.gz";
|
||||
sha256 = "03fhac1r25xf7ia2pd35wjw360v5pa9h4870yrhhygp9h7v4klzf";
|
||||
name = "scout-runtime-i386-${version}.tar.gz";
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
mkdir -p $out
|
||||
python2 ${./build-runtime.py} -i ${inputFile} -r $out
|
||||
tar -C $out -x --strip=1 -f $src files/
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
with import <nixpkgs> {};
|
||||
|
||||
(python2.buildEnv.override {
|
||||
extraLibs = with python2Packages;
|
||||
[ debian
|
||||
];
|
||||
postBuild = ''
|
||||
mkdir -p $out/bin
|
||||
for i in ${nixUnstable}/bin/*; do
|
||||
ln -s $i $out/bin/$(basename $i)
|
||||
done
|
||||
'';
|
||||
}).env
|
||||
@ -1,141 +0,0 @@
|
||||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i python2 -p "with python2Packages; [python debian]"
|
||||
|
||||
# Script to build a Nix script to actually build a Steam runtime.
|
||||
# Patched version of https://github.com/ValveSoftware/steam-runtime/blob/master/build-runtime.py
|
||||
|
||||
import os
|
||||
import re
|
||||
import sys
|
||||
import urllib
|
||||
import gzip
|
||||
import cStringIO
|
||||
import subprocess
|
||||
from debian import deb822
|
||||
import argparse
|
||||
|
||||
destdir="newpkg"
|
||||
arches=["amd64", "i386"]
|
||||
|
||||
REPO="http://repo.steampowered.com/steamrt"
|
||||
DIST="scout"
|
||||
COMPONENT="main"
|
||||
|
||||
out = open("runtime-generated.nix", "w")
|
||||
out.write("# This file is autogenerated! Do not edit it yourself, use update-runtime.py for regeneration.\n")
|
||||
out.write("{ fetchurl }:\n")
|
||||
out.write("\n")
|
||||
out.write("{\n")
|
||||
|
||||
def parse_args():
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument("-b", "--beta", help="build beta runtime", action="store_true")
|
||||
parser.add_argument("-d", "--debug", help="build debug runtime", action="store_true")
|
||||
parser.add_argument("--symbols", help="include debugging symbols", action="store_true")
|
||||
parser.add_argument("--repo", help="source repository", default=REPO)
|
||||
return parser.parse_args()
|
||||
|
||||
def download_file(file_base, file_name, file_url, sha256):
|
||||
file_shortname = file_base + ".deb"
|
||||
out.write(" rec {\n")
|
||||
out.write(" name = \"%s\";\n" % file_name)
|
||||
out.write(" sha256 = \"%s\";\n" % sha256)
|
||||
out.write(" url = \"%s\";\n" % file_url.replace(REPO, "mirror://steamrt", 1))
|
||||
out.write(" source = fetchurl {\n")
|
||||
out.write(" inherit url sha256;\n")
|
||||
out.write(" name = \"%s\";\n" % file_shortname)
|
||||
out.write(" };\n")
|
||||
out.write(" }\n")
|
||||
|
||||
|
||||
def parse_dependencies (arch, binarylist):
|
||||
packages_url = "%s/dists/%s/%s/binary-%s/Packages" % (REPO, DIST, COMPONENT, arch)
|
||||
for stanza in deb822.Packages.iter_paragraphs(urllib.urlopen(packages_url)):
|
||||
p = stanza['Package']
|
||||
if p in binarylist:
|
||||
for deps in stanza.relations['depends']:
|
||||
for dep in deps:
|
||||
binarylist.add(dep['name'])
|
||||
return binarylist
|
||||
|
||||
def install_binaries (arch, binarylist):
|
||||
installset = parse_dependencies(arch, binarylist.copy())
|
||||
# Steam doesn't start if we include their libc
|
||||
installset.remove("libc6")
|
||||
|
||||
#
|
||||
# Load the Packages file so we can find the location of each binary package
|
||||
#
|
||||
packages_url = "%s/dists/%s/%s/binary-%s/Packages" % (REPO, DIST, COMPONENT, arch)
|
||||
print("Downloading %s binaries from %s" % (arch, packages_url))
|
||||
for stanza in deb822.Packages.iter_paragraphs(urllib.urlopen(packages_url)):
|
||||
p = stanza['Package']
|
||||
if p in installset:
|
||||
print("DOWNLOADING BINARY: %s" % p)
|
||||
|
||||
#
|
||||
# Download the package and install it
|
||||
#
|
||||
file_url="%s/%s" % (REPO,stanza['Filename'])
|
||||
download_file(p, os.path.splitext(os.path.basename(stanza['Filename']))[0], file_url, stanza["SHA256"])
|
||||
installset.remove(p)
|
||||
|
||||
for p in installset:
|
||||
#
|
||||
# There was a binary package in the list to be installed that is not in the repo
|
||||
#
|
||||
e = "ERROR: Package %s not found in Packages file %s\n" % (p, packages_url)
|
||||
sys.stderr.write(e)
|
||||
|
||||
|
||||
|
||||
def install_symbols (arch, binarylist):
|
||||
#
|
||||
# Load the Packages file to find the location of each symbol package
|
||||
#
|
||||
packages_url = "%s/dists/%s/%s/debug/binary-%s/Packages" % (REPO, DIST, COMPONENT, arch)
|
||||
print("Downloading %s symbols from %s" % (arch, packages_url))
|
||||
for stanza in deb822.Packages.iter_paragraphs(urllib.urlopen(packages_url)):
|
||||
p = stanza['Package']
|
||||
m = re.match('([\w\-\.]+)\-dbgsym', p)
|
||||
if m and m.group(1) in binarylist:
|
||||
print("DOWNLOADING SYMBOLS: %s" % p)
|
||||
#
|
||||
# Download the package and install it
|
||||
#
|
||||
file_url="%s/%s" % (REPO,stanza['Filename'])
|
||||
download_file(p, os.path.splitext(os.path.basename(stanza['Filename']))[0], file_url)
|
||||
|
||||
|
||||
|
||||
args = parse_args()
|
||||
|
||||
REPO=args.repo
|
||||
|
||||
if args.beta:
|
||||
DIST="steam_beta"
|
||||
|
||||
if args.debug:
|
||||
COMPONENT = "debug"
|
||||
|
||||
# Process packages.txt to get the list of source and binary packages
|
||||
binary_pkgs = set()
|
||||
|
||||
print ("Creating runtime-generated.nix")
|
||||
|
||||
# https://github.com/ValveSoftware/steam-runtime/blob/173ef028fb6b84e804f4e1b0ef11c12ffd4f3a8e/build-runtime.py#L264
|
||||
binary_pkgs.add("steamrt-libs")
|
||||
binary_pkgs.add("steamrt-legacy")
|
||||
|
||||
for arch in arches:
|
||||
out.write(" %s = [\n" % arch)
|
||||
install_binaries(arch, binary_pkgs)
|
||||
|
||||
if args.symbols:
|
||||
install_symbols(arch, binary_pkgs)
|
||||
|
||||
out.write(" ];\n");
|
||||
|
||||
out.write("}\n")
|
||||
|
||||
# vi: set noexpandtab:
|
||||
Loading…
Reference in New Issue
Block a user