From 7950b079dc057aeb0054e3ccaec91e9e8b0235a5 Mon Sep 17 00:00:00 2001 From: Philip Date: Mon, 29 Dec 2014 16:53:54 +0100 Subject: [PATCH] conf - bump to linux317 for early microcode loading - however, I didn't got how to set default values --- README.md | 15 +-------------- conf/manjaro-tools.conf | 2 +- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index de83027..6da53f1 100644 --- a/README.md +++ b/README.md @@ -79,7 +79,7 @@ If the userconfig is present, manjaro-tools will load userconfig values, however # iso_version=0.8.11 # unset defaults to given value -# manjaro_kernel="linux316" +# manjaro_kernel="linux317" # unset defaults to given value, specify a date here of have it automatically set # manjaro_version="$(date +%Y.%m)" @@ -136,10 +136,6 @@ If the userconfig is present, manjaro-tools will load userconfig values, however # start_openrc_live=('bluetooth' 'networkmanager' 'connman') ~~~ - - - - 1.1. new config files in iso profiles Each iso profile must have these files or symlinks to shared: @@ -165,15 +161,12 @@ It can be configure with manjaro-tools.conf or by args buildpackage creates by default a pkg cache dir in /var/cache/manjaro-tools/ Subdirectories will be created when building for the brach and architecture. - A word on makepkg.conf PKGDEST manjarotools.conf supports the makepkg.conf variables If you set PKGDEST all works fine, but be careful, that your PKGDEST is clean, or else buildpkg will move all files from PKGDEST to cache dir , not only the built package. - 2.1. Arguments - The help(for x86_64 and manjaro-tools.conf set): ~~~ @@ -248,9 +241,6 @@ If you create a set manually, the set must have a .set extension. Example: /etc/manjaro-tools/sets/lxqt-0.8.set - - - 3. buildiso buildiso is used to build manjaro-iso-profiles. It is run insde a iso profile folder. @@ -263,7 +253,6 @@ manjaro-livecd-cli-installer manjaro-livecd-openrc (openrc-run scripts for livecd) manjaro-livecd-systemd (systemd units for livecd) - 3.1 Arguments The help: @@ -302,7 +291,6 @@ buildiso -v -b testing the branch can be defined also in manjaro-tools.conf, but a manual parameter will always override conf settings. - 3.1.1 Default parameteres set -c @@ -314,7 +302,6 @@ high compression -A auto service configuration - 3.1.2 Special parameters -A diff --git a/conf/manjaro-tools.conf b/conf/manjaro-tools.conf index e821ddf..92d4462 100644 --- a/conf/manjaro-tools.conf +++ b/conf/manjaro-tools.conf @@ -64,7 +64,7 @@ # iso_version=0.8.11 # unset defaults to given value -# manjaro_kernel="linux316" +# manjaro_kernel="linux317" # unset defaults to given value, specify a date here of have it automatically set # manjaro_version="$(date +%Y.%m)"