From c04db16b9747324bad19bfaa47a9e7909503c905 Mon Sep 17 00:00:00 2001 From: udeved Date: Thu, 29 Jan 2015 14:09:05 +0100 Subject: [PATCH] add pacman-gfx and pacman-lng --- Makefile | 24 ++++++++------- conf/pacman-gfx.conf | 73 ++++++++++++++++++++++++++++++++++++++++++++ conf/pacman-lng.conf | 73 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 159 insertions(+), 11 deletions(-) create mode 100644 conf/pacman-gfx.conf create mode 100644 conf/pacman-lng.conf diff --git a/Makefile b/Makefile index 9470be3..90c3d87 100644 --- a/Makefile +++ b/Makefile @@ -27,10 +27,10 @@ SYSCONFIGFILES = \ SETS_PKG = \ sets/pkg/default.set - + SETS_ISO = \ sets/iso/default.set - + CONFIGFILES = \ conf/makepkg-i686.conf \ conf/makepkg-x86_64.conf \ @@ -38,30 +38,32 @@ CONFIGFILES = \ conf/pacman-multilib.conf \ conf/pacman-mirrors-stable.conf \ conf/pacman-mirrors-testing.conf \ - conf/pacman-mirrors-unstable.conf - + conf/pacman-mirrors-unstable.conf \ + conf/pacman-gfx.conf \ + conf/pacman-lng.conf + LIBS = \ lib/util.sh \ lib/util-mount.sh \ lib/util-msg.sh \ lib/util-pkg.sh \ - lib/util-livecd.sh \ - lib/util-iso.sh \ lib/util-fstab.sh \ + lib/util-iso.sh \ lib/util-iso-image.sh \ - lib/util-iso-calamares.sh + lib/util-iso-calamares.sh \ + lib/util-livecd.sh CPIOHOOKS = \ initcpio/hooks/miso \ initcpio/hooks/miso_loop_mnt \ initcpio/hooks/miso_pxe_nbd - + CPIOINST = \ initcpio/inst/miso \ initcpio/inst/miso_loop_mnt \ initcpio/inst/miso_pxe_nbd \ initcpio/inst/miso_kms - + SCRIPTS = \ scripts/mhwd-live \ scripts/livecd @@ -104,7 +106,7 @@ install: install -m0755 ${CPIOINST} $(DESTDIR)$(PREFIX)/lib/initcpio/install install -dm0755 $(DESTDIR)$(PREFIX)/share/manjaro-tools/scripts install -m0644 ${SCRIPTS} $(DESTDIR)$(PREFIX)/share/manjaro-tools/scripts - + # install -Dm0644 bin/bash_completion $(DESTDIR)/$(PREFIX)/share/bash-completion/completions/manjaro_tools # install -Dm0644 bin/zsh_completion $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_manjaro_tools @@ -119,7 +121,7 @@ uninstall: for f in ${CPIOHOOKS}; do rm -f $(DESTDIR)$(PREFIX)/lib/initcpio/hooks/$$f; done for f in ${CPIOINST}; do rm -f $(DESTDIR)$(PREFIX)/lib/initcpio/install/$$f; done for f in ${SCRIPTS}; do rm -f $(DESTDIR)$(PREFIX)/share/manjaro-tools/scripts/$$f; done - + # rm $(DESTDIR)/$(PREFIX)/share/bash-completion/completions/manjaro_tools # rm $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_manjaro_tools diff --git a/conf/pacman-gfx.conf b/conf/pacman-gfx.conf new file mode 100644 index 0000000..6e26d06 --- /dev/null +++ b/conf/pacman-gfx.conf @@ -0,0 +1,73 @@ +# +# /etc/pacman.conf +# +# See the pacman.conf(5) manpage for option and repository directives + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +#CacheDir = /var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +#GPGDir = /etc/pacman.d/gnupg/ +HoldPkg = pacman glibc +# If upgrades are available for these packages they will be asked for first +SyncFirst = pacman +#XferCommand = /usr/bin/curl -C - -f %u > %o +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#CleanMethod = KeepInstalled +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options +#UseSyslog +#UseDelta +#TotalDownload +CheckSpace +#VerbosePkgLists + +# PGP signature checking +# NOTE: None of this will work without running `pacman-key --init` first. +# The compiled in default is equivalent to the following line. This requires +# you to locally sign and trust packager keys using `pacman-key` for them to be +# considered valid. +#SigLevel = Optional TrustedOnly +# If you wish to check signatures but avoid local sign and trust issues, use +# the following line. This will treat any key imported into pacman's keyring as +# trusted. +#SigLevel = Optional TrustAll +# For now, off by default unless you read the above. +SigLevel = Never + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +[gfx-pkgs] +#SigLevel = Optional TrustAll +Server = file:///opt/livecd/pkgs diff --git a/conf/pacman-lng.conf b/conf/pacman-lng.conf new file mode 100644 index 0000000..a9f0e48 --- /dev/null +++ b/conf/pacman-lng.conf @@ -0,0 +1,73 @@ +# +# /etc/pacman.conf +# +# See the pacman.conf(5) manpage for option and repository directives + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +#CacheDir = /var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +#GPGDir = /etc/pacman.d/gnupg/ +HoldPkg = pacman glibc +# If upgrades are available for these packages they will be asked for first +SyncFirst = pacman +#XferCommand = /usr/bin/curl -C - -f %u > %o +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#CleanMethod = KeepInstalled +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options +#UseSyslog +#UseDelta +#TotalDownload +CheckSpace +#VerbosePkgLists + +# PGP signature checking +# NOTE: None of this will work without running `pacman-key --init` first. +# The compiled in default is equivalent to the following line. This requires +# you to locally sign and trust packager keys using `pacman-key` for them to be +# considered valid. +#SigLevel = Optional TrustedOnly +# If you wish to check signatures but avoid local sign and trust issues, use +# the following line. This will treat any key imported into pacman's keyring as +# trusted. +#SigLevel = Optional TrustAll +# For now, off by default unless you read the above. +SigLevel = Never + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +[lng-pkgs] +#SigLevel = Optional TrustAll +Server = file:///opt/livecd/lng