fix: minor fixes for updated codebase

.gitignore

@@ -4,7 +4,7 @@
 /build
 /checkout
 
-/ostree-branch.inc
-/version.inc
-/channel.inc
+/include/ostree-branch.inc
+/include/version.inc
+/include/channel.inc
 /config.mk

Makefile

@@ -11,7 +11,7 @@ KEY_TYPES							:= PK KEK DB VENDOR linux-module-cert
 ALL_CERTS							 = $(foreach KEY,$(KEY_TYPES),assets/sign-keys/$(KEY).crt)
 ALL_KEYS							 = $(foreach KEY,$(KEY_TYPES),assets/sign-keys/$(KEY).key)
 BOOT_KEYS							 = $(ALL_KEYS) $(ALL_CERTS) assets/sign-keys/extra-db/.keep assets/sign-keys/extra-kek/.keep assets/sign-keys/modules/linux-module-cert.crt
-EXTENSIONS							 = $(wildcard external/extensions/*.yml)
+EXTENSIONS							 = $(wildcard extensions/*.recipe)
 
 -include config.mk
 
@@ -82,7 +82,7 @@ extensions: $(IGNITE)
 build/build.ninja: CMakeLists.txt
 	cmake -B build -G Ninja
 
-$(IGNITE): build/build.ninja version.yml ostree-branch.yml channel.yml
+$(IGNITE): build/build.ninja include/version.inc include/ostree-branch.inc include/channel.inc
 	@cmake --build build --target ignite
 
 clean:
@@ -120,16 +120,16 @@ endif
 	  $(OSTREE_REPO) $(ELEMENT)													\
 	  $(OSTREE_BRANCH)
 
-version.yml:
+include/version.inc:
 	@echo "version: ${VERSION}" > $@
 	@echo "variables:" >> $@
 	@echo "  channel: ${CHANNEL}" >> $@
 
-ostree-branch.yml:
+include/ostree-branch.inc:
 	@echo "variables:" > $@
 	@echo "  ostree-branch: ${OSTREE_BRANCH}" >> $@
 
- channel.yml:
+ include/channel.inc:
 	@echo "variables:" > $@
 	@echo "  channel: ${CHANNEL}" >> $@
 

components/initial-setup.recipe

@@ -1,7 +1,7 @@
 id: initial-setup
 version: 2.0.12
 about: System Initial Setup
-merge: [ostree-branch.inc]
+merge: [include/ostree-branch.inc]
 
 commit: 2835b2c61d0fe2cc4a92b4ae5a663057ba4a5f1f
 

components/release-info.recipe

@@ -1,5 +1,5 @@
 id: release-info
-merge: [version.inc]
+merge: [include/version.inc]
 about: rlxos Release information
 
 build-depends:

include/extension.inc

@@ -10,4 +10,4 @@ initial-commands: |-
 
 ostree-branch: x86_64/extension/%{id}/%{channel}
 
-merge: [channel.inc, include/ostree.inc]
+merge: [include/channel.inc, include/ostree.inc]

installer/image.recipe

@@ -1,5 +1,5 @@
 id: ostree-installer
-merge: [version.inc, ostree-branch.inc, include/installer.inc]
+merge: [include/version.inc, include/ostree-branch.inc, include/installer.inc]
 about: OSTree Installer ISO
 
 include:

system/repo.recipe

@@ -1,6 +1,6 @@
 id: system-repo
 about: System Repository
-merge: [version.inc, ostree-branch.inc, include/ostree.inc]
+merge: [include/version.inc, include/ostree-branch.inc, include/ostree.inc]
 
 capabilities:
   - CAP_SYS_CHROOT

tools/ignite/Ignite.ixx

@@ -125,13 +125,12 @@ public:
     }
 
     void load() {
-        auto external_path = project_path / "external";
         for (auto const& i :
-                std::filesystem::recursive_directory_iterator(external_path)) {
+                std::filesystem::recursive_directory_iterator(project_path)) {
             if (i.is_regular_file() && i.path().has_extension() &&
-                    i.path().extension() == ".yml") {
-                auto element_path =
-                        std::filesystem::relative(i.path(), external_path);
+                    i.path().extension() == ".recipe") {
+                const auto element_path =
+                        std::filesystem::relative(i.path(), project_path);
                 try {
                     pool[element_path.string()] =
                             Recipe(i.path(), project_path);

tools/ignite/Recipe.ixx

@@ -72,7 +72,7 @@ struct Recipe final {
                 sources.emplace_back(dep.as<std::string>());
         }
         element_id = std::filesystem::path(
-                filepath.substr((search_path / "external").string().size() + 1))
+                filepath.substr((search_path).string().size() + 1))
                              .replace_extension();
     }