ehmry/nix-openwrt-imagebuilder
ehmry/nix-openwrt-imagebuilder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

builder: put variantPackages in its own derivation

Browse Source
This commit is contained in:
Astro 2022-04-27 02:38:20 +02:00
parent e11740497a
commit d8df8f0565
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
builder.nix
View File

@ -70,6 +70,15 @@ let
variantFiles = fetchSums "${baseUrl}/targets/${target}/${variant}" sha256; variantFiles = fetchSums "${baseUrl}/targets/${target}/${variant}" sha256;
variantPackages = runCommandNoCC "openwrt-${release}-${target}-${variant}-packages" {} ''
mkdir packages
${lib.concatMapStrings (file:
lib.optionalString (lib.hasPrefix "packages/" file) ''
ln -s ${variantFiles.${file}} ${file}
'') (builtins.attrNames variantFiles)}
mv packages $out
'';
feedsPackagesFile = builtins.mapAttrs (feed: sha256: feedsPackagesFile = builtins.mapAttrs (feed: sha256:
fetchurl { fetchurl {
url = "${baseUrl}/packages/${arch}/${feed}/Packages"; url = "${baseUrl}/packages/${arch}/${feed}/Packages";
@ -82,7 +91,7 @@ let
) feedsPackagesFile; ) feedsPackagesFile;
feedsPackages = builtins.mapAttrs (feed: files: feedsPackages = builtins.mapAttrs (feed: files:
runCommandNoCC "openwrt-${feed}-packages" {} '' runCommandNoCC "openwrt-${release}-${arch}-${feed}-packages" {} ''
mkdir $out mkdir $out
ln -s ${feedsPackagesFile.${feed}} $out/Packages ln -s ${feedsPackagesFile.${feed}} $out/Packages
${lib.concatMapStrings (file: '' ${lib.concatMapStrings (file: ''
@ -135,7 +144,7 @@ stdenv.mkDerivation {
configurePhase = '' configurePhase = ''
cat >repositories.conf <<EOF cat >repositories.conf <<EOF
src imagebuilder file:packages src imagebuilder file:${variantPackages}
${lib.concatMapStrings (feed: '' ${lib.concatMapStrings (feed: ''
src openwrt_${feed} file:${feedsPackages.${feed}} src openwrt_${feed} file:${feedsPackages.${feed}}
'') (builtins.attrNames feedsPackages)} '') (builtins.attrNames feedsPackages)}
@ -148,23 +157,10 @@ stdenv.mkDerivation {
ncurses which rsync git file getopt wget ncurses which rsync git file getopt wget
bash perl python3 bash perl python3
]; ];
buildPhase = buildPhase = ''
let make image SHELL=${runtimeShell} \
packagesDir = runCommandNoCC "openwrt-${release}-${target}-${variant}-packages" {} '' PROFILE="${profile}"
mkdir packages '';
${lib.concatMapStrings (file:
lib.optionalString (lib.hasPrefix "packages/" file) ''
ln -s ${variantFiles.${file}} ${file}
'') (builtins.attrNames variantFiles)}
mv packages $out
'';
in ''
rm -r packages
cp -r ${packagesDir} packages
chmod u+w -R packages
make image SHELL=${runtimeShell} PROFILE="${profile}"
'';
installPhase = '' installPhase = ''
cp -ar bin $out cp -ar bin $out