Skip to content
This repository has been archived by the owner on Jun 4, 2018. It is now read-only.

[buildpkg] pkgver() not updating pkgver #198

Closed
oberon-manjaro opened this issue Mar 4, 2016 · 22 comments
Closed

[buildpkg] pkgver() not updating pkgver #198

oberon-manjaro opened this issue Mar 4, 2016 · 22 comments
Labels

Comments

@oberon-manjaro
Copy link
Member

resulting in errors:

==> Finished making: desktop-settings 20160304-1 (Fri Mar  4 10:04:54 UTC 2016)
mv: cannot stat '/home/bernhard/manjaro/pkg/manjaro-bspwm-settings-20160301-0.1-any.pkg.tar.xz': No such file or directory
==> ERROR: /home/bernhard/manjaro/pkg/unstable/x86_64/manjaro-bspwm-settings-20160301-0.1-any.pkg.tar.xz does not exist!
mv: cannot stat '/home/bernhard/manjaro/pkg/manjaro-budgie-settings-20160301-0.1-any.pkg.tar.xz': No such file or directory
==> ERROR: /home/bernhard/manjaro/pkg/unstable/x86_64/manjaro-budgie-settings-20160301-0.1-any.pkg.tar.xz does not exist!
mv: cannot stat '/home/bernhard/manjaro/pkg/manjaro-cinnamon-settings-20160301-0.1-any.pkg.tar.xz': No such file or directory
==> ERROR: /home/bernhard/manjaro/pkg/unstable/x86_64/manjaro-cinnamon-settings-20160301-0.1-any.pkg.tar.xz does not exist!
mv: cannot stat '/home/bernhard/manjaro/pkg/manjaro-deepin-settings-20160301-0.1-any.pkg.tar.xz': No such file or directory
==> ERROR: /home/bernhard/manjaro/pkg/unstable/x86_64/manjaro-deepin-settings-20160301-0.1-any.pkg.tar.xz does not exist!
mv: cannot stat '/home/bernhard/manjaro/pkg/manjaro-gnome-settings-20160301-0.1-any.pkg.tar.xz': No such file or directory
==> ERROR: /home/bernhard/manjaro/pkg/unstable/x86_64/manjaro-gnome-settings-20160301-0.1-any.pkg.tar.xz does not exist!
mv: cannot stat '/home/bernhard/manjaro/pkg/manjaro-i3-settings-20160301-0.1-any.pkg.tar.xz': No such file or directory
==> ERROR: /home/bernhard/manjaro/pkg/unstable/x86_64/manjaro-i3-settings-20160301-0.1-any.pkg.tar.xz does not exist!
mv: cannot stat '/home/bernhard/manjaro/pkg/manjaro-lxde-settings-20160301-0.1-any.pkg.tar.xz': No such file or directory
==> ERROR: /home/bernhard/manjaro/pkg/unstable/x86_64/manjaro-lxde-settings-20160301-0.1-any.pkg.tar.xz does not exist!
mv: cannot stat '/home/bernhard/manjaro/pkg/manjaro-lxqt-settings-20160301-0.1-any.pkg.tar.xz': No such file or directory
==> ERROR: /home/bernhard/manjaro/pkg/unstable/x86_64/manjaro-lxqt-settings-20160301-0.1-any.pkg.tar.xz does not exist!
mv: cannot stat '/home/bernhard/manjaro/pkg/manjaro-mate-settings-20160301-0.1-any.pkg.tar.xz': No such file or directory
==> ERROR: /home/bernhard/manjaro/pkg/unstable/x86_64/manjaro-mate-settings-20160301-0.1-any.pkg.tar.xz does not exist!
mv: cannot stat '/home/bernhard/manjaro/pkg/manjaro-netbook-settings-20160301-0.1-any.pkg.tar.xz': No such file or directory
==> ERROR: /home/bernhard/manjaro/pkg/unstable/x86_64/manjaro-netbook-settings-20160301-0.1-any.pkg.tar.xz does not exist!
mv: cannot stat '/home/bernhard/manjaro/pkg/manjaro-pantheon-settings-20160301-0.1-any.pkg.tar.xz': No such file or directory
==> ERROR: /home/bernhard/manjaro/pkg/unstable/x86_64/manjaro-pantheon-settings-20160301-0.1-any.pkg.tar.xz does not exist!
==> Finished building [desktop-settings-community]

I have to run makepg first to have pkgver update...

@udeved udeved closed this as completed Mar 4, 2016
@udeved
Copy link
Contributor

udeved commented Mar 4, 2016

By design it does not update unversioned packages.

@oberon-manjaro
Copy link
Member Author

What do you mean by an unversioned package? So desktop-settings-community is unversioned?
To be able to build any package with git versions do we really need to run makepkg -o on it first? That does not sound very practical.

@udeved
Copy link
Contributor

udeved commented Mar 4, 2016

Yes, or simply set the version.
git packages are not really supposed to be in repo.
This is sane to not update git package version or date version in chroot.

@philmmanjaro
Copy link
Member

Hold on. Show me the PKGBUILD. With pacman 5.0 the prepare step is done before pkgver. I had to change that also on our calamares-dev PKGBUILD ...

@udeved
Copy link
Contributor

udeved commented Mar 4, 2016

Right Phil, you can see eg with manjaro-tools-git pkg, it will aöways show you one commit earlier since pacman 5

@philmmanjaro
Copy link
Member

What do you mean with one commit earlier?

@philmmanjaro
Copy link
Member

I see no error here:

[phil@manjaro community]$ buildpkg -p desktop-settings-community
==> Updating chroot for [unstable] (i686)...
:: Synchronizing package databases...
 core is up to date
 extra is up to date
 community is up to date
:: Starting full system upgrade...
 there is nothing to do
 --> Time chroot_init: 0.12 minutes
==> Start building [desktop-settings-community]
==> Making package: desktop-settings 20160303-2 (Fri Mar  4 15:44:14 CET 2016)
==> Retrieving sources...
  -> Updating desktop-settings git repo...
Fetching origin
==> Validating source files with sha256sums...
    desktop-settings ... Skipped
==> Making package: desktop-settings 20160303-2 (Fri Mar  4 14:44:23 UTC 2016)
==> Checking runtime dependencies...
==> Checking buildtime dependencies...
==> Retrieving sources...
  -> Updating desktop-settings git repo...
error: cannot open FETCH_HEAD: Read-only file system

==> WARNING: Failure while updating desktop-settings git repo
==> Validating source files with sha256sums...
    desktop-settings ... Skipped
==> Extracting sources...
  -> Creating working copy of desktop-settings git repo...
Cloning into 'desktop-settings'...
done.
==> Starting pkgver()...
==> Updated version: desktop-settings 20160304-1
==> Entering fakeroot environment...
==> Starting package_manjaro-bspwm-settings()...
==> Tidying install...
  -> Removing libtool files...
  -> Purging unwanted files...
  -> Removing static library files...
  -> Stripping unneeded symbols from binaries and libraries...
  -> Compressing man and info pages...
==> Checking for packaging issue...
==> Creating package "manjaro-bspwm-settings"...
  -> Generating .PKGINFO file...
  -> Generating .BUILDINFO file...
  -> Adding install file...
  -> Generating .MTREE file...
  -> Compressing package...
==> Starting package_manjaro-budgie-settings()...
==> Tidying install...
  -> Removing libtool files...
  -> Purging unwanted files...
  -> Removing static library files...
  -> Stripping unneeded symbols from binaries and libraries...
  -> Compressing man and info pages...
==> Checking for packaging issue...
==> Creating package "manjaro-budgie-settings"...
  -> Generating .PKGINFO file...
  -> Generating .BUILDINFO file...
  -> Adding install file...
  -> Generating .MTREE file...
  -> Compressing package...
==> Starting package_manjaro-cinnamon-settings()...
==> Tidying install...
  -> Removing libtool files...
  -> Purging unwanted files...
  -> Removing static library files...
  -> Stripping unneeded symbols from binaries and libraries...
  -> Compressing man and info pages...
==> Checking for packaging issue...
==> Creating package "manjaro-cinnamon-settings"...
  -> Generating .PKGINFO file...
  -> Generating .BUILDINFO file...
  -> Adding install file...
  -> Generating .MTREE file...
  -> Compressing package...
==> Starting package_manjaro-deepin-settings()...
==> Tidying install...
  -> Removing libtool files...
  -> Purging unwanted files...
  -> Removing static library files...
  -> Stripping unneeded symbols from binaries and libraries...
  -> Compressing man and info pages...
==> Checking for packaging issue...
==> Creating package "manjaro-deepin-settings"...
  -> Generating .PKGINFO file...
  -> Generating .BUILDINFO file...
  -> Adding install file...
  -> Generating .MTREE file...
  -> Compressing package...
==> Starting package_manjaro-gnome-settings()...
==> Tidying install...
  -> Removing libtool files...
  -> Purging unwanted files...
  -> Removing static library files...
  -> Stripping unneeded symbols from binaries and libraries...
  -> Compressing man and info pages...
==> Checking for packaging issue...
==> Creating package "manjaro-gnome-settings"...
  -> Generating .PKGINFO file...
  -> Generating .BUILDINFO file...
  -> Adding install file...
  -> Generating .MTREE file...
  -> Compressing package...
==> Starting package_manjaro-i3-settings()...
==> Tidying install...
  -> Removing libtool files...
  -> Purging unwanted files...
  -> Removing static library files...
  -> Stripping unneeded symbols from binaries and libraries...
  -> Compressing man and info pages...
==> Checking for packaging issue...
==> Creating package "manjaro-i3-settings"...
  -> Generating .PKGINFO file...
  -> Generating .BUILDINFO file...
  -> Adding install file...
  -> Generating .MTREE file...
  -> Compressing package...
==> Starting package_manjaro-lxde-settings()...
==> Tidying install...
  -> Removing libtool files...
  -> Purging unwanted files...
  -> Removing static library files...
  -> Stripping unneeded symbols from binaries and libraries...
  -> Compressing man and info pages...
==> Checking for packaging issue...
==> Creating package "manjaro-lxde-settings"...
  -> Generating .PKGINFO file...
  -> Generating .BUILDINFO file...
  -> Adding install file...
  -> Generating .MTREE file...
  -> Compressing package...
==> Starting package_manjaro-lxqt-settings()...
==> Tidying install...
  -> Removing libtool files...
  -> Purging unwanted files...
  -> Removing static library files...
  -> Stripping unneeded symbols from binaries and libraries...
  -> Compressing man and info pages...
==> Checking for packaging issue...
==> Creating package "manjaro-lxqt-settings"...
  -> Generating .PKGINFO file...
  -> Generating .BUILDINFO file...
  -> Adding install file...
  -> Generating .MTREE file...
  -> Compressing package...
==> Starting package_manjaro-mate-settings()...
==> Tidying install...
  -> Removing libtool files...
  -> Purging unwanted files...
  -> Removing static library files...
  -> Stripping unneeded symbols from binaries and libraries...
  -> Compressing man and info pages...
==> Checking for packaging issue...
==> Creating package "manjaro-mate-settings"...
  -> Generating .PKGINFO file...
  -> Generating .BUILDINFO file...
  -> Adding install file...
  -> Generating .MTREE file...
  -> Compressing package...
==> Starting package_manjaro-netbook-settings()...
==> Tidying install...
  -> Removing libtool files...
  -> Purging unwanted files...
  -> Removing static library files...
  -> Stripping unneeded symbols from binaries and libraries...
  -> Compressing man and info pages...
==> Checking for packaging issue...
==> Creating package "manjaro-netbook-settings"...
  -> Generating .PKGINFO file...
  -> Generating .BUILDINFO file...
  -> Adding install file...
  -> Generating .MTREE file...
  -> Compressing package...
==> Starting package_manjaro-pantheon-settings()...
==> Tidying install...
  -> Removing libtool files...
  -> Purging unwanted files...
  -> Removing static library files...
  -> Stripping unneeded symbols from binaries and libraries...
  -> Compressing man and info pages...
==> Checking for packaging issue...
==> Creating package "manjaro-pantheon-settings"...
  -> Generating .PKGINFO file...
  -> Generating .BUILDINFO file...
  -> Adding install file...
  -> Generating .MTREE file...
  -> Compressing package...
==> Leaving fakeroot environment.
==> Finished making: desktop-settings 20160304-1 (Fri Mar  4 14:44:45 UTC 2016)
==> Finished building [desktop-settings-community]
 --> Time make_pkg: 0.65 minutes

@udeved
Copy link
Contributor

udeved commented Mar 4, 2016

Phil, say you build manjaro-tools-git with makepkg
The pkgver will have the latest commit, but the scripts will have the version of the previous commit set.

We should change the sed to be _ver rather than the commit.

@philmmanjaro
Copy link
Member

Let me check that ...

@philmmanjaro
Copy link
Member

Do I miss here some? On my end it is as expected. Latest git commit in devel is: r1979.1dc80fc

That is what I got with pkgbuild:

[phil@manjaro extra]$ buildpkg -p manjaro-tools-git
==> Updating chroot for [unstable] (i686)...
:: Synchronizing package databases...
 core is up to date
 extra is up to date
 community is up to date
:: Starting full system upgrade...
 there is nothing to do
 --> Time chroot_init: 0.13 minutes
==> Start building [manjaro-tools-git]
==> Making package: manjaro-tools-git r1931.01e4382-1 (Fri Mar  4 16:06:29 CET 2016)
==> Retrieving sources...
  -> Updating manjaro-tools git repo...
Fetching origin
remote: Counting objects: 111, done.
remote: Compressing objects: 100% (111/111), done.
remote: Total 111 (delta 67), reused 0 (delta 0), pack-reused 0
Receiving objects: 100% (111/111), 40.07 KiB | 0 bytes/s, done.
Resolving deltas: 100% (67/67), done.
From https://github.com/manjaro/manjaro-tools
   2ebe5c5..1dc80fc  devel      -> devel
   2ebe5c5..56b4672  master     -> master
 * [new tag]         0.11.1     -> 0.11.1
 * [new tag]         0.11.2     -> 0.11.2
 * [new tag]         0.11.3     -> 0.11.3
==> Validating source files with sha256sums...
    manjaro-tools ... Skipped
==> Making package: manjaro-tools-git r1931.01e4382-1 (Fri Mar  4 15:06:40 UTC 2016)
==> Checking runtime dependencies...
==> Checking buildtime dependencies...
==> Installing missing dependencies...
resolving dependencies...
looking for conflicting packages...

Packages (8) jade-1.2.1-10  perl-sgmls-1.03ii-5
             perl-xml-namespacesupport-1.11-3  perl-xml-parser-2.44-2
             perl-xml-sax-0.99-4  perl-xml-sax-base-1.08-3
             perl-xml-sax-expat-0.51-3  docbook2x-0.8.8-14

Total Download Size:   0.07 MiB
Total Installed Size:  6.76 MiB

:: Proceed with installation? [Y/n] 
:: Retrieving packages...
 perl-xml-sax-base-1...    21.2 KiB   643K/s 00:00 [######################] 100%
 perl-xml-namespaces...    10.8 KiB   400K/s 00:00 [######################] 100%
 perl-xml-sax-0.99-4-any   43.2 KiB   864K/s 00:00 [######################] 100%
(8/8) checking keys in keyring                     [######################] 100%
(8/8) checking package integrity                   [######################] 100%
(8/8) loading package files                        [######################] 100%
(8/8) checking for file conflicts                  [######################] 100%
:: Processing package changes...
(1/8) installing perl-sgmls                        [######################] 100%
(2/8) installing perl-xml-parser                   [######################] 100%
(3/8) installing perl-xml-sax-base                 [######################] 100%
(4/8) installing perl-xml-namespacesupport         [######################] 100%
(5/8) installing perl-xml-sax                      [######################] 100%
(6/8) installing jade                              [######################] 100%
(7/8) installing perl-xml-sax-expat                [######################] 100%
(8/8) installing docbook2x                         [######################] 100%
==> Retrieving sources...
  -> Updating manjaro-tools git repo...
error: cannot open FETCH_HEAD: Read-only file system

==> WARNING: Failure while updating manjaro-tools git repo
==> Validating source files with sha256sums...
    manjaro-tools ... Skipped
==> Extracting sources...
  -> Creating working copy of manjaro-tools git repo...
Cloning into 'manjaro-tools'...
done.
Switched to a new branch 'makepkg'
==> Starting prepare()...
==> Starting pkgver()...
==> Updated version: manjaro-tools-git r1979.1dc80fc-1
==> Starting build()...
GEN bin/mkchroot
GEN bin/fstabgen
GEN bin/signfile
GEN bin/manjaro-chroot
GEN bin/basestrap
GEN bin/chroot-run
GEN bin/checkpkg
GEN bin/lddd
GEN bin/find-libdeps
GEN bin/finddeps
GEN bin/signpkgs
GEN bin/mkchrootpkg
GEN bin/buildpkg
GEN bin/buildtree
GEN bin/buildiso
GEN bin/testiso
GEN bin/deployiso
mkdir -p man
xsltproc /usr/share/docbook2X/xslt/man/docbook.xsl docbook/buildpkg.xml | db2x_manxml --output-dir man ; xsltproc /usr/share/docbook2X/xslt/man/docbook.xsl docbook/buildtree.xml | db2x_manxml --output-dir man ; xsltproc /usr/share/docbook2X/xslt/man/docbook.xsl docbook/buildiso.xml | db2x_manxml --output-dir man ; xsltproc /usr/share/docbook2X/xslt/man/docbook.xsl docbook/deployiso.xml | db2x_manxml --output-dir man ; xsltproc /usr/share/docbook2X/xslt/man/docbook.xsl docbook/manjaro-tools.conf.xml | db2x_manxml --output-dir man ; xsltproc /usr/share/docbook2X/xslt/man/docbook.xsl docbook/profile.conf.xml | db2x_manxml --output-dir man ;
==> Entering fakeroot environment...
==> Starting package_manjaro-tools-base-git()...
install -dm0755 /build/manjaro-tools-git/pkg/manjaro-tools-base-git/etc/manjaro-tools
install -m0644 data/manjaro-tools.conf /build/manjaro-tools-git/pkg/manjaro-tools-base-git/etc/manjaro-tools
install -dm0755 /build/manjaro-tools-git/pkg/manjaro-tools-base-git/usr/bin
install -m0755 bin/mkchroot bin/basestrap bin/manjaro-chroot bin/fstabgen bin/signfile bin/chroot-run /build/manjaro-tools-git/pkg/manjaro-tools-base-git/usr/bin
install -dm0755 /build/manjaro-tools-git/pkg/manjaro-tools-base-git/usr/lib/manjaro-tools
install -m0644 lib/util.sh lib/util-mount.sh lib/util-msg.sh lib/util-fstab.sh /build/manjaro-tools-git/pkg/manjaro-tools-base-git/usr/lib/manjaro-tools
install -dm0755 /build/manjaro-tools-git/pkg/manjaro-tools-base-git/usr/share/manjaro-tools
install -m0644 data/pacman-default.conf data/pacman-multilib.conf data/pacman-mirrors-stable.conf data/pacman-mirrors-testing.conf data/pacman-mirrors-unstable.conf /build/manjaro-tools-git/pkg/manjaro-tools-base-git/usr/share/manjaro-tools
==> Tidying install...
  -> Removing libtool files...
  -> Purging unwanted files...
  -> Removing static library files...
  -> Stripping unneeded symbols from binaries and libraries...
  -> Compressing man and info pages...
==> Checking for packaging issue...
==> Creating package "manjaro-tools-base-git"...
  -> Generating .PKGINFO file...
  -> Generating .BUILDINFO file...
  -> Generating .MTREE file...
  -> Compressing package...
==> Starting package_manjaro-tools-pkg-git()...
install -dm0755 /build/manjaro-tools-git/pkg/manjaro-tools-pkg-git/etc/manjaro-tools/pkg.d
install -m0644 data/pkg.d/default.set /build/manjaro-tools-git/pkg/manjaro-tools-pkg-git/etc/manjaro-tools/pkg.d
install -dm0755 /build/manjaro-tools-git/pkg/manjaro-tools-pkg-git/usr/bin
install -m0755 bin/checkpkg bin/lddd bin/finddeps bin/find-libdeps bin/signpkgs bin/mkchrootpkg bin/buildpkg bin/buildtree /build/manjaro-tools-git/pkg/manjaro-tools-pkg-git/usr/bin
ln -sf find-libdeps /build/manjaro-tools-git/pkg/manjaro-tools-pkg-git/usr/bin/find-libprovides
install -dm0755 /build/manjaro-tools-git/pkg/manjaro-tools-pkg-git/usr/lib/manjaro-tools
install -m0644 lib/util-pkg.sh lib/util-pkgtree.sh /build/manjaro-tools-git/pkg/manjaro-tools-pkg-git/usr/lib/manjaro-tools
install -dm0755 /build/manjaro-tools-git/pkg/manjaro-tools-pkg-git/usr/share/manjaro-tools
install -m0644 data/makepkg-i686.conf data/base-devel-udev data/makepkg-x86_64.conf /build/manjaro-tools-git/pkg/manjaro-tools-pkg-git/usr/share/manjaro-tools
install -dm0755 /build/manjaro-tools-git/pkg/manjaro-tools-pkg-git/usr/share/man/man1
gzip -c man/buildpkg.1 > /build/manjaro-tools-git/pkg/manjaro-tools-pkg-git/usr/share/man/man1/buildpkg.1.gz
gzip -c man/buildtree.1 > /build/manjaro-tools-git/pkg/manjaro-tools-pkg-git/usr/share/man/man1/buildtree.1.gz
==> Tidying install...
  -> Removing libtool files...
  -> Purging unwanted files...
  -> Removing static library files...
  -> Stripping unneeded symbols from binaries and libraries...
  -> Compressing man and info pages...
==> Checking for packaging issue...
==> Creating package "manjaro-tools-pkg-git"...
  -> Generating .PKGINFO file...
  -> Generating .BUILDINFO file...
  -> Generating .MTREE file...
  -> Compressing package...
==> Starting package_manjaro-tools-iso-git()...
install -dm0755 /build/manjaro-tools-git/pkg/manjaro-tools-iso-git/etc/manjaro-tools/iso.d
install -m0644 data/iso.d/default.set data/iso.d/official.set data/iso.d/community.set data/iso.d/minimal.set data/iso.d/sonar.set data/iso.d/netrunner.set /build/manjaro-tools-git/pkg/manjaro-tools-iso-git/etc/manjaro-tools/iso.d
install -dm0755 /build/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/bin
install -m0755 bin/buildiso bin/testiso bin/deployiso /build/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/bin
install -dm0755 /build/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/lib/manjaro-tools
install -m0644 lib/util-iso.sh lib/util-iso-aufs.sh lib/util-iso-overlayfs.sh lib/util-iso-image.sh lib/util-iso-calamares.sh lib/util-iso-boot.sh lib/util-publish.sh /build/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/lib/manjaro-tools
install -dm0755 /build/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/lib/initcpio/hooks
install -m0755 initcpio/hooks/miso initcpio/hooks/miso_overlayfs initcpio/hooks/miso_loop_mnt initcpio/hooks/miso_pxe_common initcpio/hooks/miso_pxe_http /build/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/lib/initcpio/hooks
install -dm0755 /build/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/lib/initcpio/install
install -m0755 initcpio/inst/miso initcpio/inst/miso_overlayfs initcpio/inst/miso_loop_mnt initcpio/inst/miso_pxe_common initcpio/inst/miso_pxe_http initcpio/inst/miso_kms /build/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/lib/initcpio/install
install -dm0755 /build/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/share/manjaro-tools
install -m0644 data/pacman-gfx.conf data/desktop.map data/profile.conf.example /build/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/share/manjaro-tools
install -dm0755 /build/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/share/man/man1
gzip -c man/buildiso.1 > /build/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/share/man/man1/buildiso.1.gz
gzip -c man/deployiso.1 > /build/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/share/man/man1/deployiso.1.gz
install -dm0755 /build/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/share/man/man5
gzip -c man/manjaro-tools.conf.5 > /build/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/share/man/man5/manjaro-tools.conf.5.gz
gzip -c man/profile.conf.5 > /build/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/share/man/man5/profile.conf.5.gz
==> Tidying install...
  -> Removing libtool files...
  -> Purging unwanted files...
  -> Removing static library files...
  -> Stripping unneeded symbols from binaries and libraries...
  -> Compressing man and info pages...
==> Checking for packaging issue...
==> Creating package "manjaro-tools-iso-git"...
  -> Generating .PKGINFO file...
  -> Generating .BUILDINFO file...
  -> Generating .MTREE file...
  -> Compressing package...
==> Leaving fakeroot environment.
==> Finished making: manjaro-tools-git r1979.1dc80fc-1 (Fri Mar  4 15:07:06 UTC 2016)
==> Finished building [manjaro-tools-git]
 --> Time make_pkg: 1.18 minutes

Same as with makepkg:

[phil@manjaro manjaro-tools-git]$ rm -R pkg src -f
[phil@manjaro manjaro-tools-git]$ makepkg
==> Erstelle Paket: manjaro-tools-git r1931.01e4382-1 (Fr 4. Mär 16:09:27 CET 2016)
==> Prüfe Laufzeit-Abhängigkeiten...
==> Prüfe Buildtime-Abhängigkeiten...
==> Empfange Quellen...
  -> Aktualisiere das manjaro-tools git Repo...
Fordere an von origin
==> Überprüfe source Dateien mit sha256sums...
    manjaro-tools ... Übersprungen
==> Entpacke Quellen...
  -> Erstelle Arbeitskopie des manjaro-tools git Repos...
Klone nach 'manjaro-tools' ...
Fertig.
Zu neuem Branch 'makepkg' gewechselt
==> Beginne prepare()...
==> Beginne pkgver()...
==> Aktualisierte Version: manjaro-tools-git r1979.1dc80fc-1
==> Beginne build()...
GEN bin/manjaro-chroot
GEN bin/mkchroot
GEN bin/basestrap
GEN bin/fstabgen
GEN bin/signfile
GEN bin/chroot-run
GEN bin/finddeps
GEN bin/checkpkg
GEN bin/lddd
GEN bin/find-libdeps
GEN bin/signpkgs
GEN bin/mkchrootpkg
GEN bin/buildpkg
GEN bin/buildtree
GEN bin/buildiso
GEN bin/testiso
mkdir -p man
xsltproc /usr/share/docbook2X/xslt/man/docbook.xsl docbook/buildpkg.xml | db2x_manxml --output-dir man ; xsltproc /usr/share/docbook2X/xslt/man/docbook.xsl docbook/buildtree.xml | db2x_manxml --output-dir man ; xsltproc /usr/share/docbook2X/xslt/man/docbook.xsl docbook/buildiso.xml | db2x_manxml --output-dir man ; xsltproc /usr/share/docbook2X/xslt/man/docbook.xsl docbook/deployiso.xml | db2x_manxml --output-dir man ; xsltproc /usr/share/docbook2X/xslt/man/docbook.xsl docbook/manjaro-tools.conf.xml | db2x_manxml --output-dir man ; xsltproc /usr/share/docbook2X/xslt/man/docbook.xsl docbook/profile.conf.xml | db2x_manxml --output-dir man ;
GEN bin/deployiso
==> Betrete fakeroot Umgebung...
==> Beginne package_manjaro-tools-base-git()...
install -dm0755 /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-base-git/etc/manjaro-tools
install -m0644 data/manjaro-tools.conf /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-base-git/etc/manjaro-tools
install -dm0755 /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-base-git/usr/bin
install -m0755 bin/mkchroot bin/basestrap bin/manjaro-chroot bin/fstabgen bin/signfile bin/chroot-run /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-base-git/usr/bin
install -dm0755 /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-base-git/usr/lib/manjaro-tools
install -m0644 lib/util.sh lib/util-mount.sh lib/util-msg.sh lib/util-fstab.sh /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-base-git/usr/lib/manjaro-tools
install -dm0755 /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-base-git/usr/share/manjaro-tools
install -m0644 data/pacman-default.conf data/pacman-multilib.conf data/pacman-mirrors-stable.conf data/pacman-mirrors-testing.conf data/pacman-mirrors-unstable.conf /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-base-git/usr/share/manjaro-tools
==> Säubere Installation...
  -> Entferne libtool Dateien...
  -> Bereinige ungewollte Dateien...
  -> Entferne statische Bibliotheken...
  -> Entferne unnötige Symbole aus Binär-Dateien und Bibliotheken...
  -> Komprimiere Man-Pages und Info-Seiten...
==> Prüfe auf Paketierungsprobleme...
==> Erstelle Paket "manjaro-tools-base-git"...
  -> Erstelle .PKGINFO Datei...
  -> Erstelle .BUILDINFO Datei...
  -> Erstelle .MTREE-Datei...
  -> Komprimiere Paket... 
==> Beginne package_manjaro-tools-pkg-git()...
install -dm0755 /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-pkg-git/etc/manjaro-tools/pkg.d
install -m0644 data/pkg.d/default.set /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-pkg-git/etc/manjaro-tools/pkg.d
install -dm0755 /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-pkg-git/usr/bin
install -m0755 bin/checkpkg bin/lddd bin/finddeps bin/find-libdeps bin/signpkgs bin/mkchrootpkg bin/buildpkg bin/buildtree /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-pkg-git/usr/bin
ln -sf find-libdeps /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-pkg-git/usr/bin/find-libprovides
install -dm0755 /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-pkg-git/usr/lib/manjaro-tools
install -m0644 lib/util-pkg.sh lib/util-pkgtree.sh /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-pkg-git/usr/lib/manjaro-tools
install -dm0755 /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-pkg-git/usr/share/manjaro-tools
install -m0644 data/makepkg-i686.conf data/base-devel-udev data/makepkg-x86_64.conf /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-pkg-git/usr/share/manjaro-tools
install -dm0755 /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-pkg-git/usr/share/man/man1
gzip -c man/buildpkg.1 > /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-pkg-git/usr/share/man/man1/buildpkg.1.gz
gzip -c man/buildtree.1 > /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-pkg-git/usr/share/man/man1/buildtree.1.gz
==> Säubere Installation...
  -> Entferne libtool Dateien...
  -> Bereinige ungewollte Dateien...
  -> Entferne statische Bibliotheken...
  -> Entferne unnötige Symbole aus Binär-Dateien und Bibliotheken...
  -> Komprimiere Man-Pages und Info-Seiten...
==> Prüfe auf Paketierungsprobleme...
==> Erstelle Paket "manjaro-tools-pkg-git"...
  -> Erstelle .PKGINFO Datei...
  -> Erstelle .BUILDINFO Datei...
  -> Erstelle .MTREE-Datei...
  -> Komprimiere Paket... 
==> Beginne package_manjaro-tools-iso-git()...
install -dm0755 /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-iso-git/etc/manjaro-tools/iso.d
install -m0644 data/iso.d/default.set data/iso.d/official.set data/iso.d/community.set data/iso.d/minimal.set data/iso.d/sonar.set data/iso.d/netrunner.set /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-iso-git/etc/manjaro-tools/iso.d
install -dm0755 /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/bin
install -m0755 bin/buildiso bin/testiso bin/deployiso /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/bin
install -dm0755 /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/lib/manjaro-tools
install -m0644 lib/util-iso.sh lib/util-iso-aufs.sh lib/util-iso-overlayfs.sh lib/util-iso-image.sh lib/util-iso-calamares.sh lib/util-iso-boot.sh lib/util-publish.sh /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/lib/manjaro-tools
install -dm0755 /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/lib/initcpio/hooks
install -m0755 initcpio/hooks/miso initcpio/hooks/miso_overlayfs initcpio/hooks/miso_loop_mnt initcpio/hooks/miso_pxe_common initcpio/hooks/miso_pxe_http /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/lib/initcpio/hooks
install -dm0755 /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/lib/initcpio/install
install -m0755 initcpio/inst/miso initcpio/inst/miso_overlayfs initcpio/inst/miso_loop_mnt initcpio/inst/miso_pxe_common initcpio/inst/miso_pxe_http initcpio/inst/miso_kms /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/lib/initcpio/install
install -dm0755 /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/share/manjaro-tools
install -m0644 data/pacman-gfx.conf data/desktop.map data/profile.conf.example /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/share/manjaro-tools
install -dm0755 /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/share/man/man1
gzip -c man/buildiso.1 > /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/share/man/man1/buildiso.1.gz
gzip -c man/deployiso.1 > /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/share/man/man1/deployiso.1.gz
install -dm0755 /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/share/man/man5
gzip -c man/manjaro-tools.conf.5 > /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/share/man/man5/manjaro-tools.conf.5.gz
gzip -c man/profile.conf.5 > /home/phil/dev/git/manjaro/repositories/extra/manjaro-tools-git/pkg/manjaro-tools-iso-git/usr/share/man/man5/profile.conf.5.gz
==> Säubere Installation...
  -> Entferne libtool Dateien...
  -> Bereinige ungewollte Dateien...
  -> Entferne statische Bibliotheken...
  -> Entferne unnötige Symbole aus Binär-Dateien und Bibliotheken...
  -> Komprimiere Man-Pages und Info-Seiten...
==> Prüfe auf Paketierungsprobleme...
==> Erstelle Paket "manjaro-tools-iso-git"...
  -> Erstelle .PKGINFO Datei...
  -> Erstelle .BUILDINFO Datei...
  -> Erstelle .MTREE-Datei...
  -> Komprimiere Paket... 
==> Verlasse fakeroot Umgebung.
==> Beendete Erstellung: manjaro-tools-git r1979.1dc80fc-1 (Fr 4. Mär 16:09:39 CET 2016)

You simply have to clean your dir before building.

@udeved
Copy link
Contributor

udeved commented Mar 4, 2016

Now look in the scripts if they have a matching version at the top, eg buildpkg

@udeved
Copy link
Contributor

udeved commented Mar 4, 2016

Point being, we shouldn't set the version in the scripts to be git, we should set it to manjaro-tools release version.
This version is used to check chroot version, and you constantly get to update chroot if it have git commit.

@udeved
Copy link
Contributor

udeved commented Mar 4, 2016

It should look like this with git pkg...

==> manjaro-tools
  -> version: 0.11.3

@philmmanjaro
Copy link
Member

I think more or less only makepkg will update the PKGVER in PKGBUILD, but not buildpkg. So I don't care about that ...

@udeved
Copy link
Contributor

udeved commented Mar 4, 2016

right, and its correct only makepkg does it.

@philmmanjaro
Copy link
Member

The other thing we can change, if needed. Also for me it doesn't bother if we have to rebuild the chroot for a git-version. Sometimes even needed ...

@udeved
Copy link
Contributor

udeved commented Mar 4, 2016

Its just changing PKGBUILD.

The downside with setting a git commit for chroot version is, that you can't use existing chroot, despite its also being 0.11.3

@philmmanjaro
Copy link
Member

Right, then we change it as needed. But this is connected with the pkg version or how does manjaro-tools check the version?

@udeved
Copy link
Contributor

udeved commented Mar 4, 2016

The chroot hosts a .manjaro-tools file, that holds the version that is at top of the scripts, and you see displayed on -q switch.

@udeved
Copy link
Contributor

udeved commented Mar 4, 2016

We should do this, rather than setting pkgver for git pkg...

prepare() {
    cd ${srcdir}/${_pkgbase}
    # patches here
    sed -e "s/^Version=.*/Version=$_ver/" -i Makefile
}

I use this for my git builds.

@philmmanjaro
Copy link
Member

Ok, add it to the PKGBUILD then.

@udeved
Copy link
Contributor

udeved commented Mar 4, 2016

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

No branches or pull requests

3 participants