Skip to content

slapos
slapos
Commit 218911b8 authored by Thomas Gambier's avatar Thomas Gambier 🚴🏼
Browse files
Options

RISC-V support in slapos 

See merge request nexedi/slapos!1578
parents 8f729a81 9227dd59
Hide whitespace changes
Inline Side-by-side
Showing with 113 additions and 57 deletions
component/attr/buildout.cfg
View file @ 218911b8
[buildout] [buildout]
extends = ../gnu-config/buildout.cfg
parts = attr parts = attr
[attr] [attr]
...@@ -7,6 +7,7 @@ recipe = slapos.recipe.cmmi ...@@ -7,6 +7,7 @@ recipe = slapos.recipe.cmmi
shared = true shared = true
url = http://download.savannah.gnu.org/releases/attr/attr-2.4.47.src.tar.gz url = http://download.savannah.gnu.org/releases/attr/attr-2.4.47.src.tar.gz
md5sum = 84f58dec00b60f2dc8fd1c9709291cc7 md5sum = 84f58dec00b60f2dc8fd1c9709291cc7
pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
configure-options = configure-options =
--enable-shared=yes --enable-shared=yes
--enable-gettext=no --enable-gettext=no
......
component/binutils/buildout.cfg
View file @ 218911b8
...@@ -3,6 +3,7 @@ extends = ...@@ -3,6 +3,7 @@ extends =
../bison/buildout.cfg ../bison/buildout.cfg
../gettext/buildout.cfg ../gettext/buildout.cfg
../gmp/buildout.cfg ../gmp/buildout.cfg
../gnu-config/buildout.cfg
../m4/buildout.cfg ../m4/buildout.cfg
../texinfo/buildout.cfg ../texinfo/buildout.cfg
...@@ -25,6 +26,8 @@ recipe = slapos.recipe.cmmi ...@@ -25,6 +26,8 @@ recipe = slapos.recipe.cmmi
shared = true shared = true
url = http://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz url = http://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz
md5sum = 4125404e41e482ec68282a2e687f6c73 md5sum = 4125404e41e482ec68282a2e687f6c73
pre-configure =
cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
configure-options = configure-options =
--with-gmp=${gmp:location} --with-gmp=${gmp:location}
--with-mpfr=${mpfr:location} --with-mpfr=${mpfr:location}
...@@ -37,6 +40,8 @@ recipe = slapos.recipe.cmmi ...@@ -37,6 +40,8 @@ recipe = slapos.recipe.cmmi
shared = true shared = true
url = ftp://gcc.gnu.org/pub/gcc/infrastructure/isl-0.18.tar.bz2 url = ftp://gcc.gnu.org/pub/gcc/infrastructure/isl-0.18.tar.bz2
md5sum = 11436d6b205e516635b666090b94ab32 md5sum = 11436d6b205e516635b666090b94ab32
pre-configure =
cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
configure-options = configure-options =
--with-gmp-prefix=${gmp:location} --with-gmp-prefix=${gmp:location}
--disable-static --disable-static
...@@ -46,8 +51,8 @@ environment = ...@@ -46,8 +51,8 @@ environment =
[binutils] [binutils]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = http://ftp.gnu.org/gnu/binutils/binutils-2.40.tar.bz2 url = https://ftp.gnu.org/gnu/binutils/binutils-2.42.tar.xz
md5sum = fe10027c8de77b643ae72bd6de3f7996 md5sum = a075178a9646551379bfb64040487715
configure-options = configure-options =
--disable-bootstrap --disable-bootstrap
--with-mpc=${mpc:location} --with-mpc=${mpc:location}
......
component/bzip2/buildout.cfg
View file @ 218911b8
...@@ -11,4 +11,4 @@ configure-command = true ...@@ -11,4 +11,4 @@ configure-command = true
make-options = make-options =
PREFIX=@@LOCATION@@ PREFIX=@@LOCATION@@
CFLAGS="-fpic -fPIC -Wall -Winline -O2 -g -D_FILE_OFFSET_BITS=64" CFLAGS="-fpic -fPIC -Wall -Winline -O2 -g -D_FILE_OFFSET_BITS=64"
post-make-hook = ${:_profile_base_location_}/bzip2-hooks.py#785148a77f1a8456d914aa02ddf9d410:post_make_hook post-make-hook = ${:_profile_base_location_}/bzip2-hooks.py#a02da93bc8ff337a1d590f265e220528:post_make_hook
component/bzip2/bzip2-hooks.py
View file @ 218911b8
...@@ -13,6 +13,7 @@ def post_make_hook(options, buildout): ...@@ -13,6 +13,7 @@ def post_make_hook(options, buildout):
os.unlink(f) os.unlink(f)
shutil.copyfile(os.path.join(os.curdir, original), os.path.join(destination, shutil.copyfile(os.path.join(os.curdir, original), os.path.join(destination,
original)) original))
os.chmod(os.path.join(destination, original), 0o555)
for link in link_list: for link in link_list:
os.symlink(original, os.path.join(destination, os.symlink(original, os.path.join(destination,
......
component/coreutils/buildout.cfg
View file @ 218911b8
...@@ -16,6 +16,7 @@ configure-options = ...@@ -16,6 +16,7 @@ configure-options =
--disable-libcap --disable-libcap
--without-selinux --without-selinux
--prefix=@@LOCATION@@ --prefix=@@LOCATION@@
--with-openssl=no
environment = environment =
PATH=${patch:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s PATH=${patch:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
LDFLAGS=-Wl,--as-needed -L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib LDFLAGS=-Wl,--as-needed -L${gmp:location}/lib -Wl,-rpath=${gmp:location}/lib
......
component/dcron/buildout.cfg
View file @ 218911b8
...@@ -8,12 +8,13 @@ parts = dcron-output ...@@ -8,12 +8,13 @@ parts = dcron-output
[dcron] [dcron]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = false shared = false
url = http://www.jimpryor.net/linux/releases/dcron-4.5.tar.gz url = https://github.com/ptchinster/dcron/archive/refs/tags/v4.6.zip
md5sum = 078833f3281f96944fc30392b1888326 md5sum = d5bd12863547daf499187bc9b4e863a8
configure-command = true configure-command = true
patch-binary = ${patch:location}/bin/patch patch-binary = ${patch:location}/bin/patch
patches = patches =
${:_profile_base_location_}/noroot-no-globals.patch#623379916f48bd8292a28057c8bd30f7 ${:_profile_base_location_}/noroot-no-globals.patch#cd8d0f6d1d2ee133d6341d1515832c0d
${:_profile_base_location_}/support_old_gcc.patch#4dc8c81b1d94474c3c15e0db7b5b60de
patch-options = -p1 patch-options = -p1
make-options = make-options =
PREFIX=${buildout:parts-directory}/${:_buildout_section_name_} PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
......
component/dcron/noroot-no-globals.patch
View file @ 218911b8
--- dcron-4.5/chuser.c diff --git a/chuser.c b/chuser.c
+++ dcron-4.5/chuser.c index 0d79dbc..ccc3acc 100644
@@ -14,6 +14,7 @@ --- a/chuser.c
+++ b/chuser.c
@@ -11,6 +11,7 @@
Prototype int ChangeUser(const char *user, char *dochdir);
+#if 0
int int
ChangeUser(const char *user, char *dochdir) ChangeUser(const char *user, char *dochdir)
{ {
+#if 0 @@ -57,5 +58,7 @@ ChangeUser(const char *user, char *dochdir)
struct passwd *pas;
/*
@@ -57,5 +58,8 @@
} }
} }
return(pas->pw_uid); return(pas->pw_uid);
+#else
+ return getpwnam(user); + return getpwnam(user);
+#endif
} }
+#endif
--- dcron-4.5/crontab.c diff --git a/crontab.c b/crontab.c
+++ dcron-4.5/crontab.c index b29e0d2..06df70f 100644
@@ -88,7 +88,7 @@ --- a/crontab.c
+++ b/crontab.c
@@ -88,7 +88,7 @@ main(int ac, char **av)
break; break;
case 'c': case 'c':
/* getopt guarantees optarg != 0 here */ /* getopt guarantees optarg != 0 here */
...@@ -27,8 +30,8 @@ ...@@ -27,8 +30,8 @@
+ if (*optarg != 0) { + if (*optarg != 0) {
CDir = optarg; CDir = optarg;
} else { } else {
printlogf(0, "-c option: superuser only"); printlogf(0, "-c option: superuser only\n");
@@ -316,9 +316,6 @@ @@ -318,9 +318,6 @@ GetReplaceStream(const char *user, const char *file)
close(filedes[0]); close(filedes[0]);
...@@ -38,7 +41,7 @@ ...@@ -38,7 +41,7 @@
fd = open(file, O_RDONLY); fd = open(file, O_RDONLY);
if (fd < 0) { if (fd < 0) {
printlogf(0, "unable to open %s: %s", file, strerror(errno)); printlogf(0, "unable to open %s: %s", file, strerror(errno));
@@ -344,8 +341,6 @@ @@ -346,8 +343,6 @@ EditFile(const char *user, const char *file)
const char *ptr; const char *ptr;
char visual[SMALL_BUFFER]; char visual[SMALL_BUFFER];
...@@ -47,9 +50,11 @@ ...@@ -47,9 +50,11 @@
if ((ptr = getenv("EDITOR")) == NULL || strlen(ptr) >= sizeof(visual)) if ((ptr = getenv("EDITOR")) == NULL || strlen(ptr) >= sizeof(visual))
if ((ptr = getenv("VISUAL")) == NULL || strlen(ptr) >= sizeof(visual)) if ((ptr = getenv("VISUAL")) == NULL || strlen(ptr) >= sizeof(visual))
ptr = PATH_VI; ptr = PATH_VI;
--- dcron-4.5/job.c diff --git a/job.c b/job.c
+++ dcron-4.5/job.c index b5e02de..79650c2 100644
@@ -62,14 +62,6 @@ --- a/job.c
+++ b/job.c
@@ -63,14 +63,6 @@ RunJob(CronFile *file, CronLine *line)
* Change running state to the user in question * Change running state to the user in question
*/ */
...@@ -64,7 +69,7 @@ ...@@ -64,7 +69,7 @@
/* from this point we are unpriviledged */ /* from this point we are unpriviledged */
if (DebugOpt) if (DebugOpt)
@@ -295,14 +287,6 @@ @@ -296,14 +288,6 @@ EndJob(CronFile *file, CronLine *line, int exit_status)
* by the mailing and we already verified the mail file. * by the mailing and we already verified the mail file.
*/ */
...@@ -79,9 +84,11 @@ ...@@ -79,9 +84,11 @@
/* from this point we are unpriviledged */ /* from this point we are unpriviledged */
/* /*
--- dcron-4.5/Makefile diff --git a/Makefile b/Makefile
+++ dcron-4.5/Makefile index 547febc..13829e6 100644
@@ -3,7 +3,6 @@ --- a/Makefile
+++ b/Makefile
@@ -3,7 +3,6 @@ VERSION = 4.5
# these variables can be configured by e.g. `make SCRONTABS=/different/path` # these variables can be configured by e.g. `make SCRONTABS=/different/path`
PREFIX = /usr/local PREFIX = /usr/local
...@@ -89,7 +96,7 @@ ...@@ -89,7 +96,7 @@
SCRONTABS = /etc/cron.d SCRONTABS = /etc/cron.d
CRONTABS = /var/spool/cron/crontabs CRONTABS = /var/spool/cron/crontabs
CRONSTAMPS = /var/spool/cron/cronstamps CRONSTAMPS = /var/spool/cron/cronstamps
@@ -20,10 +19,10 @@ @@ -20,10 +19,10 @@ MANDIR = $(PREFIX)/share/man
SHELL = /bin/sh SHELL = /bin/sh
...@@ -101,9 +108,9 @@ ...@@ -101,9 +108,9 @@
+INSTALL_DATA = $(INSTALL) -D -m0644 +INSTALL_DATA = $(INSTALL) -D -m0644
+INSTALL_DIR = $(INSTALL) -d -m0755 +INSTALL_DIR = $(INSTALL) -d -m0755
CFLAGS ?= -O2 CFLAGS ?= -O2
CFLAGS += -Wall -Wstrict-prototypes -Wno-missing-field-initializers CFLAGS += -Wall -Wextra -Wstrict-prototypes -Wno-missing-field-initializers -Wfloat-equal -fstack-protector-all -Wformat-security -Wformat=2 -fPIE
SRCS = main.c subs.c database.c job.c concat.c chuser.c CFLAGS += -Wl,-z,nodump -Wl,-z,noexecstack -Wl,-z,noexecheap -Wl,-z,relro -Wl,-z,now -Wl,-z,nodlopen -Wl,-z,-pie
@@ -45,7 +44,6 @@ @@ -47,7 +46,6 @@ all: $(PROTOS) crond crontab ;
echo "SBINDIR = $(SBINDIR)" >> config echo "SBINDIR = $(SBINDIR)" >> config
echo "BINDIR = $(BINDIR)" >> config echo "BINDIR = $(BINDIR)" >> config
echo "MANDIR = $(MANDIR)" >> config echo "MANDIR = $(MANDIR)" >> config
...@@ -111,7 +118,7 @@ ...@@ -111,7 +118,7 @@
echo "SCRONTABS = $(SCRONTABS)" >> config echo "SCRONTABS = $(SCRONTABS)" >> config
echo "CRONTABS = $(CRONTABS)" >> config echo "CRONTABS = $(CRONTABS)" >> config
echo "CRONSTAMPS = $(CRONSTAMPS)" >> config echo "CRONSTAMPS = $(CRONSTAMPS)" >> config
@@ -63,13 +61,10 @@ @@ -65,13 +63,10 @@ crontab: $(TABOBJS)
$(CC) $(CFLAGS) $(CPPFLAGS) -c $(DEFS) $< -o $@ $(CC) $(CFLAGS) $(CPPFLAGS) -c $(DEFS) $< -o $@
install: install:
......
component/dcron/support_old_gcc.patch 0 → 100644
View file @ 218911b8
diff --git a/main.c b/main.c
diff --git a/main.c b/main.c
index dcf3f23..3eb6332 100644
--- a/main.c
+++ b/main.c
@@ -130,7 +130,7 @@ main(int ac, char **av)
case 'd':
DebugOpt = 1;
LogLevel = LOG_DEBUG;
- [[fallthrough]]; //fall through to include f too
+ __attribute__((fallthrough)); //fall through to include f too
case 'f':
ForegroundOpt = 1;
break;
component/ffmpeg/buildout.cfg
View file @ 218911b8
...@@ -103,6 +103,8 @@ configure-options = ...@@ -103,6 +103,8 @@ configure-options =
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = https://ffmpeg.org/releases/ffmpeg-4.1.4.tar.bz2 url = https://ffmpeg.org/releases/ffmpeg-4.1.4.tar.bz2
md5sum = 611d171e4aee749b85e04d17e2aee71d md5sum = 611d171e4aee749b85e04d17e2aee71d
patches = https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/effadce6c756247ea8bae32dc13bb3e6f464f0eb#adf42203d59a3c98a863216113946661
patch-options = -p1
location = @@LOCATION@@ location = @@LOCATION@@
pkg_config_depends = ${libxcb:location}/lib/pkgconfig:${libxcb:pkg_config_depends}:${libtheora:location}/lib/pkgconfig:${libtheora:pkg_config_depends}:${libvpx:location}/lib/pkgconfig:${libx264:location}/lib/pkgconfig:${opencore-amr:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig pkg_config_depends = ${libxcb:location}/lib/pkgconfig:${libxcb:pkg_config_depends}:${libtheora:location}/lib/pkgconfig:${libtheora:pkg_config_depends}:${libvpx:location}/lib/pkgconfig:${libx264:location}/lib/pkgconfig:${opencore-amr:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
configure-options = configure-options =
...@@ -128,4 +130,4 @@ environment = ...@@ -128,4 +130,4 @@ environment =
PKG_CONFIG_PATH=${:pkg_config_depends} PKG_CONFIG_PATH=${:pkg_config_depends}
CPPFLAGS=-I${bzip2:location}/include -I${libogg:location}/include -I${libtheora:location}/include -I${opencore-amr:location}/include -I${lame:location}/include CPPFLAGS=-I${bzip2:location}/include -I${libogg:location}/include -I${libtheora:location}/include -I${opencore-amr:location}/include -I${lame:location}/include
LDFLAGS=-Wl,-rpath=${:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${libxcb:location}/lib -L${libogg:location}/lib -L${libvorbis:location}/lib -Wl,-rpath=${libvorbis:location}/lib -L${libtheora:location}/lib -Wl,-rpath=${libtheora:location}/lib -L${libvpx:location}/lib -Wl,-rpath=${libvpx:location}/lib -L${libx264:location}/lib -Wl,-rpath=${libx264:location}/lib -L${lame:location}/lib -Wl,-rpath=${lame:location}/lib -L${opencore-amr:location}/lib -Wl,-rpath=${opencore-amr:location}/lib -Wl,-rpath=${zlib:location}/lib LDFLAGS=-Wl,-rpath=${:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${libxcb:location}/lib -L${libogg:location}/lib -L${libvorbis:location}/lib -Wl,-rpath=${libvorbis:location}/lib -L${libtheora:location}/lib -Wl,-rpath=${libtheora:location}/lib -L${libvpx:location}/lib -Wl,-rpath=${libvpx:location}/lib -L${libx264:location}/lib -Wl,-rpath=${libx264:location}/lib -L${lame:location}/lib -Wl,-rpath=${lame:location}/lib -L${opencore-amr:location}/lib -Wl,-rpath=${opencore-amr:location}/lib -Wl,-rpath=${zlib:location}/lib
PATH=${pkgconfig:location}/bin:${yasm:location}/bin:%(PATH)s PATH=${patch:location}/bin:${pkgconfig:location}/bin:${yasm:location}/bin:%(PATH)s
component/file/buildout.cfg
View file @ 218911b8
...@@ -7,6 +7,7 @@ extends = ...@@ -7,6 +7,7 @@ extends =
../bzip2/buildout.cfg ../bzip2/buildout.cfg
../xz-utils/buildout.cfg ../xz-utils/buildout.cfg
../zlib/buildout.cfg ../zlib/buildout.cfg
../zstd/buildout.cfg
[file] [file]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
...@@ -19,6 +20,7 @@ configure-options = ...@@ -19,6 +20,7 @@ configure-options =
--enable-zlib --enable-zlib
--enable-bzlib --enable-bzlib
--enable-xzlib --enable-xzlib
--enable-zstdlib
environment = environment =
CPPFLAGS=-I${bzip2:location}/include -I${xz-utils:location}/include -I${zlib:location}/include CPPFLAGS=-I${bzip2:location}/include -I${xz-utils:location}/include -I${zlib:location}/include -I${zstd:location}/include
LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${xz-utils:location}/lib -Wl,-rpath=${xz-utils:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${xz-utils:location}/lib -Wl,-rpath=${xz-utils:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${zstd:location}/lib -Wl,-rpath=${zstd:location}/lib
component/gcc/buildout.cfg
View file @ 218911b8
...@@ -15,7 +15,7 @@ parts = ...@@ -15,7 +15,7 @@ parts =
[gcc-common] [gcc-common]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = http://ftp.gnu.org/gnu/gcc/gcc-${:version}/gcc-${:version}.tar.xz url = https://ftp.gnu.org/gnu/gcc/gcc-${:version}/gcc-${:version}.tar.xz
pre-configure = pre-configure =
set %(location)s/bin set %(location)s/bin
mkdir -p $1 mkdir -p $1
...@@ -76,3 +76,8 @@ patches = ...@@ -76,3 +76,8 @@ patches =
<= gcc-common <= gcc-common
version = 10.5.0 version = 10.5.0
md5sum = c7d1958570fbd1cd859b015774b9987a md5sum = c7d1958570fbd1cd859b015774b9987a
[gcc-12.3]
<= gcc-common
version = 12.3.0
md5sum = 58a863b2a50e4d42eacc20fec419bc3b
component/icu/buildout.cfg
View file @ 218911b8
[buildout] [buildout]
extends = ../gnu-config/buildout.cfg
parts = icu4c parts = icu4c
[icu4c] [icu4c]
...@@ -7,6 +8,7 @@ shared = true ...@@ -7,6 +8,7 @@ shared = true
location = @@LOCATION@@ location = @@LOCATION@@
url = https://github.com/unicode-org/icu/releases/download/release-58-2/icu4c-58_2-src.tgz url = https://github.com/unicode-org/icu/releases/download/release-58-2/icu4c-58_2-src.tgz
md5sum = fac212b32b7ec7ab007a12dff1f3aea1 md5sum = fac212b32b7ec7ab007a12dff1f3aea1
pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess source/
configure-command = source/configure configure-command = source/configure
configure-options = configure-options =
--prefix=${:location} --prefix=${:location}
......
component/jemalloc/buildout.cfg
View file @ 218911b8
...@@ -7,11 +7,11 @@ parts = ...@@ -7,11 +7,11 @@ parts =
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = https://github.com/jemalloc/jemalloc/releases/download/${:version}/jemalloc-${:version}.tar.bz2 url = https://github.com/jemalloc/jemalloc/releases/download/${:version}/jemalloc-${:version}.tar.bz2
version = 3.6.0 version = 5.3.0
md5sum = e76665b63a8fddf4c9f26d2fa67afdf2 md5sum = 09a8328574dab22a7df848eae6dbbf53
configure-options = configure-options =
--disable-static --disable-static
--enable-readline --disable-initial-exec-tls
environment = environment =
CPPFLAGS=-I${readline:location}/include -I${ncurses:location}/include CPPFLAGS=-I${readline:location}/include -I${ncurses:location}/include
LDFLAGS=-L@@LOCATION@@ -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib LDFLAGS=-L@@LOCATION@@ -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib
component/jupyter/buildout.cfg
View file @ 218911b8
...@@ -49,6 +49,7 @@ eggs = ...@@ -49,6 +49,7 @@ eggs =
openpyxl openpyxl
sympy sympy
xlrd xlrd
lxml-html-clean
# additional eggs for jupyterlab # additional eggs for jupyterlab
jupyterlab jupyterlab
jupyterlab-launcher jupyterlab-launcher
......
component/lcms/buildout.cfg
View file @ 218911b8
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
[buildout] [buildout]
extends = extends =
../gnu-config/buildout.cfg
../jbigkit/buildout.cfg ../jbigkit/buildout.cfg
../libjpeg/buildout.cfg ../libjpeg/buildout.cfg
../libtiff/buildout.cfg ../libtiff/buildout.cfg
...@@ -16,6 +17,7 @@ recipe = slapos.recipe.cmmi ...@@ -16,6 +17,7 @@ recipe = slapos.recipe.cmmi
shared = true shared = true
url = http://downloads.sourceforge.net/project/lcms/lcms/2.8/lcms2-2.8.tar.gz url = http://downloads.sourceforge.net/project/lcms/lcms/2.8/lcms2-2.8.tar.gz
md5sum = 87a5913f1a52464190bb655ad230539c md5sum = 87a5913f1a52464190bb655ad230539c
pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
configure-options = configure-options =
--disable-static --disable-static
environment = environment =
......
component/libcap/buildout.cfg
View file @ 218911b8
...@@ -23,10 +23,10 @@ make-options = ...@@ -23,10 +23,10 @@ make-options =
environment = environment =
PATH=${gperf:location}/bin:%(PATH)s PATH=${gperf:location}/bin:%(PATH)s
# if lib64 exists, then create a symlink from lib to lib64 # if lib doesn't exist, then create a symlink 'lib' pointing to lib64
post-install = post-install =
cd ${:location} cd ${:location}
[ -d lib64 ] && ln -s lib64 lib [ -d lib ] || ln -s lib64 lib
[libcap] [libcap]
<= libcap2 <= libcap2
component/libtiff/buildout.cfg
View file @ 218911b8
[buildout] [buildout]
extends = extends =
../libjpeg/buildout.cfg ../gnu-config/buildout.cfg
../jbigkit/buildout.cfg ../jbigkit/buildout.cfg
../libjpeg/buildout.cfg
../patch/buildout.cfg ../patch/buildout.cfg
../zlib/buildout.cfg ../zlib/buildout.cfg
...@@ -13,6 +14,7 @@ recipe = slapos.recipe.cmmi ...@@ -13,6 +14,7 @@ recipe = slapos.recipe.cmmi
shared = true shared = true
url = http://download.osgeo.org/libtiff/tiff-4.2.0.tar.gz url = http://download.osgeo.org/libtiff/tiff-4.2.0.tar.gz
md5sum = 2bbf6db1ddc4a59c89d6986b368fc063 md5sum = 2bbf6db1ddc4a59c89d6986b368fc063
pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess config/
configure-options = configure-options =
--disable-static --disable-static
--without-x --without-x
......
component/nxdtest/buildout.cfg
View file @ 218911b8
...@@ -31,6 +31,6 @@ depends = ${python-prctl:egg} ...@@ -31,6 +31,6 @@ depends = ${python-prctl:egg}
[nxdtest-repository] [nxdtest-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/nexedi/nxdtest.git repository = https://lab.nexedi.com/nexedi/nxdtest.git
revision = 56e52da6 revision = 19c7022c
location = ${buildout:parts-directory}/nxdtest location = ${buildout:parts-directory}/nxdtest
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
component/pcre/buildout.cfg
View file @ 218911b8
...@@ -12,9 +12,13 @@ md5sum = 4452288e6a0eefb2ab11d36010a1eebb ...@@ -12,9 +12,13 @@ md5sum = 4452288e6a0eefb2ab11d36010a1eebb
configure-options = configure-options =
--disable-static --disable-static
--enable-unicode-properties --enable-unicode-properties
--enable-jit
patch-options = -p1 patch-options = -p1
patches = patches =
https://sources.debian.org/data/main/p/pcre3/2:8.39-12/debian/patches/patch-from-mariadb-to-fix-stack-frame-si#c33964123a4648bbb86466b4f3476bb4 https://sources.debian.org/data/main/p/pcre3/2:8.39-12/debian/patches/patch-from-mariadb-to-fix-stack-frame-si#c33964123a4648bbb86466b4f3476bb4
environment = environment =
PATH=${patch:location}/bin:%(PATH)s PATH=${patch:location}/bin:%(PATH)s
[pcre:not linux or platform.machine() != 'riscv64']
configure-options +=
--enable-jit
component/postgresql/buildout.cfg
View file @ 218911b8
...@@ -10,7 +10,7 @@ extends = ...@@ -10,7 +10,7 @@ extends =
parts = postgresql parts = postgresql
[postgresql] [postgresql]
<= postgresql10 <= postgresql12
[postgresql-common] [postgresql-common]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
...@@ -44,3 +44,9 @@ environment = ...@@ -44,3 +44,9 @@ environment =
<= postgresql-common <= postgresql-common
url = http://ftp.postgresql.org/pub/source/v10.11/postgresql-10.11.tar.bz2 url = http://ftp.postgresql.org/pub/source/v10.11/postgresql-10.11.tar.bz2
md5sum = 01c83ee159bf2a690e75e69e49fe2a1d md5sum = 01c83ee159bf2a690e75e69e49fe2a1d
[postgresql12]
<= postgresql-common
url = https://ftp.postgresql.org/pub/source/v12.9/postgresql-12.9.tar.bz2
md5sum = 980f11ed6b61a5fb64fbd9dffdccc8be
component/unixodbc/buildout.cfg
View file @ 218911b8
[buildout] [buildout]
extends = ../gnu-config/buildout.cfg
parts= parts=
unixodbc unixodbc
[unixodbc] [unixodbc]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = http://www.unixodbc.org/unixODBC-2.3.5.tar.gz url = https://www.unixodbc.org/unixODBC-2.3.12.tar.gz
md5sum = abf14cf943f1f8c5e63a24cb26d54fd9 md5sum = d62167d85bcb459c200c0e4b5a63ee48
pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
post-install = ln -s @@LOCATION@@/lib/libodbcinst.so @@LOCATION@@/lib/libodbcinst.so.1 post-install = ln -s @@LOCATION@@/lib/libodbcinst.so @@LOCATION@@/lib/libodbcinst.so.1
slapos/test/recipe/test_erp5testnode.py
View file @ 218911b8
...@@ -63,7 +63,6 @@ class UserInfoTest(unittest.TestCase): ...@@ -63,7 +63,6 @@ class UserInfoTest(unittest.TestCase):
'testnode': '/bin/testnode', 'testnode': '/bin/testnode',
'working-directory': 'srv/testnode', 'working-directory': 'srv/testnode',
'wrapper': 'bin/erp5testnode-service', 'wrapper': 'bin/erp5testnode-service',
'zip-binary': '/bin/zip',
} }
# values for test # values for test
......
software/erp5testnode/buildout.hash.cfg
View file @ 218911b8
...@@ -18,4 +18,4 @@ md5sum = 06b0acece285ecbc0e746fa267a374b6 ...@@ -18,4 +18,4 @@ md5sum = 06b0acece285ecbc0e746fa267a374b6
[template-default] [template-default]
filename = instance-default.cfg.jinja.in filename = instance-default.cfg.jinja.in
md5sum = bf95d5f4ac107ad27a0c980633ad20be md5sum = 947778203e4b2c175a25d01a2c36647c
software/erp5testnode/instance-default.cfg.jinja.in
View file @ 218911b8
...@@ -65,7 +65,6 @@ keep-log-days = {{ slapparameter_dict['keep-log-days'] }} ...@@ -65,7 +65,6 @@ keep-log-days = {{ slapparameter_dict['keep-log-days'] }}
git-binary = ${git:location}/bin/git git-binary = ${git:location}/bin/git
slapos-binary = ${buildout:bin-directory}/slapos slapos-binary = ${buildout:bin-directory}/slapos
testnode = ${buildout:bin-directory}/testnode testnode = ${buildout:bin-directory}/testnode
zip-binary = ${zip:location}/bin/zip
httpd-pid-file = $${basedirectory:run}/httpd.pid httpd-pid-file = $${basedirectory:run}/httpd.pid
httpd-lock-file = $${basedirectory:run}/httpd.lock httpd-lock-file = $${basedirectory:run}/httpd.lock
httpd-conf-file = $${rootdirectory:etc}/httpd.conf httpd-conf-file = $${rootdirectory:etc}/httpd.conf
......
software/erp5testnode/software.cfg
View file @ 218911b8
...@@ -5,7 +5,6 @@ extends = ...@@ -5,7 +5,6 @@ extends =
../../stack/haproxy/default-backend.cfg ../../stack/haproxy/default-backend.cfg
../../component/git/buildout.cfg ../../component/git/buildout.cfg
../../component/lxml-python/buildout.cfg ../../component/lxml-python/buildout.cfg
../../component/zip/buildout.cfg
../../component/bash/buildout.cfg ../../component/bash/buildout.cfg
../../component/coreutils/buildout.cfg ../../component/coreutils/buildout.cfg
../../component/shellinabox/buildout.cfg ../../component/shellinabox/buildout.cfg
...@@ -18,7 +17,6 @@ parts = ...@@ -18,7 +17,6 @@ parts =
slapos-cookbook slapos-cookbook
template template
eggs eggs
zip
git git
apache apache
......
stack/slapos.cfg
View file @ 218911b8
...@@ -185,7 +185,7 @@ distro = 1.7.0 ...@@ -185,7 +185,7 @@ distro = 1.7.0
dnspython = 1.16.0 dnspython = 1.16.0
entrypoints = 0.3 entrypoints = 0.3
enum34 = 1.1.10 enum34 = 1.1.10
erp5.util = 0.4.75 erp5.util = 0.4.76
et-xmlfile = 1.0.1 et-xmlfile = 1.0.1
exceptiongroup = 1.1.3:whl exceptiongroup = 1.1.3:whl
fastjsonschema = 2.18.1 fastjsonschema = 2.18.1
...@@ -229,7 +229,8 @@ jupyterlab-pygments = 0.1.2 ...@@ -229,7 +229,8 @@ jupyterlab-pygments = 0.1.2
lock-file = 2.0 lock-file = 2.0
lockfile = 0.12.2:whl lockfile = 0.12.2:whl
lsprotocol = 2023.0.0b1:whl lsprotocol = 2023.0.0b1:whl
lxml = 4.9.1 lxml = 5.2.1
lxml-html-clean = 0.1.1
manuel = 1.11.2 manuel = 1.11.2
MarkupSafe = 2.1.3 MarkupSafe = 2.1.3
matplotlib = 2.1.2 matplotlib = 2.1.2
...@@ -392,6 +393,7 @@ importlib-metadata = 1.7.0:whl ...@@ -392,6 +393,7 @@ importlib-metadata = 1.7.0:whl
itsdangerous = 0.24 itsdangerous = 0.24
Jinja2 = 2.11.3 Jinja2 = 2.11.3
jsonschema = 3.0.2:whl jsonschema = 3.0.2:whl
lxml = 4.9.1
MarkupSafe = 1.0 MarkupSafe = 1.0
msgpack = 0.6.2 msgpack = 0.6.2
packaging = 16.8 packaging = 16.8
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7