Move arch-specific stuff into their own subdirs

2020-04-16 19:35:58 +02:00 · 2020-04-16 19:35:58 +02:00 · bf666b857a
parent a3f9f98549
commit bf666b857a
7 changed files with 4 additions and 4 deletions
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@ -5,7 +5,7 @@ WORKDIR /archlinux
 RUN mkdir -p /archlinux/rootfs

 COPY pacstrap-docker /archlinux/
-COPY rootfs/etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist
+COPY rootfs/alarm/etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist

 RUN ./pacstrap-docker /archlinux/rootfs \
 	bash sed gzip pacman base base-devel
@ -15,7 +15,7 @@ RUN rm rootfs/var/lib/pacman/sync/*

 FROM scratch
 COPY --from=0 /archlinux/rootfs/ /
-COPY rootfs/ /
+COPY rootfs/alarm/ /

 ENV LANG=en_US.UTF-8

--- a/Dockerfile.armv7h
+++ b/Dockerfile.armv7h
@ -5,7 +5,7 @@ WORKDIR /archlinux
 RUN mkdir -p /archlinux/rootfs

 COPY pacstrap-docker /archlinux/
-COPY rootfs/etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist
+COPY rootfs/alarm/etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist

 RUN ./pacstrap-docker /archlinux/rootfs \
 	bash sed gzip pacman base base-devel
@ -17,7 +17,7 @@ RUN ls -la /archlinux/rootfs/
 FROM scratch
 COPY --from=0 /archlinux/rootfs/ /
 RUN ls -la /
-COPY rootfs/ /
+COPY rootfs/alarm/ /

 ENV LANG=en_US.UTF-8

--- a/rootfs/alarm/etc/locale.conf
+++ b/rootfs/alarm/etc/locale.conf
--- a/rootfs/alarm/etc/locale.gen
+++ b/rootfs/alarm/etc/locale.gen
--- a/rootfs/alarm/etc/pacman.d/mirrorlist
+++ b/rootfs/alarm/etc/pacman.d/mirrorlist
--- a/rootfs/alarm/usr/share/libalpm/hooks/man-page-remove.hook
+++ b/rootfs/alarm/usr/share/libalpm/hooks/man-page-remove.hook
--- a/rootfs/alarm/usr/share/libalpm/hooks/package-cleanup.hook
+++ b/rootfs/alarm/usr/share/libalpm/hooks/package-cleanup.hook