Skip to content

Commit

Permalink
Merge commit 'fd14f62168c5a7a5563f254dfcf37fd3b405c695' into sk-chime…
Browse files Browse the repository at this point in the history
…raos
  • Loading branch information
honjow committed Jan 24, 2024
2 parents b3fc1ad + fd14f62 commit 17e3219
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 4 deletions.
4 changes: 2 additions & 2 deletions build-iso.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ AUR_PACKAGES="\
"

ADDITIONAL_PACKAGES="\
https://github.com/3003n/linux-chimeraos/releases/download/v6.6.8-chos1-2/linux-chimeraos-6.6.8.chos1-2-x86_64.pkg.tar.zst \
https://github.com/3003n/linux-chimeraos/releases/download/v6.6.8-chos1-2/linux-chimeraos-headers-6.6.8.chos1-2-x86_64.pkg.tar.zst \
https://github.com/3003n/linux-chimeraos/releases/download/v6.6.13-chos1-2/linux-chimeraos-6.6.13.chos1-2-x86_64.pkg.tar.zst \
https://github.com/3003n/linux-chimeraos/releases/download/v6.6.13-chos1-2/linux-chimeraos-headers-6.6.13.chos1-2-x86_64.pkg.tar.zst \
"

# create repo directory if it doesn't exist yet
Expand Down
8 changes: 8 additions & 0 deletions chimeraos/airootfs/etc/os-release
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
NAME="ChimeraOS"
PRETTY_NAME="ChimeraOS"
ID=chimeraos
ID_LIKE=arch
ANSI_COLOR="1;31"
HOME_URL="https://chimeraos.org"
DOCUMENTATION_URL="https://chimeraos.org/about"
BUG_REPORT_URL="https://github.com/ChimeraOS/chimeraos/issues"
7 changes: 5 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@ FROM archlinux:base-devel
MAINTAINER Wouter Wijsman

#Install archiso
RUN yes | pacman -Syuu archiso lynx
RUN pacman --noconfirm -S --needed git pyalpm python-commonmark python-markdown-it-py python-wheel python-build python-installer python-setuptools python-hatchling
RUN pacman-key --init && \
pacman -Sy --noconfirm archlinux-keyring && \
pacman-key --populate archlinux && \
pacman --noconfirm -Syu
RUN pacman --noconfirm -S --needed archiso lynx git pyalpm python-commonmark python-markdown-it-py python-wheel python-build python-installer python-setuptools python-hatchling
RUN echo "%wheel ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \
useradd build -G wheel -m
RUN su - build -c "git clone https://aur.archlinux.org/pikaur.git /tmp/pikaur" && \
Expand Down

0 comments on commit 17e3219

Please sign in to comment.