Ok, I found how to do a basic report, and it came out, and i've attached
it. ?Is that what you want, or are we still not right format? Sorry, but
i'm really not a svn person.
Also, with the sum's against packages, ?is that the source packages sum
or after it's been converted into a .zst? I've found a number fail if
the source package is downloaded and sum'd, which is why I just '0' them
when found or updated.
Got b'more 40-minimal-xorg related fixes to do yet, but I am thinking of
updating first. And that's before adding a 45-quirky-xorg and/or a
55-quirky-desktop (both with our extra packages) for the puppy quirky
series.
I also want to add a linux54 and linux-firmware54 to your packageset if
you don't mind, as we have found with kernel 5.5.x there have been some
device name changes ('corrections') which will effect our puppy/quirky
scripts and cause serious rewrites (barryk's gone back to the 4.19.x
series in disgust for now), you might have some appear too, plus 5.4.x
has now been declared longterm.
and that's enough from me for now, it's time for lunch, I shall await
your reply.
scsijon
-------- Forwarded Message --------
Subject: Re: [t2] t2-minimal-glibc-gcc-X86_64-r49128.iso and the T2 Builder
Date: Thu, 6 Feb 2020 02:56:24 +1100
From: scsijon <[email protected]>
To: René Rebe <[email protected]>
not having tried a svn diff before, is there a guide somewhere on how to
do it?
thanks
On 05/02/20 21:25, René Rebe wrote:
Hi,
while I really try to accept any kind of input, files, tarballs, … as all
developer I would prefer diffs aka patches.
Could you in the future attach or inline "svn diff" of files you change so I do
not need to save the file to my local tree and svn diff it myself to see any change?
Thanks so much,
René
On 5. Feb 2020, at 10:07, scsijon <[email protected]> wrote:
1-
Fixes for llvm are attached, one is the .desc change mentioned below to not
build at stage0, and 2 changes for the .conf so it only builds dynamic and not
partly dynamic / partly static libs, and a fix for the comment in the same line
to make it clearer why needed.
2-
a) In target/generic/pkgsel/40-minimal-xorg.in 'markupsafe' and 'mako' have
been apparently relaced within 'meson', i've disabled mine for now until I can
do a full independant build.
b) In target/generic/pkgsel/40-minimal-xorg.in, a number of other deps are
missing and are now needed to be added, they are xproto, fontsproto,
xf86driproto, inputproto, glproto, pyopengl, and fontutil.
and that's todays work as it's building stage 5 at present!
regards
scsijon
On 05/02/20 14:25, scsijon wrote:
On 05/02/20 01:06, scsijon wrote:
first two things found with 40-minimal-xorg added
go into develop/intltool/intltool.desc and change 0----5--- to -----5--- as
intltool wants the perl module xmlparser and that's not built till '5' and perl
itself built in '2'. Can't see it needed in earlier stages anyway.
i've also turned off llvm as it's failing wanting stuff that's musl/clang only,
maybe there is a switch missing with glib/gcc since they went that route. I'll
look at it when I get to that point of needing it as we don't use it in quirky.
Interesting, i've got to the 5-$package stage with llvm off and of course
xorg-server failed as it wants it. And now having added it back on (X ilo O) it
seems to be building ok, at least it's up to 73% and still going strong, I
wonder if llvm shouldn't be set not as 01---5---9 but -1---5---9 ? I shall try
when I start a fresh rebuild and see what happens and report back.
By the way, there are a few missing dependancies in 4-minimal-xorg and
apparently with meson included a couple of others are no longer needed.
I really wish they hadn't played with the old
<.configure ; make ; make test ; make install>
routine. Just because they couldn't write a decent configure script we have to
put up with all this extra 'stuff' to learn and have to use!
scsijon
On 04/02/20 17:46, scsijon wrote:
Just a quick note that I had a sucessfull 20-minimal build using r49158 and
patches / fixes, which failed again when updated to r49191, even though I added
the fixes, so i've gone back to r49158 and trying by adding to 40-minimal-xorg
as I will be diverting after this point. When it's right at 40-minimal-xorg
i'll start updating revisions.
Yet to add a full info sheet and attach's, that will happen after a 'few'
cleanup's and something that others can use, it's a bit cryptic at present, I
can understand it but most others won't.
I'm also back to using this thread rather than a new one for the
40-minimal-xorg or mixing things up by using Jans.
scsijon
----------------------------------------------------------- If you wish to
unsubscribe from this mailing, send mail to
[email protected] with a subject of: unsubscribe t2
<llvm.desc><llvm.conf>-----------------------------------------------------------
If you wish to unsubscribe from this mailing, send mail to
[email protected] with a subject of: unsubscribe t2
Index: package/archiver/xz/xz.desc
===================================================================
--- package/archiver/xz/xz.desc (revision 49158)
+++ package/archiver/xz/xz.desc (working copy)
@@ -38,7 +38,7 @@
[L] OpenSource
[S] Beta
[V] 5.2.4
-[P] X 0----5---9 108.600
+[P] X 0----5---9 105.600
[O] var_append confopt ' ' ' --disable-lzmadec --disable-lzmainfo
--disable-lzma-links'
Index: package/develop/cmake/cmake.desc
===================================================================
--- package/develop/cmake/cmake.desc (revision 49158)
+++ package/develop/cmake/cmake.desc (working copy)
@@ -32,7 +32,7 @@
[L] BSD
[S] Stable
[V] 3.16.1
-[P] X 0----5---9 109.000
+[P] X 0----5---9 102.200
[CV-URL] http://www.cmake.org/download/
[D] 098285b6f3947ce2e71aba3d75166a495c18e50615a3e6a210e82b01
cmake-3.16.1.tar.gz http://www.cmake.org/files/v3.16/
Index: package/develop/intltool/intltool.desc
===================================================================
--- package/develop/intltool/intltool.desc (revision 49158)
+++ package/develop/intltool/intltool.desc (working copy)
@@ -30,7 +30,7 @@
[L] GPL
[S] Beta
[V] 0.51.0
-[P] X 0----5---9 120.100
+[P] X -----5---9 120.100
[CV-URL] https://launchpad.net/intltool/+download
[D] 49409534 intltool-0.51.0.tar.gz
https://launchpad.net/intltool/trunk/0.51.0/+download/
Index: package/develop/llvm/llvm.conf
===================================================================
--- package/develop/llvm/llvm.conf (revision 49158)
+++ package/develop/llvm/llvm.conf (working copy)
@@ -1,11 +1,11 @@
# --- T2-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
+#
# T2 SDE: package/.../llvm/llvm.conf
# Copyright (C) 2009 - 2019 The T2 SDE Project
-#
+#
# More information can be found in the files COPYING and README.
-#
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the
@@ -30,9 +30,12 @@
[ "${libdir##*/lib}" ] && var_append cmakeopt " "
"-DLLVM_LIBDIR_SUFFIX=${libdir##*/lib}"
# builds libraries as static and links all of them into an unique shared one
#var_append cmakeopt " " "-DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON"
-
-var_append cmakeopt " " "-DLLVM_ENABLE_RTTI=ON" # for Mesa?
+# added shared_libs=on as replaces above line and builds all as shared, not
only some
+var_append cmakeopt " " "-DBUILD_SHARED_LIBS=ON"
+# comment fix to make clear why and when
+var_append cmakeopt " " "-DLLVM_ENABLE_RTTI=ON" # for mesa v19+
var_append cmakeopt " " ".."
#var_append extraconfopt ' ' '--disable-bindings' # TODO: config option
[ $arch = powerpc64 ] && var_append GCC_WRAPPER_APPEND ' ' -mminimal-toc
+
Index: package/develop/llvm/llvm.desc
===================================================================
--- package/develop/llvm/llvm.desc (revision 49158)
+++ package/develop/llvm/llvm.desc (working copy)
@@ -36,7 +36,7 @@
[L] BSD
[S] Stable
[V] 9.0.1
-[P] X 01---5---9 102.500
+[P] X -1---5---9 102.500
[CV-URL] https://github.com/llvm/llvm-project/releases/
[D] 639b49553cffc0745abea6bebfe4c25fff6b2b2c225f790a3bf7bbb1
llvm-9.0.1.src.tar.xz
https://github.com/llvm/llvm-project/releases/download/llvmorg-9.0.1/
Index: package/develop/meson/meson.desc
===================================================================
--- package/develop/meson/meson.desc (revision 49158)
+++ package/develop/meson/meson.desc (working copy)
@@ -31,6 +31,10 @@
[O] pyscript=python3
[O] runpysetup=1
+[O] export PYVER="`python -V 2>&1 | sed 's/Python \([0-9]\.[0-9]\).*/\1/'`"
+[O] export PYTHONPATH=$root/usr/lib/python$PYVER/site-packages
+
+
[CV-URL] https://github.com/mesonbuild/meson/releases
[D] ee272f6b2231c3c449b5453836b236c1f9cc8b219318998e97642ba1
meson-0.52.1.tar.gz !https://github.com/mesonbuild/meson/archive/0.52.1.tar.gz
Index: package/develop/ninja/ninja.desc
===================================================================
--- package/develop/ninja/ninja.desc (revision 49158)
+++ package/develop/ninja/ninja.desc (working copy)
@@ -1,11 +1,11 @@
[COPY] --- T2-COPYRIGHT-NOTE-BEGIN ---
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-[COPY]
+[COPY]
[COPY] T2 SDE: package/.../ninja/ninja.desc
[COPY] Copyright (C) 2017 - 2019 The T2 SDE Project
-[COPY]
+[COPY]
[COPY] More information can be found in the files COPYING and README.
-[COPY]
+[COPY]
[COPY] This program is free software; you can redistribute it and/or modify
[COPY] it under the terms of the GNU General Public License as published by
[COPY] the Free Software Foundation; version 2 of the License. A copy of the
@@ -29,8 +29,8 @@
[L] APL
[S] Beta
-[V] v1.9.0
+[V] v1.10.0
[P] X 01---5---9 110.000
[CV-URL] https://github.com/ninja-build/ninja/releases
-[D] 5ab8a28cf20b9b8c5299bc0118c1d7fce36a0f53e072533c3f2003ac
ninja-build-v1.9.0.tar.gz
!https://github.com/ninja-build/ninja/archive/v1.9.0.tar.gz
+[D] 0 ninja-1.10.0.tar.gz
https://github.com/ninja-build/ninja/archive/v1.10.0.tar.gz
Index: package/develop/re2c/re2c.desc
===================================================================
--- package/develop/re2c/re2c.desc (revision 49158)
+++ package/develop/re2c/re2c.desc (working copy)
@@ -30,7 +30,10 @@
[L] MIT
[S] Stable
-[V] 1.0.1
-[P] X -----5---9 800.000
+[V] 1.3
-[D] 292456779 re2c-1.0.1.tar.gz http://dl.sourceforge.net/sourceforge/re2c/
+[P] X -1---5---9 108.000
+
+# needs re2c.conf added
+
+[D] 0 re2c-1.3.tar.gz https://github.com/skvadrik/re2c/archive/re2c-1.3.tar.gz
Index: package/filesystem/squashfs-tools/squashfs-tools.conf
===================================================================
--- package/filesystem/squashfs-tools/squashfs-tools.conf (revision 49158)
+++ package/filesystem/squashfs-tools/squashfs-tools.conf (working copy)
@@ -13,8 +13,10 @@
# --- T2-COPYRIGHT-NOTE-END ---
pkginstalled attr && var_append makeopt ' ' 'XATTR_SUPPORT=1'
-pkginstalled xz && var_append makeopt ' ' 'XZ_SUPPORT=1'
+# pkginstalled xz && var_append makeopt ' ' 'XZ_SUPPORT=1'
+! atstage toolchain && pkginstalled xz && var_append makeopt ' ' 'XZ_SUPPORT=1'
+
var_insert GCC_WRAPPER_INSERT ' ' '-fgnu89-inline'
makeinstopt=
Index: package/gnome2/glib/glib.conf
===================================================================
--- package/gnome2/glib/glib.conf (revision 49158)
+++ package/gnome2/glib/glib.conf (working copy)
@@ -12,6 +12,8 @@
# GNU General Public License can be found in the file COPYING.
# --- T2-COPYRIGHT-NOTE-END ---
+var_append extraconfopt " " "--with-python=/$root/usr/bin/python3"
+
if atstage toolchain; then
var_append SYSGCC_WRAPPER_APPEND " " "-I$root/include"
var_append mesonopt " " "-Dlibmount=false -Dinternal_pcre=true"
Index: package/graphic/lcms2/lcms2.desc
===================================================================
--- package/graphic/lcms2/lcms2.desc (revision 49158)
+++ package/graphic/lcms2/lcms2.desc (working copy)
@@ -1,11 +1,11 @@
[COPY] --- T2-COPYRIGHT-NOTE-BEGIN ---
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-[COPY]
+[COPY]
[COPY] T2 SDE: package/.../lcms2/lcms2.desc
[COPY] Copyright (C) 2004 - 2017 The T2 SDE Project
-[COPY]
+[COPY]
[COPY] More information can be found in the files COPYING and README.
-[COPY]
+[COPY]
[COPY] This program is free software; you can redistribute it and/or modify
[COPY] it under the terms of the GNU General Public License as published by
[COPY] the Free Software Foundation; version 2 of the License. A copy of the
@@ -36,4 +36,4 @@
[P] X -----5---9 123.300
[CV-URL] http://sourceforge.net/projects/lcms/files/lcms/
-[D] 148970f748e7b7318bcaac25192ba51514915d3b04c9cb9e4bff4aa1 lcms2-2.9.tar.gz
http://dl.sourceforge.net/project/lcms/lcms/2.9/
+[D] 0 lcms2-2.9.tar.gz http://dl.sourceforge.net/project/lcms/lcms/2.9/
Index: package/perl/perl/perl.desc
===================================================================
--- package/perl/perl/perl.desc (revision 49158)
+++ package/perl/perl/perl.desc (working copy)
@@ -37,6 +37,6 @@
[L] Artistic GPL
[S] Stable
[V] 5.30.1
-[P] X --2--5---9 102.000
+[P] X --2--5---9 102.500
[D] 73dec97a9b7735e5a856a279fba13e348f7512f6decc4e3d561bac5a
perl-5.30.1.tar.gz http://www.perl.com/CPAN/src/5.0/
Index: package/python/pyopengl/pyopengl.desc
===================================================================
--- package/python/pyopengl/pyopengl.desc (revision 49158)
+++ package/python/pyopengl/pyopengl.desc (working copy)
@@ -29,10 +29,10 @@
[L] BSD
[S] Stable
-[V] 3.0.1
+[V] 3.1.5
[P] X -----5---9 800.000
#the usual x11/lib64 problem
[O] var_append GCC_WRAPPER_APPEND ' ' "-L`pkgprefix libdir xorg-server`"
-[D] 2562022728 PyOpenGL-3.0.1.tar.gz http://dl.sourceforge.net/pyopengl/
+[D] 0 PyOpenGL-3.1.5.tar.gz http://dl.sourceforge.net/pyopengl/
Index: package/python/python/python.conf
===================================================================
--- package/python/python/python.conf (revision 49158)
+++ package/python/python/python.conf (working copy)
@@ -1,12 +1,12 @@
# --- T2-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
+#
# T2 SDE: package/.../python/python.conf
# Copyright (C) 2004 - 2020 The T2 SDE Project
# Copyright (C) 1998 - 2004 ROCK Linux Project
-#
+#
# More information can be found in the files COPYING and README.
-#
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the
@@ -49,14 +49,17 @@
sed -i 's:#zlib:zlib:' Modules/Setup.dist
fi
}
+#
atstage toolchain || hook_add preconf 5 "python_modules"
-# We can savely ignore this dependencies.
-var_append flistrfilter "|" ".*: /usr/lib.*/python.*/site-packages/.*"
+# We can savely ignore these dependencies.
+# no, it's now needed to be there for packages such as pip, meson, ninja etc.
to build properly
+# var_append flistrfilter "|" ".*: /usr/lib.*/python.*/site-packages/.*"
+var_append confopt " " "--install-dir=/$root/usr/lib/python3.7/site-packages/"
# hardcoded paths
fix_python_libdir() {
- sed -i "s,/lib\([[:blank:]]\),/${libdir##*/}\1,g" Modules/Setup.dist
+ #sed -i "s,/lib\([[:blank:]]\),/${libdir##*/}\1,g" Modules/Setup.dist
ln -svnf ../lib/python${ver:0:3} $root/$libdir/python${ver:0:3}
}
[[ $libdir = *lib ]] || hook_add preconf 9 "fix_python_libdir"
@@ -65,8 +68,15 @@
if atstage toolchain; then
export LDFLAGS="-Wl,-rpath,${root}${libdir}"
#hook_add postmake 5 'cp Parser/pgen $root$bindir/python-pgen'
-fi
+ hook_add postmake 5 'ln -s $root$bindir/python3 $root$bindir/python'
+ fi
+# scsijon someone clean and check syntax please and enable
+# as we are not including python2 we need this added, but only sometimes needed
+# if at stage 5 && $root$bindir/python notexist ; then
+# hook_add postmake 5 'ln -s $root$bindir/python3 $root$bindir/python'
+#fi
+
# cross-compiling
if atstage cross; then
var_append configcache ' ' "ac_cv_buggy_getaddrinfo=no"
Index: package/python/python/python.desc
===================================================================
--- package/python/python/python.desc (revision 49158)
+++ package/python/python/python.desc (working copy)
@@ -31,5 +31,7 @@
[V] 3.7.4
[P] X 0-2--5---9 109.000
+[O] export PYTHONPATH=$root/user/lib/python$PYVER/site-packages
+
[CV-URL] http://www.python.org/download/
[D] 61b5da57cba5148d0854456b00e84474c91d11d8462f7f7a9339f43f
Python-3.7.4.tar.xz http://www.python.org/ftp/python/3.7.4/
Index: package/x86/grub2/grub2.desc
===================================================================
--- package/x86/grub2/grub2.desc (revision 49158)
+++ package/x86/grub2/grub2.desc (working copy)
@@ -42,6 +42,6 @@
[L] GPL
[S] Beta
[V] 2.04
-[P] X 01---5---9 202.200
+[P] X -1---5---9 202.200
[D] 39a63bb9eff24410303c1071ba74493aa9e935e352087d3d2c970b58 grub-2.04.tar.xz
https://ftp.gnu.org/gnu/grub/
Index: target/generic/pkgsel/10-bootstrap.in
===================================================================
--- target/generic/pkgsel/10-bootstrap.in (revision 49158)
+++ target/generic/pkgsel/10-bootstrap.in (working copy)
@@ -43,7 +43,9 @@
X m4
X make
X meson
+X xz
X ninja
+O re2c # now required to build ninja for musl/clang
X man
X mine
X mktemp
Index: target/generic/pkgsel/20-minimal.in
===================================================================
--- target/generic/pkgsel/20-minimal.in (revision 49158)
+++ target/generic/pkgsel/20-minimal.in (working copy)
@@ -1,11 +1,11 @@
# --- T2-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
+#
# T2 SDE: target/generic/pkgsel/00-minimal.in
# Copyright (C) 2004 - 2019 The T2 SDE Project
-#
+#
# More information can be found in the files COPYING and README.
-#
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the
@@ -47,9 +47,9 @@
X xfsprogs
X libaio
X lvm2
-X libgpg-error
-X libgcrypt
-X cryptsetup
+#X libgpg-error
+#X libgcrypt
+#X cryptsetup
X wireless-tools
X libnl
X kbd
@@ -57,6 +57,7 @@
X libelf
X linux
X linux-firmware
+X lzma
X man-pages
X minised
X module-init-tools
@@ -125,7 +126,7 @@
X powerpc-utils
X hfsutils
X milo
-X grub2
+X grub2
X efivar
X efibootmgr
X palo
Index: target/generic/pkgsel/40-minimal-xorg.in
===================================================================
--- target/generic/pkgsel/40-minimal-xorg.in (revision 49158)
+++ target/generic/pkgsel/40-minimal-xorg.in (working copy)
@@ -1,11 +1,11 @@
# --- T2-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
+#
# T2 SDE: target/generic/pkgsel/40-minimal-xorg.in
# Copyright (C) 2004 - 2020 The T2 SDE Project
-#
+#
# More information can be found in the files COPYING and README.
-#
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the
@@ -40,9 +40,9 @@
X xcb-proto
X xorg/*ext
X xorg/*lib*
-O libxp
-O libxprintutil
-O libxprintapputil
+X libxp
+X libxprintutilegl
+X libxprintapputil
X xorg-util-macros
X xcb-util
X xcb-util-keysyms
@@ -78,8 +78,9 @@
X xkeyboard-config
X setxkbmap
X llvm
-X markupsafe
-X mako
+# apparently no longer needed meson clash with markupsafe mako
+# X markupsafe
+# X mako
X mesa
X epoxy
X makedepend
@@ -90,7 +91,6 @@
X cf
X gccmakedep
X pixman
-
X xconsole
X xsm
X xhost
@@ -101,15 +101,14 @@
X xmag
X xorg/xset*
X xev
-
X freetype
-X gle
+# X gle
X freeglut
X lesstif
X libjpeg
X libpng
X libungif
-X libgd
+X libgdegl
X libtiff
X netpbm
X xaw3d
@@ -122,3 +121,13 @@
# basic audio i/o
X alsa-lib
X alsa-utils
+
+# missing deps for xf86-video-* freeglut etc
+X xproto
+X fontsproto
+X xf86driproto
+X inputproto
+X glproto
+X pyopengl
+X fontutil
+X printproto
Index: target/generic/pkgsel/50-minimal-desktop.in
===================================================================
--- target/generic/pkgsel/50-minimal-desktop.in (revision 49158)
+++ target/generic/pkgsel/50-minimal-desktop.in (working copy)
@@ -1,12 +1,12 @@
# --- T2-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
+#
# T2 SDE: target/generic/pkgsel/50-minimal-desktop.in
# Copyright (C) 2004 - 2020 The T2 SDE Project
# Copyright (C) 1998 - 2003 ROCK Linux Project
-#
+#
# More information can be found in the files COPYING and README.
-#
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the
Index: target/share/install/build_stage2.sh
===================================================================
--- target/share/install/build_stage2.sh (revision 49158)
+++ target/share/install/build_stage2.sh (working copy)
@@ -67,7 +67,7 @@
echo_status "Copying files."
for pkg in `grep '^X ' $base/config/$config/packages | cut -d ' ' -f 5`; do
# include the package?
- #echo maybe $pkg >&2
+ echo maybe $pkg >&2
if [ "${package_map/ $pkg /}" != "$package_map" ]; then
cut -d ' ' -f 2 $build_root/var/adm/flists/$pkg
fi
-----------------------------------------------------------
If you wish to unsubscribe from this mailing, send mail to
[email protected] with a subject of: unsubscribe t2
