Update cookbook

Update Makefile to use the new repo bin

See merge request redox-os/redox!1664

Makefile

@@ -32,7 +32,7 @@ clean: $(CONTAINER_TAG)
 ifeq ($(PODMAN_BUILD),1)
 	$(PODMAN_RUN) make $@
 else
-	cd cookbook && ./clean.sh
+	$(MAKE) c,--all
 	-rm -rf cookbook/repo
 	$(MAKE) fstools_clean
 	$(HOST_CARGO) clean --manifest-path relibc/Cargo.toml
@@ -45,8 +45,8 @@ distclean: $(CONTAINER_TAG)
 ifeq ($(PODMAN_BUILD),1)
 	$(PODMAN_RUN) make $@
 else
+	$(MAKE) u,--all
 	$(MAKE) clean
-	cd cookbook && ./unfetch.sh
 endif
 
 pull:

config/net.toml

@@ -20,7 +20,7 @@ dhcpd -b
 [[files]]
 path = "/etc/net/dns"
 data = """
-208.67.222.222
+9.9.9.9
 """
 
 [[files]]

config/x11.toml

@@ -17,9 +17,10 @@ libnettle = {}
 llvm18 = {}
 mesa-x11 = {}
 mesa-demos-x11 = {}
+servo = {}
 sqlite3 = {}
 twm = {}
-webkitgtk3 = {}
+#webkitgtk3 = {} # takes a long time to build
 xev = {}
 xeyes = {}
 xinit = {}
@@ -27,11 +28,11 @@ xkbcomp = {}
 xkbutils = {}
 xkeyboard-config = {}
 xserver-xorg = {}
-xserver-xorg-video-dummy = {}
+xserver-xorg-video-orbital = {}
 xterm = {}
 
 [[files]]
-path = "/usr/lib/init.d/20_xenv"
+path = "/usr/lib/init.d/10_xenv"
 data = """
 export DISPLAY :0
 export G_MESSAGES_DEBUG all
@@ -40,19 +41,58 @@ export WEBKIT_DEBUG all
 glib-compile-schemas /usr/share/glib-2.0/schemas/
 """
 
+# Overridden to launch X instead of orblogin
 [[files]]
-path = "/usr/lib/init.d/40_x"
+path = "/usr/lib/init.d/20_orbital"
 data = """
-bash /usr/bin/orbital-x11
+audiod
+export BROWSER /bin/netsurf-fb
+export VT 3
+orbital orbital-x11
+unset BROWSER
+unset VT
 """
 
 [[files]]
 path = "/usr/bin/orbital-x11"
+mode = 0o755
 data = """
 #!/usr/bin/env bash
 
 set -ex
 
+# Generate config file
+WIDTH="$((0x$(grep FRAMEBUFFER_WIDTH /scheme/sys/env | cut -d '=' -f 2)))"
+HEIGHT="$((0x$(grep FRAMEBUFFER_HEIGHT /scheme/sys/env | cut -d '=' -f 2)))"
+mkdir -p /usr/share/X11/xorg.conf.d
+cat > /usr/share/X11/xorg.conf.d/orbital.conf <<EOF
+Section "Device"
+    Identifier  "Configured Video Device"
+    Driver      "dummy"
+    VideoRam 256000
+EndSection
+
+Section "Monitor"
+    Identifier  "Configured Monitor"
+    HorizSync 5.0 - 1000.0
+    VertRefresh 5.0 - 200.0
+    $(cvt "${WIDTH}" "${HEIGHT}")
+EndSection
+
+Section "Screen"
+    Identifier  "Default Screen"
+    Monitor     "Configured Monitor"
+    Device      "Configured Video Device"
+    DefaultDepth 24
+    SubSection "Display"
+    Depth 24
+    Modes "${WIDTH}x${HEIGHT}"
+    EndSubSection
+EndSection
+EOF
+
+# Launch X11, twm, and xterm on display 0
+export DISPLAY=":0"
 X "${DISPLAY}" -verbose 6 &
 sleep 1
 twm &

cookbook

@@ -1 +1 @@
-Subproject commit 9f300ab9b8893b22af4f99fd3b808a1c5e418dff
+Subproject commit 418921621f010e4d6cf2edc79058de30826cc14d

mk/repo.mk

@@ -1,60 +1,36 @@
 # Configuration file for recipe commands
 
-$(BUILD)/fetch.tag: prefix $(FSTOOLS_TAG) $(FILESYSTEM_CONFIG) $(CONTAINER_TAG)
+$(REPO_TAG): $(FSTOOLS_TAG) $(CONTAINER_TAG)
 ifeq ($(PODMAN_BUILD),1)
 	$(PODMAN_RUN) make $@
 else
 	export PATH="$(PREFIX_PATH):$$PATH" && \
-	PACKAGES="$$($(LIST_PACKAGES) $(LIST_PACKAGES_OPTS) --short -c $(FILESYSTEM_CONFIG))" && \
 	export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \
-	cd cookbook && \
-	./fetch.sh $(REPO_NONSTOP) $(REPO_OFFLINE) "$${PACKAGES}"
+	PACKAGES="$$($(LIST_PACKAGES) $(LIST_PACKAGES_OPTS) --short -c $(FILESYSTEM_CONFIG))" && \
+	./cookbook/repo.sh $(REPO_NONSTOP) $(REPO_OFFLINE) --with-package-deps "$${PACKAGES}"
 	mkdir -p $(BUILD)
+	# make sure fstools.tag are newer than the things repo modifies
+	touch $(FSTOOLS_TAG)
 	touch $@
 endif
 
-$(REPO_TAG): $(BUILD)/fetch.tag $(FSTOOLS_TAG) $(CONTAINER_TAG)
-ifeq ($(PODMAN_BUILD),1)
-	$(PODMAN_RUN) make $@
-else
-	export PATH="$(PREFIX_PATH):$$PATH" && \
-	export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \
-	PACKAGES="$$($(LIST_PACKAGES) $(LIST_PACKAGES_OPTS) --short -c $(FILESYSTEM_CONFIG))" && \
-	cd cookbook && \
-	./repo.sh $(REPO_NONSTOP) $(REPO_OFFLINE) --with-package-deps "$${PACKAGES}"
-	mkdir -p $(BUILD)
-	# make sure fstools.tag and fetch.tag are newer than the things repo modifies
-	touch $(FSTOOLS_TAG)
-	touch $(BUILD)/fetch.tag
-	touch $@
-endif
+
+comma := ,
 
 # Find recipe
 find.%: $(FSTOOLS_TAG) FORCE
 ifeq ($(PODMAN_BUILD),1)
 	$(PODMAN_RUN) make $@
 else
-	export PATH="$(PREFIX_PATH):$$PATH" && \
-	export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \
-	cd cookbook && \
-	target/release/find_recipe $*
+	@cd ./cookbook && ./target/release/repo find $(foreach f,$(subst $(comma), ,$*),$(f))
 endif
 
-comma := ,
-
 # Invoke clean.sh for one or more targets separated by comma
 c.%: $(FSTOOLS_TAG) FORCE
 ifeq ($(PODMAN_BUILD),1)
 	$(PODMAN_RUN) make $@
 else
-	@if echo "$*" | grep -q ','; then \
-		$(MAKE) $(foreach f,$(subst $(comma), ,$*),c.$(f)); \
-	else \
-		export PATH="$(PREFIX_PATH):$$PATH" && \
-		export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \
-		cd cookbook && \
-		./clean.sh $*; \
-	fi
+	cd ./cookbook && ./target/release/repo clean $(foreach f,$(subst $(comma), ,$*),$(f))
 endif
 
 # Invoke fetch.sh for one or more targets separated by comma
@@ -62,14 +38,9 @@ f.%: $(FSTOOLS_TAG) FORCE
 ifeq ($(PODMAN_BUILD),1)
 	$(PODMAN_RUN) make $@
 else
-	@if echo "$*" | grep -q ','; then \
-		$(MAKE) $(foreach f,$(subst $(comma), ,$*),f.$(f)); \
-	else \
-		export PATH="$(PREFIX_PATH):$$PATH" && \
-		export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \
-		cd cookbook && \
-		./fetch.sh $*; \
-	fi
+	export PATH="$(PREFIX_PATH):$$PATH" && \
+	export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \
+	cd ./cookbook && ./target/release/repo fetch $(foreach f,$(subst $(comma), ,$*),$(f))
 endif
 
 # Invoke repo.sh for one or more targets separated by comma
@@ -77,14 +48,9 @@ r.%: $(FSTOOLS_TAG) FORCE
 ifeq ($(PODMAN_BUILD),1)
 	$(PODMAN_RUN) make $@
 else
-	@if echo "$*" | grep -q ','; then \
-		$(MAKE) $(foreach f,$(subst $(comma), ,$*),r.$(f)); \
-	else \
-		export PATH="$(PREFIX_PATH):$$PATH" && \
-		export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \
-		cd cookbook && \
-		./repo.sh $*; \
-	fi
+	export PATH="$(PREFIX_PATH):$$PATH" && \
+	export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \
+	./cookbook/repo.sh $(REPO_OFFLINE) $(foreach f,$(subst $(comma), ,$*),$(f))
 endif
 
 MOUNTED_TAG=$(MOUNT_DIR)~
@@ -100,34 +66,23 @@ p.%: $(FSTOOLS_TAG) FORCE
 ifeq ($(PODMAN_BUILD),1)
 	$(PODMAN_RUN) make $@
 else
-	@if echo "$*" | grep -q ','; then \
-		$(MAKE) $(foreach f,$(subst $(comma), ,$*),p.$(f)); \
-	else \
-		export RECIPE_PATH=cookbook/$(shell make find.$* | grep ^recipes) && \
-		export RECIPE_STAGE=$$RECIPE_PATH/target/$(TARGET)/stage.pkgar && \
-		./cookbook/pkgar/target/release/pkgar extract $(MOUNT_DIR)/ --archive $$RECIPE_STAGE \
-			--pkey ./cookbook/build/id_ed25519.pub.toml && \
-		echo "extracted $$RECIPE_PATH"; \
-	fi
+	cd ./cookbook && ./target/release/repo push $(foreach f,$(subst $(comma), ,$*),$(f)) "--sysroot=../$(MOUNT_DIR)"
 endif
 	@if [ -f $(MOUNTED_TAG) ]; then \
 		$(MAKE) unmount && rm -f $(MOUNTED_TAG); \
 	else echo "Not unmounting by ourself, don't forget to do it"; \
 	fi
 
+# Push compiled package with their package dependencies
+pp.%: $(FSTOOLS_TAG) FORCE
+	$(MAKE) p.$*,--with-package-deps
+
 # Invoke unfetch.sh for one or more targets separated by comma
 u.%: $(FSTOOLS_TAG) FORCE
 ifeq ($(PODMAN_BUILD),1)
 	$(PODMAN_RUN) make $@
 else
-	@if echo "$*" | grep -q ','; then \
-		$(MAKE) $(foreach f,$(subst $(comma), ,$*),u.$(f)); \
-	else \
-		export PATH="$(PREFIX_PATH):$$PATH" && \
-		export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \
-		cd cookbook && \
-		./unfetch.sh $*; \
-	fi
+	cd ./cookbook && ./target/release/repo unfetch $(foreach f,$(subst $(comma), ,$*),$(f))
 endif
 
 # Invoke clean.sh, and repo.sh for one of more targets separated by comma

relibc

@@ -1 +1 @@
-Subproject commit 56386f1e260a95eedd7448cded44cbbcc207cbb7
+Subproject commit c2eed49e2db695b4da09a7becd096183b809b075

scripts/category.sh

@@ -6,26 +6,9 @@ if [ -z "$1" ] || [ -z "$2" ]
 then
     echo "Build or clean all recipe directories in a category" >&2
     echo Usage: $0 "<action>" "<recipe-category>" >&2
-    echo "<action>" can be f, r, c, u, or combinations that \"make\" understands >&2
+    echo "<action>" can be f, r, c, u, p, or combinations that \"make\" understands >&2
+    echo "<category>" can be path of category you want to run e.g. \"core\", \"wip\", \"wip/dev\" >&2
     exit 1
 fi
 
-action="${1#-}"
-
-recipe_list=""
-first=1
-
-for recipe in `find cookbook/recipes/"$2" -name "recipe.*"`
-do
-    recipe_folder=`dirname "$recipe"`
-    recipe_name=`basename "$recipe_folder"`
-    if [ "$first" -eq 1 ]; then
-        recipe_list="$recipe_name"
-        first=0
-    else
-        recipe_list="$recipe_list,$recipe_name"
-    fi
-done
-
-set -x
-make "$action"."$recipe_list"
+make "${1#-}"."--category-$2"