builder: enhance work around missing profile.json

builder.nix

@@ -31,14 +31,15 @@ with pkgs;
 let
   inherit (import ./files.nix {
     inherit pkgs release target variant sha256 feedsSha256 packagesArch;
-  }) arch variantFiles profiles expandDeps allPackages;
+  }) arch variantFiles profiles expandDeps corePackages packagesByFeed allPackages;
 
   requiredPackages = (
-    profiles.default_packages or []
+    profiles.default_packages or (
-    ++
+      builtins.attrNames packagesByFeed.base
-    profiles.profiles.${profile}.device_packages or []
+      ++ builtins.attrNames corePackages
-    ++
+    )
-    packages
+    ++ profiles.profiles.${profile}.device_packages or []
+    ++ packages
   );
   allRequiredPackages = expandDeps allPackages requiredPackages;
 in
@@ -59,19 +60,23 @@ stdenv.mkDerivation {
     grep -r usr/bin/env
   '';
 
-  configurePhase = ''
+  configurePhase =
-    ${lib.concatMapStrings (pname:
+    let
-      let
+      installPackages = writeScript "install-openwrt-packages" (
-        package = allPackages.${pname};
+        lib.concatMapStrings (pname:
-      in
+          let
-        lib.optionalString
+            package = allPackages.${pname};
-          (package.type == "real")
+          in
-          "[ -e packages/${package.filename} ] || ln -s ${package.file} packages/${package.filename}\n"
+            lib.optionalString
-        )
+              (package.type == "real")
-      allRequiredPackages}
+              "[ -e packages/${package.filename} ] || ln -s ${package.file} packages/${package.filename}\n"
+        ) allRequiredPackages
+      );
+    in ''
+      ${installPackages}
 
-    echo "src imagebuilder file:packages" > repositories.conf
+      echo "src imagebuilder file:packages" > repositories.conf
-  '';
+    '';
 
   nativeBuildInputs =
     [

files.nix

@@ -198,6 +198,7 @@ let
 
 in {
   inherit allPackages;
+  inherit corePackages packagesByFeed;
   inherit expandDeps;
   inherit variantFiles;
   inherit profiles arch;