From bf666b857a9e8866f856a2d32d747655d13ee6b2 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Thu, 16 Apr 2020 19:35:58 +0200 Subject: [PATCH] Move arch-specific stuff into their own subdirs --- Dockerfile.aarch64 | 4 ++-- Dockerfile.armv7h | 4 ++-- rootfs/{ => alarm}/etc/locale.conf | 0 rootfs/{ => alarm}/etc/locale.gen | 0 rootfs/{ => alarm}/etc/pacman.d/mirrorlist | 0 .../{ => alarm}/usr/share/libalpm/hooks/man-page-remove.hook | 0 .../{ => alarm}/usr/share/libalpm/hooks/package-cleanup.hook | 0 7 files changed, 4 insertions(+), 4 deletions(-) rename rootfs/{ => alarm}/etc/locale.conf (100%) rename rootfs/{ => alarm}/etc/locale.gen (100%) rename rootfs/{ => alarm}/etc/pacman.d/mirrorlist (100%) rename rootfs/{ => alarm}/usr/share/libalpm/hooks/man-page-remove.hook (100%) rename rootfs/{ => alarm}/usr/share/libalpm/hooks/package-cleanup.hook (100%) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 6b40975..d375903 100644 --- 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 diff --git a/Dockerfile.armv7h b/Dockerfile.armv7h index 8474b99..d897b53 100644 --- 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 diff --git a/rootfs/etc/locale.conf b/rootfs/alarm/etc/locale.conf similarity index 100% rename from rootfs/etc/locale.conf rename to rootfs/alarm/etc/locale.conf diff --git a/rootfs/etc/locale.gen b/rootfs/alarm/etc/locale.gen similarity index 100% rename from rootfs/etc/locale.gen rename to rootfs/alarm/etc/locale.gen diff --git a/rootfs/etc/pacman.d/mirrorlist b/rootfs/alarm/etc/pacman.d/mirrorlist similarity index 100% rename from rootfs/etc/pacman.d/mirrorlist rename to rootfs/alarm/etc/pacman.d/mirrorlist diff --git a/rootfs/usr/share/libalpm/hooks/man-page-remove.hook b/rootfs/alarm/usr/share/libalpm/hooks/man-page-remove.hook similarity index 100% rename from rootfs/usr/share/libalpm/hooks/man-page-remove.hook rename to rootfs/alarm/usr/share/libalpm/hooks/man-page-remove.hook diff --git a/rootfs/usr/share/libalpm/hooks/package-cleanup.hook b/rootfs/alarm/usr/share/libalpm/hooks/package-cleanup.hook similarity index 100% rename from rootfs/usr/share/libalpm/hooks/package-cleanup.hook rename to rootfs/alarm/usr/share/libalpm/hooks/package-cleanup.hook