Skip to content

S
slapos.package
Commit 9042c4b4 authored by Ophélie Gagnard's avatar Ophélie Gagnard
Browse files
Options

osc/generic/: Add, clean and update distribution and compilation files or templates. 

Add distrbution files and clean compilation templates.

distribution-specifics/:
- Change the "Version" field in the .dsc
- dep_fluentbit: Add distribution-specifics/dep_fluent-bit/, templates/compilation-templates/dep_fluent-bit/
- fluent-bit: Add distribution-specifics clean the compilation templates.
- Move and update light-build-dependencies/ to dep--mca/
- dep--mca--static/: Fix a bug (wrong .dsc name).

distribution-specifics/, templates/:
- Change dep_* to dep--* and rename the files accordingly.
- Modify directories, file names and file contents according to the *-static -> --*static switch.

build-scripts/build_tree.sh Fix the local model for slapos repository.
parent 4b3bbd62
Hide whitespace changes
Inline Side-by-side
Showing with 195 additions and 29 deletions
obs/generic/build-scripts/bootstrap_buildout.sh
View file @ 9042c4b4
...@@ -41,6 +41,6 @@ cd $INITIAL_DIR ...@@ -41,6 +41,6 @@ cd $INITIAL_DIR
# add "backup." before the directory name pointed to by $TARBALL_DIR # add "backup." before the directory name pointed to by $TARBALL_DIR
BACKUP_DIR=$TARBALL_DIR/../backup.$SOFTWARE_AND_VERSION BACKUP_DIR=$TARBALL_DIR/../backup.$SOFTWARE_AND_VERSION
BACKUP_DIR=`realpath -m $BACKUP_DIR` BACKUP_DIR=`realpath -m $BACKUP_DIR`
# Delete the potential old backup and backup the newly created build tree instead. # Delete the potential previous backup and backup the newly created build tree instead.
rm -rf $BACKUP_DIR rm -rf $BACKUP_DIR
cp -r $TARBALL_DIR $BACKUP_DIR cp -r $TARBALL_DIR $BACKUP_DIR
obs/generic/build-scripts/build_tree.sh
View file @ 9042c4b4
...@@ -7,7 +7,7 @@ cd $INITIAL_DIR ...@@ -7,7 +7,7 @@ cd $INITIAL_DIR
mkdir -p $TARBALL_DIR mkdir -p $TARBALL_DIR
# Re-downloading the software release to pack # Re-downloading the software release to pack
#cp -r /home/test/other-projects/model/1wip_simplify-fluentbit_my-slapos . #cp -r /home/test/other-projects/model/1wip_simplify-fluentbit_my-slapos .
cp -r /home/test/other-projects/model/light-build-dependencies.my-slapos $TARBALL_DIR/software_release cp -r /home/test/other-projects/model/mca.my-slapos $TARBALL_DIR/software_release
#cp -r /home/test/other-projects/new_slapos.package/sid.fluentbit.my-slapos $TARBALL_DIR #cp -r /home/test/other-projects/new_slapos.package/sid.fluentbit.my-slapos $TARBALL_DIR
#mv $TARBALL_DIR/mca.my-slapos $TARBALL_DIR/software_release #mv $TARBALL_DIR/mca.my-slapos $TARBALL_DIR/software_release
......
obs/generic/distribution-specifics/light-build-dependencies-mca/debian/changelog → obs/generic/distribution-specifics/dep--fluent-bit/debian/changelog
View file @ 9042c4b4
light-build-dependencies-mca (1-1) UNRELEASED; urgency=medium dep--fluent-bit (1-1) UNRELEASED; urgency=medium
* Initial release. (Closes: #XXXXXX) * Initial release. (Closes: #XXXXXX)
......
obs/generic/distribution-specifics/dep--fluent-bit/debian/control 0 → 100644
View file @ 9042c4b4
Source: dep--fluent-bit
Maintainer: Francois Gagnard <francois.gagnard@nexedi.com>
Section: net
Priority: optional
Build-Depends: debhelper (>= 4.1.16),
chrpath,
wget,
python (>= 2.7),
python3 (>= 3.7),
python3-dev (>= 3.7),
cmake (>= 3.18)
Package: dep--fluent-bit
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
ucf,
uml-utilities,
# slapgrid-sr needed by most recipes
libc6-dev | libc-dev,
gcc | c-compiler,
g++ | c++-compiler,
make,
patch,
# devperm manager plugin wants to use lsblk
util-linux
Conflicts:
Description: dep--fluent-bit packaging test
obs/generic/distribution-specifics/dep--fluent-bit/debian/rules 0 → 100755
View file @ 9042c4b4
#!/usr/bin/make -f
#export DH_VERBOSE=1
PACKAGE = $(shell dh_listpackages)
TMP = $(CURDIR)/debian/$(PACKAGE)
%:
dh $@
override_dh_installdebconf:
override_dh_makeshlibs:
dh_makeshlibs -n
override_dh_shlibdeps:
dh_shlibdeps -- -x$(PACKAGE)
rm -f $(TMP)/DEBIAN/shlibs
obs/generic/distribution-specifics/dep--fluent-bit/dep--fluent-bit_1-1.dsc 0 → 100644
View file @ 9042c4b4
Format: 3.0 (native)
Source: dep--fluent-bit
Architecture: any
Version: 1-1
Build-Depends: debhelper (>= 4.1.16),
chrpath,
wget,
python (>= 2.7),
python3 (>= 3.7),
python3-dev (>= 3.7),
cmake (>= 3.18)
obs/generic/distribution-specifics/dep--mca--static/debian/changelog 0 → 100644
View file @ 9042c4b4
dep--mca--static (1-1) UNRELEASED; urgency=medium
* Initial release. (Closes: #XXXXXX)
-- test <test@debian> Tue, 25 Jan 2022 18:27:17 +0100
obs/generic/distribution-specifics/light-build-dependencies-mca/debian/control → obs/generic/distribution-specifics/dep--mca--static/debian/control
View file @ 9042c4b4
Source: light-build-dependencies-mca Source: dep--mca--static
Maintainer: Francois Gagnard <francois.gagnard@nexedi.com> Maintainer: Francois Gagnard <francois.gagnard@nexedi.com>
Section: net Section: net
Priority: optional Priority: optional
...@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 4.1.16), ...@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 4.1.16),
golang (>= 2:1.15~1), golang (>= 2:1.15~1),
cmake (>= 3.18) cmake (>= 3.18)
Package: light-build-dependencies-mca Package: dep--mca--static
Architecture: any Architecture: any
Depends: ${misc:Depends}, Depends: ${misc:Depends},
${shlibs:Depends}, ${shlibs:Depends},
...@@ -26,4 +26,4 @@ Depends: ${misc:Depends}, ...@@ -26,4 +26,4 @@ Depends: ${misc:Depends},
# devperm manager plugin wants to use lsblk # devperm manager plugin wants to use lsblk
util-linux util-linux
Conflicts: Conflicts:
Description: light-build-dependencies-mca packaging test Description: dep--mca--static packaging test
obs/generic/distribution-specifics/dep--mca--static/debian/dirs 0 → 100644
View file @ 9042c4b4
/opt/dep--mca--static_1-1/bin/
/opt/dep--mca--static_1-1/etc/
/opt/dep--mca--static_1-1/lib/
/opt/dep--mca--static_1-1/share/
obs/generic/distribution-specifics/light-build-dependencies-mca/light-build-dependencies-mca_1-1.dsc → obs/generic/distribution-specifics/dep--mca--static/dep--mca--static_1-1.dsc
View file @ 9042c4b4
Format: 3.0 (native) Format: 3.0 (native)
Source: light-build-dependencies-mca Source: dep--mca--static
Architecture: any Architecture: any
Version: 1 Version: 1-1
Build-Depends: debhelper (>= 4.1.16), Build-Depends: debhelper (>= 4.1.16),
chrpath, chrpath,
wget, wget,
......
obs/generic/distribution-specifics/dep_mca-static/debian/changelog → obs/generic/distribution-specifics/dep--mca/debian/changelog
View file @ 9042c4b4
dep_mca-static (1-1) UNRELEASED; urgency=medium dep--mca (1-1) UNRELEASED; urgency=medium
* Initial release. (Closes: #XXXXXX) * Initial release. (Closes: #XXXXXX)
......
obs/generic/distribution-specifics/dep_mca-static/debian/control → obs/generic/distribution-specifics/dep--mca/debian/control
View file @ 9042c4b4
Source: dep_mca-static Source: dep--mca
Maintainer: Francois Gagnard <francois.gagnard@nexedi.com> Maintainer: Francois Gagnard <francois.gagnard@nexedi.com>
Section: net Section: net
Priority: optional Priority: optional
...@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 4.1.16), ...@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 4.1.16),
golang (>= 2:1.15~1), golang (>= 2:1.15~1),
cmake (>= 3.18) cmake (>= 3.18)
Package: dep_mca-static Package: dep--mca
Architecture: any Architecture: any
Depends: ${misc:Depends}, Depends: ${misc:Depends},
${shlibs:Depends}, ${shlibs:Depends},
...@@ -26,4 +26,4 @@ Depends: ${misc:Depends}, ...@@ -26,4 +26,4 @@ Depends: ${misc:Depends},
# devperm manager plugin wants to use lsblk # devperm manager plugin wants to use lsblk
util-linux util-linux
Conflicts: Conflicts:
Description: dep_mca-static packaging test Description: dep--mca packaging test
obs/generic/distribution-specifics/dep--mca/debian/dirs 0 → 100644
View file @ 9042c4b4
/opt/dep--mca_1-1/bin/
/opt/dep--mca_1-1/etc/
/opt/dep--mca_1-1/lib/
/opt/dep--mca_1-1/share/
obs/generic/distribution-specifics/dep_mca-static/dep_mca-static_1-1.dsc → obs/generic/distribution-specifics/dep--mca/dep--mca_1-1.dsc
View file @ 9042c4b4
Format: 3.0 (native) Format: 3.0 (native)
Source: dep_mca-static Source: dep--mca
Architecture: any Architecture: any
Version: 1 Version: 1-1
Build-Depends: debhelper (>= 4.1.16), Build-Depends: debhelper (>= 4.1.16),
chrpath, chrpath,
wget, wget,
......
obs/generic/distribution-specifics/dep_mca-static/debian/dirs deleted 100644 → 0
View file @ 4b3bbd62
/opt/dep_mca-static_1-1/bin/
/opt/dep_mca-static_1-1/etc/
/opt/dep_mca-static_1-1/lib/
/opt/dep_mca-static_1-1/share/
obs/generic/distribution-specifics/example/example_1-1.dsc
View file @ 9042c4b4
Format: 3.0 (native) Format: 3.0 (native)
Source: example Source: example
Architecture: any Architecture: any
Version: 1 Version: 1-1
Build-Depends: debhelper (>= 4.1.16), chrpath, po-debconf, wget, python (>= 2.7) Build-Depends: debhelper (>= 4.1.16), chrpath, po-debconf, wget, python (>= 2.7)
obs/generic/distribution-specifics/fluent-bit/debian/changelog 0 → 100644
View file @ 9042c4b4
fluent-bit (1-1) UNRELEASED; urgency=medium
* Initial release. (Closes: #XXXXXX)
-- test <test@debian> Tue, 25 Jan 2022 18:27:17 +0100
obs/generic/distribution-specifics/fluent-bit/debian/control 0 → 100644
View file @ 9042c4b4
Source: fluent-bit
Maintainer: Francois Gagnard <francois.gagnard@nexedi.com>
Section: net
Priority: optional
Build-Depends: debhelper,
chrpath,
python
Package: fluent-bit
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
ucf,
uml-utilities,
# slapgrid-sr needed by most recipes
libc6-dev | libc-dev,
gcc | c-compiler,
g++ | c++-compiler,
make,
patch,
# devperm manager plugin wants to use lsblk
util-linux
Conflicts:
Description: fluent-bit packaging test
obs/generic/distribution-specifics/fluent-bit/debian/rules 0 → 100755
View file @ 9042c4b4
#!/usr/bin/make -f
#export DH_VERBOSE=1
PACKAGE = $(shell dh_listpackages)
TMP = $(CURDIR)/debian/$(PACKAGE)
%:
dh $@
override_dh_installdebconf:
override_dh_makeshlibs:
dh_makeshlibs -n
override_dh_shlibdeps:
dh_shlibdeps -- -x$(PACKAGE)
rm -f $(TMP)/DEBIAN/shlibs
obs/generic/distribution-specifics/fluent-bit/fluent-bit_1-1.dsc 0 → 100644
View file @ 9042c4b4
Format: 3.0 (native)
Source: fluent-bit
Architecture: any
Version: 1-1
Build-Depends: debhelper (>= 4.1.16), chrpath, po-debconf, wget, python (>= 2.7)
obs/generic/distribution-specifics/light-build-dependencies-mca/debian/dirs deleted 100644 → 0
View file @ 4b3bbd62
/opt/light-build-dependencies-mca_1-1/bin/
/opt/light-build-dependencies-mca_1-1/etc/
/opt/light-build-dependencies-mca_1-1/lib/
/opt/light-build-dependencies-mca_1-1/share/
obs/generic/templates/compilation-templates/light-build-dependencies-mca/Makefile.in → obs/generic/templates/compilation-templates/dep--fluent-bit/Makefile.in
View file @ 9042c4b4
...@@ -43,57 +43,8 @@ clean: ...@@ -43,57 +43,8 @@ clean:
rm -f *-stamp rm -f *-stamp
install: all install: all
# mkdir
mkdir -p $(INSTALL_DIR)/bin mkdir -p $(INSTALL_DIR)/bin
mkdir -p $(INSTALL_DIR)/etc/ -cp -r $(RUN_BUILDOUT_DIR)/parts/fluent-bit/bin/fluent-bit $(INSTALL_DIR)/bin/
#mkdir -p $(INSTALL_DIR)/include/
mkdir -p $(INSTALL_DIR)/lib/
mkdir -p $(INSTALL_DIR)/share/
# cp
#cp `find $(RUN_BUILDOUT_DIR) | grep -e "^$(RUN_BUILDOUT_DIR)/[^/][^/]*/bin/*` $(DESTDIR)/usr/bin/
# bin
# no "-r" option to "cp" because there must be no subdirectories
# see https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch04s04.html
# and https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch03s13.html
-cp $(RUN_BUILDOUT_DIR)/parts/mca/bin/* $(INSTALL_DIR)/bin/
# etc
-cp -r $(RUN_BUILDOUT_DIR)/parts/mca/etc/* $(INSTALL_DIR)/etc/
# next line: in case flb.conf is moved to from mca to fluentbit-plugin-wendelin
-cp -r $(RUN_BUILDOUT_DIR)/parts/fluentbit-plugin-wendelin/etc/* $(INSTALL_DIR)/etc/
-cp -r $(RUN_BUILDOUT_DIR)/parts/openssl/etc/* $(INSTALL_DIR)/etc/
# remove links to certs in parts/ca-certificates/[...]: not supported for now
-rm -rf $(INSTALL_DIR)/etc/ssl/certs
# include
#-cp -r $(RUN_BUILDOUT_DIR)/parts/fluentbit-plugin-wendelin/include/* $(INSTALL_DIR)/include/
#-cp -r $(RUN_BUILDOUT_DIR)/parts/openssl/include/* $(INSTALL_DIR)/include/
# lib
-cp -r $(RUN_BUILDOUT_DIR)/parts/openssl/lib/libcrypto* $(INSTALL_DIR)/lib/
-cp $(RUN_BUILDOUT_DIR)/parts/fluentbit-plugin-wendelin/lib/* $(INSTALL_DIR)/lib/
# LIBCRYPTO
# TODO: then next "cp" is a workaroung because libcrypto.so or libcrypto.a from slapos doesn't work
# this should be fixed asap
#-cp /lib/x86_64-linux-gnu/libcrypto.so.1.1 $(INSTALL_DIR)/lib/
# LIBFMT
-cp -r $(RUN_BUILDOUT_DIR)/parts/fmtlib/lib/libfmt.so* $(INSTALL_DIR)/lib/
# share
-cp -r $(RUN_BUILDOUT_DIR)/parts/mca/share/* $(INSTALL_DIR)/share/
# TODO: what is it actually needed from openssl...?
#-cp -r $(RUN_BUILDOUT_DIR)/parts/openssl/share/* $(INSTALL_DIR)/share/
-cp -r $(RUN_BUILDOUT_DIR)/parts/fluentbit-plugin-wendelin/share/* $(INSTALL_DIR)/share/
# DEBUG
ls -Rl $(INSTALL_DIR)/bin/ # DEBUG ls -Rl $(INSTALL_DIR)/bin/ # DEBUG
ls -Rl $(INSTALL_DIR)/etc/ # DEBUG
#ls -Rl $(INSTALL_DIR)/include/ # DEBUG
ls -Rl $(INSTALL_DIR)/lib/ # DEBUG
ls -Rl $(INSTALL_DIR)/share/ # DEBUG
.PHONY: build all clean install .PHONY: build all clean install
obs/generic/templates/compilation-templates/fluent-bit/Makefile.in
View file @ 9042c4b4
...@@ -43,12 +43,8 @@ clean: ...@@ -43,12 +43,8 @@ clean:
rm -f *-stamp rm -f *-stamp
install: all install: all
#cd slapos; make install
mkdir -p $(INSTALL_DIR)/bin mkdir -p $(INSTALL_DIR)/bin
mkdir -p $(INSTALL_DIR)/share/ -cp -r $(RUN_BUILDOUT_DIR)/parts/fluent-bit/bin/fluent-bit $(INSTALL_DIR)/bin/
#cp `find $(RUN_BUILDOUT_DIR) | grep -e "^$(RUN_BUILDOUT_DIR)/[^/][^/]*/bin/*` $(DESTDIR)/usr/bin/
-cp -r $(RUN_BUILDOUT_DIR)/parts/fluent-bit/bin/* $(INSTALL_DIR)/bin/
-cp -r $(RUN_BUILDOUT_DIR)/parts/fluent-bit/share/* $(INSTALL_DIR)/share/
ls -Rl $(INSTALL_DIR)/bin/ # DEBUG ls -Rl $(INSTALL_DIR)/bin/ # DEBUG
.PHONY: build all clean install .PHONY: build all clean install
obs/generic/templates/distribution-templates/default.dsc.in
View file @ 9042c4b4
Format: 3.0 (native) Format: 3.0 (native)
Source: %SOFTWARE_NAME% Source: %SOFTWARE_NAME%
Architecture: any Architecture: any
Version: %SOFTWARE_VERSION% Version: %COMPOUND_VERSION%
Build-Depends: debhelper (>= 4.1.16), chrpath, po-debconf, wget, python (>= 2.7) Build-Depends: debhelper (>= 4.1.16), chrpath, po-debconf, wget, python (>= 2.7)
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