Skip to content

Commit

Permalink
Update debian build
Browse files Browse the repository at this point in the history
  • Loading branch information
wu-emma committed Apr 29, 2024
1 parent 0e996b4 commit c6ac376
Show file tree
Hide file tree
Showing 16 changed files with 45 additions and 33 deletions.
2 changes: 1 addition & 1 deletion debian.minimal/README.Debian
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
To create the Debian package installable on multiple systems including
Ubuntu 20.04, run:
Ubuntu 22.04, run:

./debian/build-in-docker.sh

Expand Down
12 changes: 6 additions & 6 deletions debian.minimal/build-in-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ finish() {
docker container rm $container >/dev/null
}

docker pull ubuntu:20.04
container=`docker run -dit -e TZ='Etc/UTC' -e DEBIAN_FRONTEND='noninteractive' ubuntu:20.04 `
docker pull ubuntu:22.04
container=`docker run -dit -e TZ='Etc/UTC' -e DEBIAN_FRONTEND='noninteractive' ubuntu:22.04 `
trap finish EXIT

docker exec $container apt-get -y update
Expand All @@ -20,8 +20,8 @@ docker exec $container useradd user
docker exec $container mkdir /home/user
docker exec $container chown user.user /home/user
docker exec $container sudo -u user mkdir /home/user/build
docker cp ../bitgesell_0.1.11.dsc $container:/root/repo/
docker cp ../bitgesell_0.1.11.tar.xz $container:/root/repo/
docker cp ../bitgesell_0.1.12.dsc $container:/root/repo/
docker cp ../bitgesell_0.1.12.tar.xz $container:/root/repo/
# docker exec -w /root/repo $container sh -c "dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz"
docker exec -w /root/repo $container sh -c "apt-ftparchive sources . > Sources"
docker exec $container sh -c "echo deb-src [trusted=yes] file:/root/repo ./ >> /etc/apt/sources.list"
Expand All @@ -30,5 +30,5 @@ docker exec $container apt-get -y build-dep bitgesell
docker exec $container chmod a+rX /root
docker exec $container chmod -R a+rX /root/repo
docker exec -w /home/user/build $container sudo -u user apt-get -y source bitgesell
docker exec -w /home/user/build/bitgesell-0.1.11 $container sudo -u user debuild -b
docker cp $container:/home/user/build/bitgesell_0.1.11_amd64.deb bitgesell_0.1.11_amd64.deb
docker exec -w /home/user/build/bitgesell-0.1.12 $container sudo -u user debuild -b
docker cp $container:/home/user/build/bitgesell_0.1.12_amd64.deb bitgesell_0.1.12_amd64.deb
6 changes: 6 additions & 0 deletions debian.minimal/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
bitgesell (0.1.12) UNRELEASED; urgency=low

* Bitcoin code synced

-- Mathias van Orton <it@bitgesell.ca> Mon, 29 Apr 2024 08:50:00 +0000

bitgesell (0.1.11) UNRELEASED; urgency=low

* Bitcoin code synced
Expand Down
2 changes: 1 addition & 1 deletion debian.minimal/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
11
12
2 changes: 1 addition & 1 deletion debian.minimal/control
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Source: bitgesell
Section: misc
Priority: optional
Maintainer: Emma Wu <wuemma@protonmail.com>
Build-Depends: debhelper (>=11~), g++-9, pkg-config, dh-autoreconf, libevent-dev, libssl-dev, fakeroot, wget
Build-Depends: debhelper (>=11~), g++-11, pkg-config, dh-autoreconf, libevent-dev, libssl-dev, fakeroot, wget
Standards-Version: 4.1.4
Homepage: https://github.com/wu-emma/bitgesell

Expand Down
2 changes: 1 addition & 1 deletion debian.minimal/files
Original file line number Diff line number Diff line change
@@ -1 +1 @@
bitgesell_0.1.11_source.buildinfo misc optional
bitgesell_0.1.12_source.buildinfo misc optional
6 changes: 3 additions & 3 deletions debian.minimal/rules
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
builddir = $(shell pwd)
destdir = $(builddir)/debian/bitgesell

CC = gcc-9
CXX = g++-9
CC = gcc-11
CXX = g++-11

.PHONY: distrib download-distrib unpack-distrib berkeleydb libevent miniupnpc

Expand Down Expand Up @@ -41,7 +41,7 @@ boost:
./bootstrap.sh CC=$(CC) CXX=$(CXX) --prefix=$(builddir)/distrib/tmp/libboost && \
./b2 install

# --disable-atomicsupport slows things down, but that's necessary to compile (at least on on Ubuntu 20.04.1)
# --disable-atomicsupport slows things down, but that's necessary to compile (at least on on Ubuntu 22.04.1)
# TODO: Modify libdb to make it faster.
berkeleydb:
cd distrib/db-4.8.30/build_unix && \
Expand Down
6 changes: 3 additions & 3 deletions debian.minimal/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
# docker container rm $container >/dev/null
#}

docker pull ubuntu:20.04
container=`docker run -dit -e TZ='Etc/UTC' -e DEBIAN_FRONTEND='noninteractive' ubuntu:20.04`
docker pull ubuntu:22.04
container=`docker run -dit -e TZ='Etc/UTC' -e DEBIAN_FRONTEND='noninteractive' ubuntu:22.04`
#trap finish EXIT

docker exec $container apt-get -y update
docker exec $container apt-get -y install apt-utils #dpkg-dev
docker exec $container mkdir /root/repo
docker cp ./bitgesell_0.1.11_amd64.deb $container:/root/repo
docker cp ./bitgesell_0.1.12_amd64.deb $container:/root/repo
# docker exec -w /root/repo $container sh -c "dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz"
docker exec -w /root/repo $container sh -c "apt-ftparchive packages . > Packages"
docker exec $container sh -c "echo deb [trusted=yes] file:/root/repo ./ >> /etc/apt/sources.list"
Expand Down
2 changes: 1 addition & 1 deletion debian.qt/README.Debian
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
To create the Debian package installable on multiple systems including
Ubuntu 20.04 (with Qt wallet), run:
Ubuntu 22.04 (with Qt wallet), run:

./debian/build-in-docker.sh

Expand Down
14 changes: 7 additions & 7 deletions debian.qt/build-in-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ finish() {
docker container rm $container >/dev/null
}

docker pull ubuntu:20.04
container=`docker run -dit -e TZ='Etc/UTC' -e DEBIAN_FRONTEND='noninteractive' ubuntu:20.04 `
docker pull ubuntu:22.04
container=`docker run -dit -e TZ='Etc/UTC' -e DEBIAN_FRONTEND='noninteractive' ubuntu:22.04 `
trap finish EXIT

#docker cp ./debian/updateunattended.sh $container:/root/
Expand All @@ -23,8 +23,8 @@ docker exec $container useradd user
docker exec $container mkdir /home/user
docker exec $container chown user.user /home/user
docker exec $container sudo -u user mkdir /home/user/build
docker cp ../bitgesell-qt_0.1.11.dsc $container:/root/repo/
docker cp ../bitgesell-qt_0.1.11.tar.xz $container:/root/repo/
docker cp ../bitgesell-qt_0.1.12.dsc $container:/root/repo/
docker cp ../bitgesell-qt_0.1.12.tar.xz $container:/root/repo/
# docker exec -w /root/repo $container sh -c "dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz"

docker exec -w /root/repo $container sh -c "apt-ftparchive sources . > Sources"
Expand All @@ -34,6 +34,6 @@ docker exec $container apt-get -y build-dep bitgesell-qt
docker exec $container chmod a+rX /root
docker exec $container chmod -R a+rX /root/repo
docker exec -w /home/user/build $container sudo -u user apt-get -y source bitgesell-qt
docker exec -w /home/user/build/bitgesell-qt-0.1.11 $container sudo -u user debuild -b
docker cp $container:/home/user/build/bitgesell-qt_0.1.11_amd64.deb bitgesell-qt_0.1.11_amd64.deb
docker cp $container:/home/user/build/bitgesell-qt-dbg_0.1.11_amd64.deb bitgesell-qt-dbg_0.1.11_amd64.deb
docker exec -w /home/user/build/bitgesell-qt-0.1.12 $container sudo -u user debuild -b
docker cp $container:/home/user/build/bitgesell-qt_0.1.12_amd64.deb bitgesell-qt_0.1.12_amd64.deb
docker cp $container:/home/user/build/bitgesell-qt-dbg_0.1.12_amd64.deb bitgesell-qt-dbg_0.1.12_amd64.deb
6 changes: 6 additions & 0 deletions debian.qt/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
bitgesell (0.1.12) UNRELEASED; urgency=low

* Bitcoin code synced

-- Mathias van Orton <it@bitgesell.ca> Mon, 29 Apr 2024 08:50:00 +0000

bitgesell-qt (0.1.11) UNRELEASED; urgency=low

* Bitcoin code synced
Expand Down
2 changes: 1 addition & 1 deletion debian.qt/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
11
12
2 changes: 1 addition & 1 deletion debian.qt/control
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Source: bitgesell-qt
Section: misc
Priority: optional
Maintainer: Mathias van Orton <it@bitgesell.ca>
Build-Depends: debhelper (>=11~), g++-9, pkg-config, dh-autoreconf, libevent-dev, libssl-dev, fakeroot, wget
Build-Depends: debhelper (>=11~), g++-11, pkg-config, dh-autoreconf, libevent-dev, libssl-dev, fakeroot, wget
Standards-Version: 4.1.4
Homepage: https://github.com/wu-emma/bitgesell

Expand Down
2 changes: 1 addition & 1 deletion debian.qt/files
Original file line number Diff line number Diff line change
@@ -1 +1 @@
bitgesell-qt_0.1.11_source.buildinfo misc optional
bitgesell-qt_0.1.12_source.buildinfo misc optional
6 changes: 3 additions & 3 deletions debian.qt/rules
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
builddir = $(shell pwd)
destdir = $(builddir)/debian/bitgesell-qt

CC = gcc-9
CXX = g++-9
CC = gcc-11
CXX = g++-11

.PHONY: distrib download-distrib unpack-distrib berkeleydb libevent miniupnpc

Expand Down Expand Up @@ -41,7 +41,7 @@ boost:
./bootstrap.sh CC=$(CC) CXX=$(CXX) --prefix=$(builddir)/distrib/tmp/libboost && \
./b2 install

# --disable-atomicsupport slows things down, but that's necessary to compile (at least on on Ubuntu 20.04.1)
# --disable-atomicsupport slows things down, but that's necessary to compile (at least on on Ubuntu 22.04.1)
# TODO: Modify libdb to make it faster.
berkeleydb:
cd distrib/db-4.8.30/build_unix && \
Expand Down
6 changes: 3 additions & 3 deletions debian.qt/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ finish() {
docker container rm $container >/dev/null
}

docker pull ubuntu:20.04
container=`docker run -dit -e TZ='Etc/UTC' -e DEBIAN_FRONTEND='noninteractive' ubuntu:20.04`
docker pull ubuntu:22.04
container=`docker run -dit -e TZ='Etc/UTC' -e DEBIAN_FRONTEND='noninteractive' ubuntu:22.04`
trap finish EXIT

docker exec $container apt-get -y update
docker exec $container apt-get -y install apt-utils #dpkg-dev
docker exec $container mkdir /root/repo
docker cp ./bitgesell-qt_0.1.11_amd64.deb $container:/root/repo
docker cp ./bitgesell-qt_0.1.12_amd64.deb $container:/root/repo
# docker exec -w /root/repo $container sh -c "dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz"
docker exec -w /root/repo $container sh -c "apt-ftparchive packages . > Packages"
docker exec $container sh -c "echo deb [trusted=yes] file:/root/repo ./ >> /etc/apt/sources.list"
Expand Down

0 comments on commit c6ac376

Please sign in to comment.