cos: unify all cos packages (#651)

Unify all packages under the same collection.

Signed-off-by: Itxaka <[email protected]>

Author: Itxaka

packages/cos/build.yaml

@@ -1,5 +1,5 @@
-# Refer to https://luet-lab.github.io/docs/docs/concepts/packages/specfile/#build-specs
-# for the syntax format
+#### system/cos system/cos-container and recovery/cos start here
+{{ if or (eq .Values.name "cos-container") (eq .Values.name "cos" ) }}
 requires:
 - name: "cos-setup"
   category: "system"
@@ -131,3 +131,42 @@ excludes:
 - ^/run/.*
 
 {{ end }}
+{{- end}}
+#### system/cos system/cos-container and recovery/cos end here
+
+#### recovery/cos-img starts here
+{{ if eq .Values.name "cos-img" }}
+requires:
+  - category: "recovery"
+    name: "cos"
+    version: ">=0"
+copy:
+  - package:
+      category: "recovery"
+      name: "cos-squash"
+      version: ">=0"
+    source: "/."
+    destination: "/recovery"
+
+package_dir: "/output"
+steps:
+  - mkdir /output
+  - mksquashfs /recovery /output/recovery.squashfs -b 1024k -comp xz -Xbcj x86
+{{- end}}
+#### recovery/cos-img ends here
+
+#### recovery/cos-squash starts here
+{{ if eq .Values.name "cos-squash" }}
+requires:
+  - category: "recovery"
+    name: "cos"
+    version: ">=0"
+
+requires_final_images: true
+unpack: true
+
+excludes:
+  - ^/var/cache/luet
+  - ^/luetbuild
+{{- end}}
+#### recovery/cos-squash ends here

packages/cos/collection.yaml

@@ -7,6 +7,14 @@ packages:
     labels:
       autobump.revdeps: "true"
       autobump.revbump_related: "recovery/cos-img recovery/cos-squash"
+  - name: "cos-container"
+    category: "system"
+    version: 0.6.8+10
+    brand_name: "cOS"
+    description: "cOS container image, used to build cOS derivatives from scratch"
+    labels:
+      autobump.revdeps: "true"
+      autobump.revbump_related: "recovery/cos-img recovery/cos-squash"
   - name: "cos"
     category: "recovery"
     version: 0.6.8+10
@@ -15,11 +23,13 @@ packages:
     labels:
       autobump.revdeps: "true"
       autobump.revbump_related: "recovery/cos-img recovery/cos-squash"
-  - name: "cos-container"
-    category: "system"
-    version: 0.6.8+7
+  - name: "cos-img"
+    category: "recovery"
+    version: 0.6.8+10
     brand_name: "cOS"
-    description: "cOS container image, used to build cOS derivatives from scratch"
-    labels:
-      autobump.revdeps: "true"
-      autobump.revbump_related: "recovery/cos-img recovery/cos-squash"
+  - name: "cos-squash"
+    category: "recovery"
+    version: 0.6.8+10
+
+
+