make.sh: Refactor building packages

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2024-07-09 15:56:41 +00:00
parent 27d0a2c477
commit 20e4920621
2 changed files with 26 additions and 35 deletions

View File

@@ -377,7 +377,7 @@ define PAK
sed -i $(DIR_TMP_PAK)/ROOTFILES -e "/^#/d"
# Make package
cd $(DIR_TMP_PAK) && tar cf /install/packages/$(PROG)-$(VER)-$(PAK_VER).ipfire *
cd $(DIR_TMP_PAK) && tar cf $(PACKAGES_DIR)/$(PROG)-$(VER)-$(PAK_VER).ipfire *
# Cleanup
rm -rf $(DIR_TMP_PAK)
@@ -390,9 +390,9 @@ define PAK
-e "s/VER/$(VER)/g" \
-e "s/RELEASE/$(PAK_VER)/g" \
-e "s/DEPS/$(DEPS)/g" \
-e "s/SIZE/$$(stat --format=%s /install/packages/$(PROG)-$(VER)-$(PAK_VER).ipfire)/g" \
-e "s/SIZE/$$(stat --format=%s $(PACKAGES_DIR)/$(PROG)-$(VER)-$(PAK_VER).ipfire)/g" \
-e "s/SERVICES/$(SERVICES)/g" \
< /usr/src/src/pakfire/meta > /install/packages/meta-$(PROG)
< /usr/src/src/pakfire/meta > $(PACKAGES_DIR)/meta-$(PROG)
endef
define INSTALL_INITSCRIPT