diff --git a/Dockerfile.agnos b/Dockerfile.agnos index a39fb6f..aae0c3b 100644 --- a/Dockerfile.agnos +++ b/Dockerfile.agnos @@ -47,6 +47,10 @@ COPY ./userspace/qtwayland/patch* /tmp/agnos/ RUN --mount=type=cache,target=/root/.ccache,id=qtwayland5,sharing=shared \ /tmp/agnos/compile-qtwayland5.sh +FROM agnos-compiler AS agnos-compiler-rep-ren +COPY ./userspace/compile-rep_ren.sh /tmp/agnos/ +RUN /tmp/agnos/compile-rep_ren.sh + # ################## # # ###### Base ###### # # ################## # @@ -151,6 +155,10 @@ RUN cd /tmp && apt-get -o Dpkg::Options::="--force-overwrite" install -yq --allo # Patched libeglSubDriverWayland with fixed nullptr deref in CommitBuffer COPY ./userspace/files/libeglSubDriverWayland.so.patched /lib/aarch64-linux-gnu/libeglSubDriverWayland.so +# Install rep and ren +COPY --from=agnos-compiler-rep-ren /tmp/rep-grep.deb /tmp/ren-find.deb /tmp/ +RUN cd /tmp && apt-get -o Dpkg::Options::="--force-overwrite" install -yq --allow-downgrades ./rep-grep.deb ./ren-find.deb + COPY ./userspace/home/ /home/$USERNAME/ COPY ./userspace/home/.config/ /root/.config RUN chown -R $USERNAME: /home/$USERNAME/.config diff --git a/userspace/compile-rep_ren.sh b/userspace/compile-rep_ren.sh new file mode 100755 index 0000000..aea3ac1 --- /dev/null +++ b/userspace/compile-rep_ren.sh @@ -0,0 +1,22 @@ +#!/bin/bash -e + +# Install rustup +curl https://sh.rustup.rs -sSf | bash -s -- -y +export PATH="/root/.cargo/bin:$PATH" + +# Install cargo-deb +cargo install cargo-deb + +# Package rep-grep +cd /tmp +git clone https://github.com/robenkleene/rep-grep.git +cd rep-grep +cargo deb +mv target/debian/rep-grep*.deb /tmp/rep-grep.deb + +# Package ren-find +cd /tmp +git clone https://github.com/robenkleene/ren-find.git +cd ren-find +cargo deb +mv target/debian/ren-find*.deb /tmp/ren-find.deb