* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3a4d52603d6af0c239da3a3ab18c7ed3055cbfa1
@ 2020-12-27 10:59 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2020-12-27 10:59 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 32309 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 3a4d52603d6af0c239da3a3ab18c7ed3055cbfa1 (commit)
via 50992c73210f05384a976dbe21843c37734b4a3f (commit)
via 986a116beb92399d9574e1552e0e2a0d6fc614f3 (commit)
via e1616eb4509bda0f4c892f992c3324980c796ebb (commit)
via 9c51467d05d765fad1788be478b41412192af8d9 (commit)
via 814a33ff4d5032e641c673973c66f31c8ebe77eb (commit)
via 630e8601f839c2a0e93900000c10363057b2fe7d (commit)
via f8c5644dc5facad5a1b3a0265ff4ff3bf9f6fe49 (commit)
from 73a92c604cf27df8b31c3ae15f0d6981e88b504d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3a4d52603d6af0c239da3a3ab18c7ed3055cbfa1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Dec 27 10:58:37 2020 +0000
core154: Ship new procps
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 50992c73210f05384a976dbe21843c37734b4a3f
Author: Adolf Belka <ahb.ipfire(a)gmail.com>
Date: Sat Dec 26 17:40:32 2020 +0100
procps: Update to 3.3.16
- update from 3.2.8 to 3.3.16
This is also an update from procps to procps-ng
The previous version was no longer being maintained.
- Added autogen.sh into lfs as ity is needed to create the config script.
- Added libdir=/lib line into configure command as default is /usr/lib
- Added mv commands for kill, ps & sysctl to place them into the same locations
as the previous version of procps
- Moved lfsmake2 procps line to after pkg-config in make.sh
The autogen line requires autoconf, libtool, gettext and pkg-config
to be available so procps moved to after them.
- procps-3.2.8-fix_unknown_HZ_value.patch no longer required with new
version so removed.
- rootfile updated.
- libprocps library being maintained by the same people now maitaining this
version of procps.
- information on the releases from 3.3.13 to 3.3.16 available on
https://gitlab.com/procps-ng/procps/-/releases
Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 986a116beb92399d9574e1552e0e2a0d6fc614f3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Dec 27 10:37:59 2020 +0000
meson: Update MD5 checksum
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e1616eb4509bda0f4c892f992c3324980c796ebb
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sat Dec 26 18:09:24 2020 +0100
make.sh: Limit ninja to compute paralellism value
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 9c51467d05d765fad1788be478b41412192af8d9
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sat Dec 26 18:09:23 2020 +0100
ninja: Allow to limit the parallel build processes.
When run, ninja normally runs a maximum number of processes in parallel.
By default this is the number of cores on the system plus two. In some cases this can
overheat a CPU or run a system out of memory. If run from the command line, passing a
-jN parameter will limit the number of parallel processes, but some packages embed the
execution of ninja and do not pass a -j parameter.
Using this optional procedure allows us to limit the number of parallel processes
via an environment variable, NINJAJOBS.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 814a33ff4d5032e641c673973c66f31c8ebe77eb
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sat Dec 26 17:48:00 2020 +0100
make.sh: Build ninja and meson.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 630e8601f839c2a0e93900000c10363057b2fe7d
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sat Dec 26 17:47:59 2020 +0100
meson: New package.
More and more packages uses meson as build environment instead of
autotools or cmake.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f8c5644dc5facad5a1b3a0265ff4ff3bf9f6fe49
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sat Dec 26 17:47:58 2020 +0100
ninja: New package
This tool required to build more and more packages.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/meson | 178 +++++++++++++++++++++
config/rootfiles/common/ninja | 1 +
config/rootfiles/common/procps | 45 +++++-
.../{oldcore/103 => core/154}/filelists/procps | 0
lfs/{python3-yaml => meson} | 19 +--
lfs/{mdns-repeater => ninja} | 35 ++--
lfs/procps | 16 +-
make.sh | 9 +-
.../procps-3.2.8-fix_unknown_HZ_value.patch | 35 ----
9 files changed, 263 insertions(+), 75 deletions(-)
create mode 100644 config/rootfiles/common/meson
create mode 100644 config/rootfiles/common/ninja
copy config/rootfiles/{oldcore/103 => core/154}/filelists/procps (100%)
copy lfs/{python3-yaml => meson} (93%)
copy lfs/{mdns-repeater => ninja} (83%)
delete mode 100644 src/patches/procps-3.2.8-fix_unknown_HZ_value.patch
Difference in files:
diff --git a/config/rootfiles/common/meson b/config/rootfiles/common/meson
new file mode 100644
index 000000000..a9c2d7ad0
--- /dev/null
+++ b/config/rootfiles/common/meson
@@ -0,0 +1,178 @@
+#usr/bin/meson
+#usr/lib/python3.8/site-packages/meson-0.56.0-py3.8.egg-info
+#usr/lib/python3.8/site-packages/meson-0.56.0-py3.8.egg-info/PKG-INFO
+#usr/lib/python3.8/site-packages/meson-0.56.0-py3.8.egg-info/SOURCES.txt
+#usr/lib/python3.8/site-packages/meson-0.56.0-py3.8.egg-info/dependency_links.txt
+#usr/lib/python3.8/site-packages/meson-0.56.0-py3.8.egg-info/entry_points.txt
+#usr/lib/python3.8/site-packages/meson-0.56.0-py3.8.egg-info/requires.txt
+#usr/lib/python3.8/site-packages/meson-0.56.0-py3.8.egg-info/top_level.txt
+#usr/lib/python3.8/site-packages/mesonbuild
+#usr/lib/python3.8/site-packages/mesonbuild/__init__.py
+#usr/lib/python3.8/site-packages/mesonbuild/_pathlib.py
+#usr/lib/python3.8/site-packages/mesonbuild/arglist.py
+#usr/lib/python3.8/site-packages/mesonbuild/ast
+#usr/lib/python3.8/site-packages/mesonbuild/ast/__init__.py
+#usr/lib/python3.8/site-packages/mesonbuild/ast/interpreter.py
+#usr/lib/python3.8/site-packages/mesonbuild/ast/introspection.py
+#usr/lib/python3.8/site-packages/mesonbuild/ast/postprocess.py
+#usr/lib/python3.8/site-packages/mesonbuild/ast/printer.py
+#usr/lib/python3.8/site-packages/mesonbuild/ast/visitor.py
+#usr/lib/python3.8/site-packages/mesonbuild/backend
+#usr/lib/python3.8/site-packages/mesonbuild/backend/__init__.py
+#usr/lib/python3.8/site-packages/mesonbuild/backend/backends.py
+#usr/lib/python3.8/site-packages/mesonbuild/backend/ninjabackend.py
+#usr/lib/python3.8/site-packages/mesonbuild/backend/vs2010backend.py
+#usr/lib/python3.8/site-packages/mesonbuild/backend/vs2015backend.py
+#usr/lib/python3.8/site-packages/mesonbuild/backend/vs2017backend.py
+#usr/lib/python3.8/site-packages/mesonbuild/backend/vs2019backend.py
+#usr/lib/python3.8/site-packages/mesonbuild/backend/xcodebackend.py
+#usr/lib/python3.8/site-packages/mesonbuild/build.py
+#usr/lib/python3.8/site-packages/mesonbuild/cmake
+#usr/lib/python3.8/site-packages/mesonbuild/cmake/__init__.py
+#usr/lib/python3.8/site-packages/mesonbuild/cmake/client.py
+#usr/lib/python3.8/site-packages/mesonbuild/cmake/common.py
+#usr/lib/python3.8/site-packages/mesonbuild/cmake/executor.py
+#usr/lib/python3.8/site-packages/mesonbuild/cmake/fileapi.py
+#usr/lib/python3.8/site-packages/mesonbuild/cmake/generator.py
+#usr/lib/python3.8/site-packages/mesonbuild/cmake/interpreter.py
+#usr/lib/python3.8/site-packages/mesonbuild/cmake/toolchain.py
+#usr/lib/python3.8/site-packages/mesonbuild/cmake/traceparser.py
+#usr/lib/python3.8/site-packages/mesonbuild/compilers
+#usr/lib/python3.8/site-packages/mesonbuild/compilers/__init__.py
+#usr/lib/python3.8/site-packages/mesonbuild/compilers/c.py
+#usr/lib/python3.8/site-packages/mesonbuild/compilers/c_function_attributes.py
+#usr/lib/python3.8/site-packages/mesonbuild/compilers/compilers.py
+#usr/lib/python3.8/site-packages/mesonbuild/compilers/cpp.py
+#usr/lib/python3.8/site-packages/mesonbuild/compilers/cs.py
+#usr/lib/python3.8/site-packages/mesonbuild/compilers/cuda.py
+#usr/lib/python3.8/site-packages/mesonbuild/compilers/d.py
+#usr/lib/python3.8/site-packages/mesonbuild/compilers/fortran.py
+#usr/lib/python3.8/site-packages/mesonbuild/compilers/java.py
+#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins
+#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins/__init__.py
+#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins/arm.py
+#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins/c2000.py
+#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins/ccrx.py
+#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins/clang.py
+#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins/clike.py
+#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins/compcert.py
+#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins/elbrus.py
+#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins/emscripten.py
+#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins/gnu.py
+#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins/intel.py
+#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins/islinker.py
+#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins/pgi.py
+#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins/visualstudio.py
+#usr/lib/python3.8/site-packages/mesonbuild/compilers/mixins/xc16.py
+#usr/lib/python3.8/site-packages/mesonbuild/compilers/objc.py
+#usr/lib/python3.8/site-packages/mesonbuild/compilers/objcpp.py
+#usr/lib/python3.8/site-packages/mesonbuild/compilers/rust.py
+#usr/lib/python3.8/site-packages/mesonbuild/compilers/swift.py
+#usr/lib/python3.8/site-packages/mesonbuild/compilers/vala.py
+#usr/lib/python3.8/site-packages/mesonbuild/coredata.py
+#usr/lib/python3.8/site-packages/mesonbuild/dependencies
+#usr/lib/python3.8/site-packages/mesonbuild/dependencies/__init__.py
+#usr/lib/python3.8/site-packages/mesonbuild/dependencies/base.py
+#usr/lib/python3.8/site-packages/mesonbuild/dependencies/boost.py
+#usr/lib/python3.8/site-packages/mesonbuild/dependencies/coarrays.py
+#usr/lib/python3.8/site-packages/mesonbuild/dependencies/cuda.py
+#usr/lib/python3.8/site-packages/mesonbuild/dependencies/dev.py
+#usr/lib/python3.8/site-packages/mesonbuild/dependencies/hdf5.py
+#usr/lib/python3.8/site-packages/mesonbuild/dependencies/misc.py
+#usr/lib/python3.8/site-packages/mesonbuild/dependencies/mpi.py
+#usr/lib/python3.8/site-packages/mesonbuild/dependencies/platform.py
+#usr/lib/python3.8/site-packages/mesonbuild/dependencies/scalapack.py
+#usr/lib/python3.8/site-packages/mesonbuild/dependencies/ui.py
+#usr/lib/python3.8/site-packages/mesonbuild/depfile.py
+#usr/lib/python3.8/site-packages/mesonbuild/envconfig.py
+#usr/lib/python3.8/site-packages/mesonbuild/environment.py
+#usr/lib/python3.8/site-packages/mesonbuild/interpreter.py
+#usr/lib/python3.8/site-packages/mesonbuild/interpreterbase.py
+#usr/lib/python3.8/site-packages/mesonbuild/linkers.py
+#usr/lib/python3.8/site-packages/mesonbuild/mcompile.py
+#usr/lib/python3.8/site-packages/mesonbuild/mconf.py
+#usr/lib/python3.8/site-packages/mesonbuild/mdist.py
+#usr/lib/python3.8/site-packages/mesonbuild/mesondata.py
+#usr/lib/python3.8/site-packages/mesonbuild/mesonlib.py
+#usr/lib/python3.8/site-packages/mesonbuild/mesonmain.py
+#usr/lib/python3.8/site-packages/mesonbuild/minit.py
+#usr/lib/python3.8/site-packages/mesonbuild/minstall.py
+#usr/lib/python3.8/site-packages/mesonbuild/mintro.py
+#usr/lib/python3.8/site-packages/mesonbuild/mlog.py
+#usr/lib/python3.8/site-packages/mesonbuild/modules
+#usr/lib/python3.8/site-packages/mesonbuild/modules/__init__.py
+#usr/lib/python3.8/site-packages/mesonbuild/modules/cmake.py
+#usr/lib/python3.8/site-packages/mesonbuild/modules/dlang.py
+#usr/lib/python3.8/site-packages/mesonbuild/modules/fs.py
+#usr/lib/python3.8/site-packages/mesonbuild/modules/gnome.py
+#usr/lib/python3.8/site-packages/mesonbuild/modules/hotdoc.py
+#usr/lib/python3.8/site-packages/mesonbuild/modules/i18n.py
+#usr/lib/python3.8/site-packages/mesonbuild/modules/keyval.py
+#usr/lib/python3.8/site-packages/mesonbuild/modules/modtest.py
+#usr/lib/python3.8/site-packages/mesonbuild/modules/pkgconfig.py
+#usr/lib/python3.8/site-packages/mesonbuild/modules/python.py
+#usr/lib/python3.8/site-packages/mesonbuild/modules/python3.py
+#usr/lib/python3.8/site-packages/mesonbuild/modules/qt.py
+#usr/lib/python3.8/site-packages/mesonbuild/modules/qt4.py
+#usr/lib/python3.8/site-packages/mesonbuild/modules/qt5.py
+#usr/lib/python3.8/site-packages/mesonbuild/modules/rpm.py
+#usr/lib/python3.8/site-packages/mesonbuild/modules/sourceset.py
+#usr/lib/python3.8/site-packages/mesonbuild/modules/unstable_cuda.py
+#usr/lib/python3.8/site-packages/mesonbuild/modules/unstable_external_project.py
+#usr/lib/python3.8/site-packages/mesonbuild/modules/unstable_icestorm.py
+#usr/lib/python3.8/site-packages/mesonbuild/modules/unstable_simd.py
+#usr/lib/python3.8/site-packages/mesonbuild/modules/windows.py
+#usr/lib/python3.8/site-packages/mesonbuild/mparser.py
+#usr/lib/python3.8/site-packages/mesonbuild/msetup.py
+#usr/lib/python3.8/site-packages/mesonbuild/msubprojects.py
+#usr/lib/python3.8/site-packages/mesonbuild/mtest.py
+#usr/lib/python3.8/site-packages/mesonbuild/munstable_coredata.py
+#usr/lib/python3.8/site-packages/mesonbuild/optinterpreter.py
+#usr/lib/python3.8/site-packages/mesonbuild/rewriter.py
+#usr/lib/python3.8/site-packages/mesonbuild/scripts
+#usr/lib/python3.8/site-packages/mesonbuild/scripts/__init__.py
+#usr/lib/python3.8/site-packages/mesonbuild/scripts/clangformat.py
+#usr/lib/python3.8/site-packages/mesonbuild/scripts/clangtidy.py
+#usr/lib/python3.8/site-packages/mesonbuild/scripts/cleantrees.py
+#usr/lib/python3.8/site-packages/mesonbuild/scripts/cmake_run_ctgt.py
+#usr/lib/python3.8/site-packages/mesonbuild/scripts/commandrunner.py
+#usr/lib/python3.8/site-packages/mesonbuild/scripts/coverage.py
+#usr/lib/python3.8/site-packages/mesonbuild/scripts/delwithsuffix.py
+#usr/lib/python3.8/site-packages/mesonbuild/scripts/depfixer.py
+#usr/lib/python3.8/site-packages/mesonbuild/scripts/dirchanger.py
+#usr/lib/python3.8/site-packages/mesonbuild/scripts/externalproject.py
+#usr/lib/python3.8/site-packages/mesonbuild/scripts/gettext.py
+#usr/lib/python3.8/site-packages/mesonbuild/scripts/gtkdochelper.py
+#usr/lib/python3.8/site-packages/mesonbuild/scripts/hotdochelper.py
+#usr/lib/python3.8/site-packages/mesonbuild/scripts/meson_exe.py
+#usr/lib/python3.8/site-packages/mesonbuild/scripts/msgfmthelper.py
+#usr/lib/python3.8/site-packages/mesonbuild/scripts/regen_checker.py
+#usr/lib/python3.8/site-packages/mesonbuild/scripts/scanbuild.py
+#usr/lib/python3.8/site-packages/mesonbuild/scripts/symbolextractor.py
+#usr/lib/python3.8/site-packages/mesonbuild/scripts/tags.py
+#usr/lib/python3.8/site-packages/mesonbuild/scripts/uninstall.py
+#usr/lib/python3.8/site-packages/mesonbuild/scripts/vcstagger.py
+#usr/lib/python3.8/site-packages/mesonbuild/scripts/yelphelper.py
+#usr/lib/python3.8/site-packages/mesonbuild/templates
+#usr/lib/python3.8/site-packages/mesonbuild/templates/__init__.py
+#usr/lib/python3.8/site-packages/mesonbuild/templates/cpptemplates.py
+#usr/lib/python3.8/site-packages/mesonbuild/templates/cstemplates.py
+#usr/lib/python3.8/site-packages/mesonbuild/templates/ctemplates.py
+#usr/lib/python3.8/site-packages/mesonbuild/templates/cudatemplates.py
+#usr/lib/python3.8/site-packages/mesonbuild/templates/dlangtemplates.py
+#usr/lib/python3.8/site-packages/mesonbuild/templates/fortrantemplates.py
+#usr/lib/python3.8/site-packages/mesonbuild/templates/javatemplates.py
+#usr/lib/python3.8/site-packages/mesonbuild/templates/mesontemplates.py
+#usr/lib/python3.8/site-packages/mesonbuild/templates/objcpptemplates.py
+#usr/lib/python3.8/site-packages/mesonbuild/templates/objctemplates.py
+#usr/lib/python3.8/site-packages/mesonbuild/templates/rusttemplates.py
+#usr/lib/python3.8/site-packages/mesonbuild/templates/samplefactory.py
+#usr/lib/python3.8/site-packages/mesonbuild/templates/sampleimpl.py
+#usr/lib/python3.8/site-packages/mesonbuild/wrap
+#usr/lib/python3.8/site-packages/mesonbuild/wrap/__init__.py
+#usr/lib/python3.8/site-packages/mesonbuild/wrap/wrap.py
+#usr/lib/python3.8/site-packages/mesonbuild/wrap/wraptool.py
+#usr/share/man/man1/meson.1
+#usr/share/polkit-1
+#usr/share/polkit-1/actions
+#usr/share/polkit-1/actions/com.mesonbuild.install.policy
diff --git a/config/rootfiles/common/ninja b/config/rootfiles/common/ninja
new file mode 100644
index 000000000..f402add1b
--- /dev/null
+++ b/config/rootfiles/common/ninja
@@ -0,0 +1 @@
+#usr/bin/ninja
diff --git a/config/rootfiles/common/procps b/config/rootfiles/common/procps
index 1f32be94a..fc7d9326e 100644
--- a/config/rootfiles/common/procps
+++ b/config/rootfiles/common/procps
@@ -1,36 +1,67 @@
bin/kill
bin/ps
-lib/libproc-3.2.8.so
+#lib/libprocps.a
+#lib/libprocps.la
+#lib/libprocps.so
+lib/libprocps.so.8
+lib/libprocps.so.8.0.2
+#lib/pkgconfig
+#lib/pkgconfig/libprocps.pc
sbin/sysctl
usr/bin/free
usr/bin/pgrep
+usr/bin/pidof
#usr/bin/pkill
#usr/bin/pmap
#usr/bin/pwdx
-#usr/bin/skill
#usr/bin/slabtop
-#usr/bin/snice
#usr/bin/tload
usr/bin/top
-usr/bin/uptime
usr/bin/vmstat
usr/bin/w
usr/bin/watch
+#usr/include/proc
+#usr/include/proc/alloc.h
+#usr/include/proc/devname.h
+#usr/include/proc/escape.h
+#usr/include/proc/numa.h
+#usr/include/proc/procps.h
+#usr/include/proc/pwcache.h
+#usr/include/proc/readproc.h
+#usr/include/proc/sig.h
+#usr/include/proc/slab.h
+#usr/include/proc/sysinfo.h
+#usr/include/proc/version.h
+#usr/include/proc/wchan.h
+#usr/include/proc/whattime.h
+#usr/share/doc/procps-ng
+#usr/share/doc/procps-ng/FAQ
+#usr/share/doc/procps-ng/bugs.md
+#usr/share/locale/de/LC_MESSAGES/procps-ng.mo
+#usr/share/locale/fr/LC_MESSAGES/procps-ng.mo
+#usr/share/locale/pl/LC_MESSAGES/procps-ng.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/procps-ng.mo
+#usr/share/locale/sv/LC_MESSAGES/procps-ng.mo
+#usr/share/locale/uk/LC_MESSAGES/procps-ng.mo
+#usr/share/locale/vi/LC_MESSAGES/procps-ng.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/procps-ng.mo
#usr/share/man/man1/free.1
#usr/share/man/man1/kill.1
#usr/share/man/man1/pgrep.1
+#usr/share/man/man1/pidof.1
#usr/share/man/man1/pkill.1
#usr/share/man/man1/pmap.1
+#usr/share/man/man1/procps.1
#usr/share/man/man1/ps.1
#usr/share/man/man1/pwdx.1
-#usr/share/man/man1/skill.1
#usr/share/man/man1/slabtop.1
-#usr/share/man/man1/snice.1
#usr/share/man/man1/tload.1
#usr/share/man/man1/top.1
-#usr/share/man/man1/uptime.1
#usr/share/man/man1/w.1
#usr/share/man/man1/watch.1
+#usr/share/man/man3/openproc.3
+#usr/share/man/man3/readproc.3
+#usr/share/man/man3/readproctab.3
#usr/share/man/man5/sysctl.conf.5
#usr/share/man/man8/sysctl.8
#usr/share/man/man8/vmstat.8
diff --git a/config/rootfiles/core/154/filelists/procps b/config/rootfiles/core/154/filelists/procps
new file mode 120000
index 000000000..e17e8ed70
--- /dev/null
+++ b/config/rootfiles/core/154/filelists/procps
@@ -0,0 +1 @@
+../../../common/procps
\ No newline at end of file
diff --git a/lfs/meson b/lfs/meson
new file mode 100644
index 000000000..13c8c8c46
--- /dev/null
+++ b/lfs/meson
@@ -0,0 +1,80 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# #
+# 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, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 0.56.0
+
+THISAPP = meson-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 67ce2c0c3eab1b8ee9ddaa1c5143e7c0
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+
+ cd $(DIR_APP) && python3 setup.py build
+
+ cd $(DIR_APP) && python3 setup.py install --root=dest
+ cd $(DIR_APP) && cp -rv dest/* /
+
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/ninja b/lfs/ninja
new file mode 100644
index 000000000..ed9f8b778
--- /dev/null
+++ b/lfs/ninja
@@ -0,0 +1,92 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# #
+# 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, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 1.10.2
+
+THISAPP = ninja-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 639f75bc2e3b19ab893eaf2c810d4eb4
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+
+ # Allow to limit the paralell build processes ninja will do.
+ cd $(DIR_APP) && sed -i '/int Guess/a \
+ int j = 0;\
+ char* jobs = getenv( "NINJAJOBS" );\
+ if ( jobs != NULL ) j = atoi( jobs );\
+ if ( j > 0 ) return j;\
+ ' src/ninja.cc
+
+ # Configure and bootstrap the build environment
+ cd $(DIR_APP) && python3 configure.py --bootstrap --verbose
+
+ # Build ninja
+ cd $(DIR_APP) && ./ninja -v all
+
+ # Install ninja.
+ cd $(DIR_APP) && install -vm755 ninja /usr/bin/
+
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/procps b/lfs/procps
index 4807f5210..4667917c8 100644
--- a/lfs/procps
+++ b/lfs/procps
@@ -24,7 +24,7 @@
include Config
-VER = 3.2.8
+VER = v3.3.16
THISAPP = procps-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 9532714b6846013ca9898984ba4cd7e0
+$(DL_FILE)_MD5 = 2af440d54f94a3b44020bf0ea1bf9de8
install : $(TARGET)
@@ -70,9 +70,17 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fix_unknown_HZ_value.patch
- cd $(DIR_APP) && make $(MAKETUNING) LIBPROC=proc/libproc-$(VER).so
+ cd $(DIR_APP) && ./autogen.sh
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr \
+ --libdir=/lib
+ cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
install -m 0644 $(DIR_SRC)/config/etc/sysctl.conf /etc
+
+ # Move some tools to /bin & /sbin
+ mv -v /usr/bin/{kill,ps} /bin
+ mv -v /usr/sbin/sysctl /sbin
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index f9b2ee6ba..cf4e779e4 100755
--- a/make.sh
+++ b/make.sh
@@ -220,6 +220,9 @@ configure_build() {
# Use this as default PARALLELISM
DEFAULT_PARALLELISM="${parallelism}"
+ # Limit lauched ninja build jobs to computed parallel value.
+ NINJAJOBS="${parallelism}"
+
# Compression parameters
# We use mode 8 for reasonable memory usage when decompressing
# but with overall good compression
@@ -465,7 +468,7 @@ prepareenv() {
# Setup environment
set +h
LC_ALL=POSIX
- export LFS LC_ALL CFLAGS CXXFLAGS DEFAULT_PARALLELISM RUSTFLAGS
+ export LFS LC_ALL CFLAGS CXXFLAGS DEFAULT_PARALLELISM RUSTFLAGS NINJAJOBS
unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
# Make some extra directories
@@ -1093,7 +1096,6 @@ buildbase() {
lfsmake2 m4
lfsmake2 bison
lfsmake2 ncurses
- lfsmake2 procps
lfsmake2 libtool
lfsmake2 perl
lfsmake2 readline
@@ -1121,6 +1123,7 @@ buildbase() {
lfsmake2 kbd
lfsmake2 less
lfsmake2 pkg-config
+ lfsmake2 procps
lfsmake2 make
lfsmake2 man
lfsmake2 net-tools
@@ -1253,6 +1256,8 @@ buildipfire() {
lfsmake2 nasm
lfsmake2 libarchive
lfsmake2 cmake
+ lfsmake2 ninja
+ lfsmake2 meson
lfsmake2 libjpeg
lfsmake2 libjpeg-compat
lfsmake2 openjpeg
diff --git a/src/patches/procps-3.2.8-fix_unknown_HZ_value.patch b/src/patches/procps-3.2.8-fix_unknown_HZ_value.patch
deleted file mode 100644
index 08edaa6cc..000000000
--- a/src/patches/procps-3.2.8-fix_unknown_HZ_value.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naur procps-3.2.6.org/proc/sysinfo.c procps-3.2.6/proc/sysinfo.c
---- procps-3.2.6.org/proc/sysinfo.c 2005-03-14 05:31:27.000000000 +0100
-+++ procps-3.2.6/proc/sysinfo.c 2011-10-02 12:51:32.000000000 +0200
-@@ -212,6 +212,7 @@
- static void init_libproc(void) __attribute__((constructor));
- static void init_libproc(void){
- have_privs = check_for_privs();
-+ init_Linux_version();
- // ought to count CPUs in /proc/stat instead of relying
- // on glibc, which foolishly tries to parse /proc/cpuinfo
- //
-diff -Naur procps-3.2.6.org/proc/version.c procps-3.2.6/proc/version.c
---- procps-3.2.6.org/proc/version.c 2003-01-29 02:11:43.000000000 +0100
-+++ procps-3.2.6/proc/version.c 2011-10-02 12:52:36.000000000 +0200
-@@ -33,8 +33,7 @@
-
- int linux_version_code;
-
--static void init_Linux_version(void) __attribute__((constructor));
--static void init_Linux_version(void) {
-+void init_Linux_version(void) {
- static struct utsname uts;
- int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */
-
-diff -Naur procps-3.2.6.org/proc/version.h procps-3.2.6/proc/version.h
---- procps-3.2.6.org/proc/version.h 2002-12-15 01:08:32.000000000 +0100
-+++ procps-3.2.6/proc/version.h 2011-10-02 12:53:10.000000000 +0200
-@@ -14,6 +14,7 @@
-
- EXTERN_C_BEGIN
-
-+extern void init_Linux_version(void);
- extern void display_version(void); /* display suite version */
- extern const char procps_version[]; /* global buf for suite version */
-
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-12-27 10:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-27 10:59 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3a4d52603d6af0c239da3a3ab18c7ed3055cbfa1 Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox