From 870addbffc759a0e5492722d5d65d05707a1e4ef Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 15 Feb 2009 23:57:15 +0100 Subject: [PATCH] Add a "noarch" var. Used by packages that aren't arch specific. --HG-- extra : convert_revision : 263bd27542e1f2e65f119eb307d37d7b7ade3236 --- shutils/tmpl_funcs.sh | 2 +- templates/initramfs-tools/template | 1 + templates/man-pages/template | 2 ++ templates/xbps-base-chroot/template | 1 + templates/xbps-base-dirs/template | 1 + templates/xbps-base-system/template | 2 ++ 6 files changed, 8 insertions(+), 1 deletion(-) diff --git a/shutils/tmpl_funcs.sh b/shutils/tmpl_funcs.sh index 3bfee5e87c3..2ec8de7343c 100644 --- a/shutils/tmpl_funcs.sh +++ b/shutils/tmpl_funcs.sh @@ -68,7 +68,7 @@ reset_tmpl_vars() build_depends libtool_fixup_la_stage no_fixup_libtool \ disable_parallel_build run_depends cross_compiler \ only_for_archs patch_args conf_files keep_dirs \ - install_priority \ + install_priority noarch \ XBPS_EXTRACT_DONE XBPS_CONFIGURE_DONE \ XBPS_BUILD_DONE XBPS_INSTALL_DONE" diff --git a/templates/initramfs-tools/template b/templates/initramfs-tools/template index 6fea341912f..7a97e7b6ca1 100644 --- a/templates/initramfs-tools/template +++ b/templates/initramfs-tools/template @@ -18,6 +18,7 @@ long_desc=" LVM2, LUKS or NFS is also supported. Any boot loader with initrd support is able to load an initramfs archive." +noarch=yes keep_dirs="/var/lib/$pkgname" config_files="/etc/$pkgname/initramfs.conf /etc/$pkgname/update-initramfs.conf" build_depends="cpio-2.9 util-linux-ng-2.14 klibc-1.5.14 diff --git a/templates/man-pages/template b/templates/man-pages/template index 29d7e54b1af..efc2a26b01d 100644 --- a/templates/man-pages/template +++ b/templates/man-pages/template @@ -10,3 +10,5 @@ maintainer="Juan RP " checksum=c836005c6754a21904e47ab9e95e635108d6de1b54359c9ba0dbc07d6e9383de long_desc=" The Linux Documentation Project (LDP) manual pages." + +noarch=yes diff --git a/templates/xbps-base-chroot/template b/templates/xbps-base-chroot/template index 15cf97dd43d..23c057048e4 100644 --- a/templates/xbps-base-chroot/template +++ b/templates/xbps-base-chroot/template @@ -8,6 +8,7 @@ long_desc=" This package installs all necessary packages to be able to build packages inside of a chroot and continue installing them." +noarch=yes base_chroot=yes build_depends="glibc-2.8 kernel-libc-headers-2.6.27.3 bash-3.2 coreutils-6.12 bison-2.3 texinfo-4.13 m4-1.4.12 libarchive-2.5.5 binutils-2.18 gcc-4.3.2 diff --git a/templates/xbps-base-dirs/template b/templates/xbps-base-dirs/template index fa499fe6437..79160b7da0a 100644 --- a/templates/xbps-base-dirs/template +++ b/templates/xbps-base-dirs/template @@ -8,6 +8,7 @@ long_desc=" This package installs the base system directories." base_chroot=yes +noarch=yes install_priority=100 do_install() diff --git a/templates/xbps-base-system/template b/templates/xbps-base-system/template index 114797e81b2..deca366c1a5 100644 --- a/templates/xbps-base-system/template +++ b/templates/xbps-base-system/template @@ -8,6 +8,8 @@ long_desc=" This package installs the base system packages to be able to build your own full GNU/Linux system through xbps." +noarch=yes + build_depends="man-pages-3.11 man-db-2.5.2 util-linux-ng-2.14.1 initramfs-tools-0.92 less-4.24 kbd-1.14.1 procps-3.2.7 sysklogd-1.5 eject-2.1.5 sudo-1.6.9 shadow-4.1 openssl-0.9.8