From 56d6057c8d85a5faa2a67383a5ed9e3210e1f23d Mon Sep 17 00:00:00 2001
From: ConYel <yeles.konstantinos@gmail.com>
Date: Mon, 27 May 2024 00:27:47 +0200
Subject: [PATCH] chore: change example for rust and fix some commands on
 contributing

---
 CONTRIBUTING.md | 19 ++++++++++---------
 README.md       | 30 ++++++++++++++++++++++++------
 2 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 30d02a0..0719210 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -18,10 +18,10 @@ Below are the steps and processes that we follow.
 Before reporting an issue, check our backlog of
 [open issues](https://codeberg.org/stagex/stagex/issues)
 to see if someone else has already reported it. If so, feel free to add
-your scenario, or additional information, to the discussion. Or simply
+your scenario, or additional information, to the discussion or simply
 "subscribe" to it to be notified when it is updated.
-If you find a new issue with the project we'd love to hear about it! The most
-important aspect of a bug report is that it includes enough information for
+If you find a new issue with the project we'd love to hear about it! 
+The most important aspect of a bug report is that it includes enough information for
 us to reproduce it. 
 Please don't include any private/sensitive information in your issue!
 
@@ -63,7 +63,7 @@ $ make all
 |
 OR
 |
-Prepopulate your local registry
+Prepopulate your docker local registry
 ```shell
 $ make preseed 
 $ rm -rf ./out/sxctl
@@ -76,11 +76,11 @@ new addition.
 cp -R packages/python packages/cython
 vim packages/cython/Containerfile
 # fix SRC_FILE, SRC_HASH, SRC_URL etc manually
-# incorporate anything relevant from Alpines build(){ block }  for {package} 
+# incorporate anything relevant from Alpine's build(){ block }  for {package} 
 # https://git.alpinelinux.org/aports/tree/main/cython/APKBUILD
 make gen-make
 make cython
-make digests 
+make digests.txt 
 ```
 
 Then you can commit {signed} and push your package and open a PR.
@@ -97,7 +97,8 @@ package=somepackage tar -tvf $(find out/${package} -type f -printf '%s %p\n' | s
 
 - test package for reproducibility:
 ```sh
-package=somepackage; rm -rf out{,2}/${package}; make NOCACHE=1 ${package}; mv out/${package} out2/; make NOCACHE=1 ${package}; diffoscope $(find out*/${package} -type f -printf '%s %p\n' | sort -nr | head -n2 | awk '{ print $2 }' | tr '\n' ' ')
+mkdir out2;
+package=somepackage; rm -rf out{,2}/${package}; make NOCACHE=1 ${package}; mv out/${package} out2/${package}; make NOCACHE=1 ${package}; diffoscope $(find out*/${package} -type f -printf '%s %p\n' | sort -nr | head -n2 | awk '{ print $2 }' | tr '\n' ' ')
 ```
 
 - make svg graph of dependency tree for a single package
@@ -109,8 +110,8 @@ package=somepackage; make -Bnd ${package} | make2graph | dot -Tsvg -o ${package}
 ## Submitting Pull Requests
 
 No Pull Request (PR) is too small! Typos, additional comments in the code,
-new test cases, bug fixes, new features, more documentation, ... it's all
-welcome!
+new test cases, bug fixes, new features, more documentation, ... all kinds
+of contribution are welcome.
 
 While bug fixes can first be identified via an "issue", that is not required.
 It's ok to just open up a PR with the fix, but make sure you include the same
diff --git a/README.md b/README.md
index 27e9b39..cbc20ea 100644
--- a/README.md
+++ b/README.md
@@ -34,18 +34,37 @@ docker run -i stagex/python -c "print('hello world')"
 ```
 
 Make a hello world OCI container image with Rust:
+<--author: panekj -->
+
 ```dockerfile
-FROM stagex/busybox as build
+FROM stagex/filesystem AS build
+COPY --from=stagex/busybox . /
 COPY --from=stagex/rust . /
 COPY --from=stagex/gcc . /
 COPY --from=stagex/binutils . /
 COPY --from=stagex/libunwind . /
-RUN printf 'fn main(){ println!("Hello World!"); }' > hello.rs
-RUN rustc hello.rs
+COPY --from=stagex/musl . /
+COPY --from=stagex/llvm . /
+COPY --from=stagex/zlib . /
+
+ENV TMPDIR=/tmp
+WORKDIR /home/user
+ENV RUSTFLAGS="-C panic=abort -C target-feature=+crt-static"
+
+RUN /usr/bin/rustc - -o ./hello <<EOF
+fn main(){
+  println!("Hello World!");
+}
+EOF
+
 FROM scratch
-COPY --from=build /home/user/hello .
-CMD ["./hello"]
+COPY --from=build /home/user/hello /hello
+COPY --from=stagex/musl . /
+COPY --from=stagex/libunwind . /
+COPY --from=stagex/gcc . /
+ENTRYPOINT ["/hello"]
 ```
+<--author: panekj -->
 
 ### Package Management
 
@@ -194,7 +213,6 @@ A comparison of `stagex` to other distros in some of the areas we care about:
 * As a policy, we expect all published signers to:
     * Maintain their PGP private keys offline and/or on personal HSMs
         * E.g. Nitrokey, Yubikey, Leger, Trezor, etc.
-    * Maintain a public key in the "keys" folder of this repository
     * Maintain a [keyoxide](https://keyoxide.org) profile self-certifying keys
     * Maintain a [Hagrid](https://keys.openpgp.org) profile with verified UIDs
     * Make best efforts to meet in person and sign each others keys