From 8ec869344e03865c6ac0673a6bcf99986a2fed14 Mon Sep 17 00:00:00 2001 From: udeved Date: Thu, 15 Jan 2015 06:48:34 +0100 Subject: [PATCH] update to version 0.9.6 --- README.md | 93 +++++++++++++++++++++++++------------------------------ 1 file changed, 42 insertions(+), 51 deletions(-) diff --git a/README.md b/README.md index 1253915..3562933 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ manjaro-tools ============= -Manjaro-tools-0.9.5 +Manjaro-tools-0.9.6 User manual @@ -39,6 +39,9 @@ If the userconfig is present, manjaro-tools will load userconfig values, however # default pkg buildset; name without .set extension # buildset_pkg=default +# custom build mirror server +# build_mirror=http://mirror.netzspielplatz.de/manjaro/packages + ############# eudev specific ############# # This is only useful if you compile packages against eudev @@ -57,7 +60,6 @@ If the userconfig is present, manjaro-tools will load userconfig values, however # chroots_iso=/opt/buildiso # default iso buildset; name without .set extension -# currently unused # buildset_iso=default ############## iso settings ############## @@ -169,10 +171,11 @@ The help(for x86_64 and manjaro-tools.conf set): ~~~ $ buildpkg -h Usage: buildpkg [options] [--] [makepkg args] - -p Set profile or pkg [default: default] - -a Set arch [default: x86_64] - -b Set branch [default: unstable] - -r Chroots directory [default: /srv/manjarobuild] + -p Set or pkg [default: default] + -a Arch [default: x86_64] + -b Branch [default: unstable] + -r Chroots directory + [default: /build/buildpkg] -c Recreate chroot -w Clean up -n Install and run namcap check @@ -209,8 +212,8 @@ If the -c parameter is not used, buildpkg will update the existing chroot or cre 2.2 Sets -buildpkg support building from a list of ppkgbuilds -Default location of sets is /etc/manjaro-tools/manjaro-tools/sets +buildpkg supports building from a list of pkgbuilds +Default location of sets is /etc/manjaro-tools/manjaro-tools/sets/pkg but it can be configure in the conf file. 2.2.1 mkset @@ -233,19 +236,20 @@ Example: create a set for lxqt assuming a pure lxqt abs directory mkset -c lxqt-0.8 The set name should not be a name of a package, or else buildpkg won't recognize the build list and only bulds the package you specified, since the buildpkg -p arg handles set and package name. +Same applies for buildiso. If you create a set manually, the set must have a .set extension. - Example: /etc/manjaro-tools/sets/lxqt-0.8.set + Examples: + /etc/manjaro-tools/sets/pkg/lxqt-0.8.set + /etc/manjaro-tools/sets/iso/manjaro-0.9.0.set 3. buildiso -buildiso is used to build manjaro-iso-profiles. It is run insde a iso profile folder. -It now supports installing packages in a livecd chroot environment. +buildiso is used to build manjaro-iso-profiles. It is run insde the profiles folder. -New packages for livecd only: +Packages for livecd only: -manjaro-livecd (shared livecd skeletton) manjaro-livecd-cli-installer manjaro-livecd-openrc (openrc-run scripts for livecd) manjaro-livecd-systemd (systemd units for livecd) @@ -257,64 +261,51 @@ The help: ~~~ $ buildiso -h Usage: buildiso [options] - -a Set arch - [default: x86_64] - -b Set branch - [default: unstable] - -r Work directory - [default: /srv/manjaroiso] - -t Target iso directory - [default: /srv/manjaro-release-iso] - -v Verbose iso compression + -p Set or profile [default: default] + -a Arch [default: x86_64] + -b Branch [default: unstable] + -r Chroots directory + [default: /build/buildiso] + -c Disable clean work dir -q Query settings and pretend build - -c Disable clean work dir and target dir iso - -z Disable high compression - -A Disable auto configure services - -B Build images only - -G Generate iso only + -i Build images only + -s Generate iso only Requires pre built images - -P Disable clean pkgs cache - -L Disable clean lng cache - -C Use custom pacman.conf in iso profile + -x Disable clean xorg cache + -l Disable clean lng cache -h This help ~~~ Example: build xfce iso profile for both arches and branch testing on x86_64 build system: -buildiso -v -a i686 -b testing +buildiso -p xfce -a i686 -b testing -buildiso -v -b testing +buildiso -p xfce -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 -clean work dir & target dir, disabled will likely produce an error since work dir already exists +3.1.1 Special parameters --z -high compression --A -auto service configuration - -3.1.2 Special parameters - --A -By default, buildiso auto configures services on both DE image and livecd image. This can be set in manjaro-tools.cong. Using this parmater will disable auto config. The result is, that any service configuration in iso profiles was removed. This parameter serves as custom parameter if you chose to confiogre services in the profile. - --B +-i Build images only will stop after all packages have been installed. No iso sqfs compression will be executed --G +-s + Use this if you previously used -B to sqfs compress the chroots. --P +-x + By default, xorg package cache is cleaned on every build. Disabling the xorg cache cleaning will result in no dowload again for xorg drivers and the cache is used. Be careful with this option if you switch arches, it currently does not detect the pkg arch in the cache. So don't use it if you build for a different arch first time. --L +-l + Disable lng cache, by default lng cache is cleaned on every build. Uning this option will enable lng packages from cache rather than downloading them again. --C -Use custom pacman.conf located in profile \ No newline at end of file +3.2 Sets + +buildiso supports building from a list of iso profiles +Default location of sets is /etc/manjaro-tools/manjaro-tools/sets/iso +but it can be configured in the conf file. \ No newline at end of file