Porting from Debian 11 (bullseye)

...

Current date in necessary format could be gotten by:

_{date -R}

...

After that you can provide result packages to Jenkins for integration.

If build failed you shall make all necessary fixes (using quilt tool), increment the +dilos<version> and add new line in debian/changelog with short description of the fix you made.

Bug fixing

Install DU4 zone (see How to bootstrap a DU4 zone )

...

Select “bullseye“, scroll down the page.

...

...

Done, you’ve downloaded and unpack original Debian 11 sources. Now you can compare the code and debian’s files with ours from DU4 sources or port them as described above.

Some notes and hints

Do not mix deb-src between DU4 and bullseye in one /etc/apt/sources.list! It will confuse apt when it shall download the sources.

Patching

Install quilt and update the ~/.quiltrc:

QUILT_PATCHES=debian/patches

#QUILT_NO_DIFF_INDEX=1

QUILT_NO_DIFF_TIMESTAMPS=1

QUILT_DIFF_OPTS="--show-c-function"

#QUILT_REFRESH_ARGS="-p ab"

QUILT_DIFF_ARGS="--color=auto" # If you want some color when using quilt diff.

QUILT_PATCH_OPTS="--reject-format=unified"

QUILT_COLORS="diff_hdr=1;32:diff_add=1;34:diff_rem=1;31:diff_hunk=1;33:diff_ctx=35:diff_cctx=33"

Create new patch (from sources root):

_{quilt new dilos.patch}

Add file to patch:

_{quilt add dir-for-file/file.ext}

Create/update patch:

_{quilt refresh}

Committing the component

clone repo (do not forget add your public key into https://bitbucket.org/account/settings/ssh-keys)

_{git clone git@bitbucket.org:dilos/du4.git}

go to components directory

_{cd du4/components}

Create branch for the component (ticket name - component name):

_{git checkout -b d4-333-apt}

Create folder for component (usually, it is name without version-revision):

_{mkdir apt}

_{cd apt}

Copy the original debian folder from the source (safe the attributes):

_{cp -a -r debian ../../du4/components/apt}

Create Makefile here:

#
# This file and its contents are supplied under the terms of the
# Common Development and Distribution License ("CDDL"), version 1.0.
# You may only use this file in accordance with the terms of version
# 1.0 of the CDDL.
#
# A full copy of the text of the CDDL should have accompanied this
# source.  A copy of the CDDL is also available via the Internet at
# http://www.illumos.org/license/CDDL.
#

#
# Copyright (c) 2022 DilOS Team <dilos@dilos.org>
#
include ../../make-rules/shared-macros.mk

COMPONENT_NAME= apt

include ../../make-rules/deb_src2.mk

#
build:
        @echo "Nothing build"

install:
        @echo "Nothing install"

clean:
        $(RM) -r $(BUILD_DIR)
#       $(RM) *.changes
#       $(RM) *.deb

clobber: clean

test: $(NO_TESTS)

Add, commit and push the branch:

_{git add --all}

_{git commit -m “original apt_2.2.4 from bullseye“}

_{git push --set-upstream origin d4-333-apt}

After updating the debian/files upto DilOS:

_{git add --all}

_{git commit -m “DilOS update for apt“}

_{git push}

In your browser go to https://bitbucket.org/dilos/du4/branches.

...

Push “Create” link in the “Pull request” column of your branch.

...

Check the “Delete branch“ checkbox.

Push “Create pull request“ button.

...

Add reviewers.