obs/generic/: Add MCA Debian files. Fix and update some files.

build-scripts/:
- obs.sh: Fix some bugs.
- configuration-information.sh: Switch version to 1. Tweak some lines.
Warning: switch to mca

distribution-specifics/: Change version from 0-1 to 1-1. (Debian standard doesn't use 0?)

obs/generic/TODO.txt

@@ -2,6 +2,7 @@
 SHORT RUN
 "Merge" BUILD_DIR and RUN_BUILDOUT_DIR. Don't forgot the templates.
 In Makefile.in, allow to select some parts to copy.
+Set the versions to 1-1 instead of 0-1?
 
 LONG RUN
 Use a ./configure script?

obs/generic/build-scripts/configuration_information.sh

@@ -6,17 +6,18 @@ INITIAL_DIR="$(pwd)"/
 
 # RELEASE INFORMATION
 # Modify the following variables accordingly
-VERSION=0
+VERSION=1
 #RECIPE_VERSION=1
 RELEASE=1
-SOFTWARE_NAME=lunzip
+SOFTWARE_NAME=mca
 
 COMPOUND_VERSION=${VERSION}-${RELEASE}
 VERSION_NAME=${SOFTWARE_NAME}_${COMPOUND_VERSION}
 ARCHIVE_EXT=.tar.gz
 
 # INSTALL INFORMATION
-TARGET_DIR=/opt/$VERSION_NAME			# only used for the templates
+# TARGET_DIR is only used in the templates via sed regexps
+TARGET_DIR=/opt/$VERSION_NAME
 
 # OBS AND DISTRIBUTIONS INFORMATION
 OBS_DIR=$INITIAL_DIR/home:oph.nxd/$SOFTWARE_NAME/
@@ -25,12 +26,14 @@ TARBALL_DIR=$INITIAL_DIR/tarballs/$VERSION_NAME
 
 # BUILD INFORMATION
 # Modify the following variables accordingly
-SR_PATH=$TARBALL_DIR/software_release/component/lunzip/buildout.cfg
+#SR_PATH=$TARBALL_DIR/software_release/component/$SOFTWARE_NAME/buildout.cfg
+SR_PATH=$TARBALL_DIR/software_release/software/$SOFTWARE_NAME/software.cfg
 
 TEMPLATE_DIR=$INITIAL_DIR/templates
-BUILD_DIR=$TARBALL_DIR/build/	# former BUILD_ROOT_DIRECTORY
-# this is where the parts/ directory will be
-RUN_BUILDOUT_DIR=$BUILD_DIR/$TARGET_DIR		# former BUILD_DIRECTORY
+# BUILD_DIR was formerly BUILD_ROOT_DIRECTORY
+BUILD_DIR=$TARBALL_DIR/build/
+# RUN_BUILDOUT_DIR is where the parts/ directory will be ; formerly BUILD_DIRECTORY
+RUN_BUILDOUT_DIR=$BUILD_DIR/$TARGET_DIR
 
 
 # Path normalization
@@ -39,6 +42,7 @@ TARGET_DIR=`realpath -m $TARGET_DIR`
 OBS_DIR=`realpath -m $OBS_DIR`
 DIST_DIR=`realpath -m $DIST_DIR`
 TARBALL_DIR=`realpath -m $TARBALL_DIR`
+SR_PATH=`realpath -m $SR_PATH`
 TEMPLATE_DIR=`realpath -m $TEMPLATE_DIR`
 BUILD_DIR=`realpath -m $BUILD_DIR`
 RUN_BUILDOUT_DIR=`realpath -m $RUN_BUILDOUT_DIR`

obs/generic/build-scripts/obs.sh

@@ -9,9 +9,9 @@ TMP_DIR=`realpath -m $TMP_DIR`
 echo TMP_DIR = $TMP_DIR
 
 # copy the Makefile at the root of the tarball
-#cp $TEMPLATE_DIR/tmp/Makefile $TARBALL_DIR/Makefile
-# save the local BUILD_DIR to replace it with the BUILD_DIR of OBS' VM
-echo $BUILD_DIR > $TARBALL_DIR/cache_creation_build_directory
+cp $TEMPLATE_DIR/tmp/Makefile $TARBALL_DIR/Makefile
+# save the local TARBALL_DIR to replace it with the TARBALL_DIR of OBS' VM
+echo $TARBALL_DIR > $TARBALL_DIR/cache_creation_build_directory
 
 # clean the parts directory
 rm -rf $RUN_BUILDOUT_DIR/{.installed.cfg,parts/}

obs/generic/distribution-specifics/fluent-bit/debian/changelog

-fluent-bit (0-1) UNRELEASED; urgency=medium
+fluent-bit (1-1) UNRELEASED; urgency=medium
 
   * Initial release. (Closes: #XXXXXX)
 

obs/generic/distribution-specifics/fluent-bit/debian/dirs

-/opt/fluent-bit_0-1/bin/
-/opt/fluent-bit_0-1/lib/
-/opt/fluent-bit_0-1/etc/
+/opt/fluent-bit_1-1/bin/
+/opt/fluent-bit_1-1/lib/
+/opt/fluent-bit_1-1/etc/

obs/generic/distribution-specifics/lunzip/debian/changelog

-lunzip (0-1) UNRELEASED; urgency=medium
+lunzip (1-1) UNRELEASED; urgency=medium
 
   * Initial release. (Closes: #XXXXXX)
 

obs/generic/distribution-specifics/mca/debian/changelog

+mca (1-1) UNRELEASED; urgency=medium
+
+  * Initial release. (Closes: #XXXXXX)
+
+ -- test <test@debian>  Tue, 25 Jan 2022 18:27:17 +0100

obs/generic/distribution-specifics/mca/debian/compat

+10

obs/generic/distribution-specifics/mca/debian/control

+Source: mca
+Maintainer: Francois Gagnard <francois.gagnard@nexedi.com>
+Section: net
+Priority: optional
+Build-Depends: debhelper,
+               chrpath,
+               python
+
+Package: mca
+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: mca packaging test

obs/generic/distribution-specifics/mca/debian/copyright

+

obs/generic/distribution-specifics/mca/debian/dirs

+/opt/mca_1-1/bin/
+/opt/mca_1-1/lib/
+/opt/mca_1-1/etc/

obs/generic/distribution-specifics/mca/debian/rules

+#!/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/mca/debian/source/format

+3.0 (quilt)

obs/generic/distribution-specifics/mca/mca_1-1.dsc

+Format: 3.0 (native)
+Source: mca
+Architecture: any
+Version: 1
+Build-Depends: debhelper (>= 4.1.16), chrpath, po-debconf, wget, python (>= 2.7)

obs/generic/templates/Makefile.in

@@ -5,8 +5,10 @@ PY = $(PYTHON)
 # This templates are replaced by build-scripts/template_stage.sh
 # according to the values and regular expressions defined in
 # build-scripts/configuration_information.sh
-TARGET_DIR = %TARGET_DIR%		# this variable is pretty useless atm
-BUILD_DIR = $(shell pwd)/build
+# The variable TARGET_DIR is pretty useless atm
+TARGET_DIR = %TARGET_DIR%
+TARBALL_DIR = $(shell pwd)
+BUILD_DIR = $(TARBALL_DIR)/build
 INSTALL_DIR = $(BUILD_DIR)$(TARGET_DIR)
 RUN_BUILDOUT_DIR = $(BUILD_DIR)$(TARGET_DIR)
 #PATCHES_DIR := $(shell pwd)/patches
@@ -20,13 +22,13 @@ all: build
 
 build: build-stamp
 build-stamp:
-	@echo "Fixing buildout path to $(BUILD_DIR) rather than $(OLD_BUILD_DIR) for buildout"
+	@echo "Fixing buildout path to $(TARBALL_DIR) rather than $(OLD_BUILD_DIR) for buildout"
 ################################################################################ 
 #	grep -rIl '$(OLD_DIRECTORY)' $(BUILD_DIR) 2> /dev/null | \
 #		xargs sed -i 's#$(OLD_DIRECTORY)#$(BUILD_DIR)#g' || \
 #		echo "No path to fix."
 ################################################################################ 
-	cd $(RUN_BUILDOUT_DIR); sed -i 's#$(OLD_BUILD_DIR)#$(BUILD_DIR)#g' buildout.cfg bin/*
+	cd $(RUN_BUILDOUT_DIR); sed -i 's#$(OLD_BUILD_DIR)#$(TARBALL_DIR)#g' buildout.cfg bin/*
 	echo RUN_BUILDOUT_DIR = $(RUN_BUILDOUT_DIR) \; PY = $(PY)
 	cd $(RUN_BUILDOUT_DIR) && \
 		$(PY) ./bin/buildout -v