try to fix it

This commit is contained in:
udeved 2015-01-17 21:16:08 +01:00
parent e685dff361
commit f40094dbd6

View file

@ -16,21 +16,21 @@ Best practise is to leave systemwide file untouched, by default it is commented
Each iso profile must have these files or symlinks to shared: Each iso profile must have these files or symlinks to shared:
* initsys<br> * initsys
contains the init type string, systemd or openrc, could be eg a future runit implemetation too contains the init type string, systemd or openrc, could be eg a future runit implemetation too
* displaymanager<br> * displaymanager
contains the DM string contains the DM string
if no DM is used, set it to 'none' if no DM is used, set it to 'none'
* Packages-Livecd<br> * Packages-Livecd
contains packages you only want on livecd but not installed on the target system with installer contains packages you only want on livecd but not installed on the target system with installer
default files are in shared folder and can be symlinked or defined in a real file default files are in shared folder and can be symlinked or defined in a real file
If you need a custom livecd-overlay, create a overlay-livecd folder in your profile, and symlink from shared/overlay-livecd/your_selection and add your modification If you need a custom livecd-overlay, create a overlay-livecd folder in your profile, and symlink from shared/overlay-livecd/your_selection and add your modification
<li>buildpkg</li> <li>buildpkg</li>
<br>
buildpkg is the chroot build script oi manjaro-tools. buildpkg is the chroot build script oi manjaro-tools.
It it run in a abs/pkgbuilds directory which contains directories with PKGBUILD. It it run in a abs/pkgbuilds directory which contains directories with PKGBUILD.
It can be configured with manjaro-tools.conf or by args. It can be configured with manjaro-tools.conf or by args.
@ -42,7 +42,7 @@ 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. 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.
<ol><li>Arguments</li></ol> <ol><li>Arguments</li></ol>
<br>
The help(for x86_64 and manjaro-tools.conf set): The help(for x86_64 and manjaro-tools.conf set):
~~~ ~~~
@ -76,14 +76,14 @@ buildpkg -p sysvinit -b testing -cswn
You can drop the branch arg if you set the branch in manjaro-tools.conf You can drop the branch arg if you set the branch in manjaro-tools.conf
the arch can also be set in manjaro-tools.conf, but under normal conditions, it is better to specify the non native arch by -a parameter. the arch can also be set in manjaro-tools.conf, but under normal conditions, it is better to specify the non native arch by -a parameter.
* -c<br> * -c
removes the chroot dir<br> removes the chroot dir
If the -c parameter is not used, buildpkg will update the existing chroot or create a new one if none is present. If the -c parameter is not used, buildpkg will update the existing chroot or create a new one if none is present.
* -w<br> * -w
cleans pkgcache, and logfiles cleans pkgcache, and logfiles
* -s<br> * -s
signs the package when built signs the package when built
* -n<br> * -n
installs the built package in the chroot and runs a namcap check installs the built package in the chroot and runs a namcap check
<li>buildiso</li> <li>buildiso</li>
@ -94,12 +94,12 @@ buildiso is used to build manjaro-iso-profiles. It is run insde the profiles fol
Packages for livecd only: Packages for livecd only:
* manjaro-livecd-cli-installer * manjaro-livecd-cli-installer
* manjaro-livecd-openrc<br> * manjaro-livecd-openrc
openrc-run scripts for livecd openrc-run scripts for livecd
* manjaro-livecd-systemd<br> * manjaro-livecd-systemd
systemd units for livecd systemd units for livecd
<br>
<ol><li>Arguments</li> <ol><li>Arguments</li>
~~~ ~~~
@ -131,13 +131,13 @@ buildiso -p xfce -b testing
The branch can be defined also in manjaro-tools.conf, but a manual parameter will always override conf settings. The branch can be defined also in manjaro-tools.conf, but a manual parameter will always override conf settings.
<li>Special parameters</li> <li>Special parameters</li>
* -i<br> * -i
Build images only will stop after all packages have been installed. No iso sqfs compression will be executed Build images only will stop after all packages have been installed. No iso sqfs compression will be executed
* -s<br> * -s
Use this to sqfs compress the chroots if you previously used -i. Use this to sqfs compress the chroots if you previously used -i.
* -x<br> * -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. 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<br> * -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. 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.
</ol> </ol>
@ -145,7 +145,7 @@ Disable lng cache, by default lng cache is cleaned on every build. Uning this op
buildpkg and buildiso support building from buildsets buildpkg and buildiso support building from buildsets
Default location of sets is:<br> Default location of sets is:
~~~ ~~~
/etc/manjaro-tools/manjaro-tools/sets/pkg /etc/manjaro-tools/manjaro-tools/sets/pkg
/etc/manjaro-tools/manjaro-tools/sets/iso /etc/manjaro-tools/manjaro-tools/sets/iso
@ -155,7 +155,7 @@ but it can be configured in the manjaro-tools.conf file.
mkset is a little helper tools to easily create sets. mkset is a little helper tools to easily create sets.
It is run inside the abs/pkgbuilds or iso profiles directory. It is run inside the abs/pkgbuilds or iso profiles directory.
<ol><li>Arguments</li></ol><br> <ol><li>Arguments</li></ol>
~~~ ~~~
$ mkset -h $ mkset -h