From dfb5416ba14f215eec2bc1d74fe7d12180aac414 Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Wed, 18 Dec 2019 15:35:25 +0000 Subject: [PATCH] 0install 2.15 --- debian/changelog | 6 ++++++ debian/control | 3 +++ debian/copyright | 5 +---- debian/patches/lwt-mips.patch | 37 ----------------------------------- debian/patches/mips.patch | 27 ------------------------- debian/patches/series | 2 -- debian/rules | 5 ++--- docker-template/Dockerfile | 3 +-- makedeb.debian | 23 ++++++++++------------ 9 files changed, 23 insertions(+), 88 deletions(-) delete mode 100644 debian/patches/lwt-mips.patch delete mode 100644 debian/patches/mips.patch delete mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 55ce41d3..484267e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +zeroinstall-injector (2.15-1) unstable; urgency=medium + + * New upstream release. + + -- Thomas Leonard Wed, 18 Dec 2019 14:51:21 +0000 + zeroinstall-injector (2.14.1-3) unstable; urgency=medium * Fix link error on MIPS. diff --git a/debian/control b/debian/control index 6a7663c4..eb367ba7 100644 --- a/debian/control +++ b/debian/control @@ -15,6 +15,9 @@ Build-Depends: binutils, libsha-ocaml-dev, libxmlm-ocaml-dev, libyojson-ocaml-dev, + libppxlib-ocaml-dev, + liblwt-log-ocaml-dev, + menhir, ocaml-dune, ocaml-findlib, ocaml-nox, diff --git a/debian/copyright b/debian/copyright index a1a9c41b..b5262594 100644 --- a/debian/copyright +++ b/debian/copyright @@ -29,11 +29,8 @@ Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. Due to the Debian transition to OCaml 4.08, this package is currently vendoring several libraries which have been removed from the archive. They are: -- camlp4-4.05+2 (LGPL-2) https://github.com/ocaml/camlp4 - lwt_glib-1.1.1 (LGPL-2.1) https://github.com/ocsigen/lwt_glib -- lwt_camlp4-2018-03-25 (LGPL-2.1) https://github.com/ocsigen/lwt_camlp4 -- type_conv-113.00.02 (Apache-2.0 + BSD-C3) https://github.com/janestreet/type_conv -- obus-1.1.7 (BSD-C3) https://github.com/ocaml-community/obus/ +- obus-1.2.0 (BSD-C3) https://github.com/ocaml-community/obus/ The Debian packaging is (C) Copyright 2014, Thomas Leonard and is also licensed under the LGPL 2.1 or later. diff --git a/debian/patches/lwt-mips.patch b/debian/patches/lwt-mips.patch deleted file mode 100644 index d3adc755..00000000 --- a/debian/patches/lwt-mips.patch +++ /dev/null @@ -1,37 +0,0 @@ -commit f33a79b2854ffb6c03b048805c3b4ba27eee7c8b -Author: Thomas Leonard -Date: Sun Sep 1 15:38:24 2019 +0100 - - HACK: fix linker error on Debian MIPS - - Fixed in later versions of LWT: - - https://github.com/ocsigen/lwt/pull/362 - - Error was: - - /usr/bin/ld: /usr/lib/ocaml/lwt/liblwt-unix_stubs.a(lwt_unix_stubs.o): in function `cst_to_constr': - (.text+0x2c30): multiple definition of `cst_to_constr'; /usr/lib/ocaml/libunix.a(cst2constr.o):(.text+0x0): first defined here - -diff --git a/ocaml/dune b/ocaml/dune -index 7b6404c9..a58e4d3b 100644 ---- a/ocaml/dune -+++ b/ocaml/dune -@@ -4,7 +4,7 @@ - (modules static_0install) - (ocamlopt_flags -linkall) ; Needed for the GUI plugin - (ocamlc_flags -linkall -custom) -- (link_flags (:include support/extra_objects.sexp)) -+ (link_flags (:include support/extra_objects.sexp) -cclib -Wl,--allow-multiple-definition) - (package 0install) - (libraries zeroinstall_cli zeroinstall threads)) - -@@ -12,7 +12,7 @@ - (public_name 0install-runenv.exe) - (name runenv) - (modules runenv) -- (link_flags (:include support/extra_objects.sexp)) -+ (link_flags (:include support/extra_objects.sexp) -cclib -Wl,--allow-multiple-definition) - (libraries zeroinstall_cli zeroinstall)) - - (install diff --git a/debian/patches/mips.patch b/debian/patches/mips.patch deleted file mode 100644 index 1e02ff44..00000000 --- a/debian/patches/mips.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit 9157d166c377802a7f7cc9e48a28b79c74995571 -Author: Thomas Leonard -Date: Sat Aug 31 12:03:55 2019 +0100 - - Fix camlp4 build on MIPS - -diff --git a/vendor/fix-debian.sh b/vendor/fix-debian.sh -index 4f33371a..8fe2b769 100755 ---- a/vendor/fix-debian.sh -+++ b/vendor/fix-debian.sh -@@ -14,9 +14,15 @@ tar xf $SRCDIR/lwt_camlp4-2018-03-25.bz2 - tar xf $SRCDIR/type_conv-113.00.02.tar.gz - tar xf $SRCDIR/obus-1.1.7.tar.gz - tar xf $SRCDIR/lwt_glib-1.1.1.tar.gz -+if [ -x /usr/bin/ocamlopt ] -+then -+ CAMLP4_TARGET=all -+else -+ CAMLP4_TARGET=default -+fi - (cd camlp4-4.05-2 && sed -i '/+camlp4/d' camlp4/META.in && \ - ./configure --bindir=$DESTDIR/usr/bin --libdir=$OCAMLPATH --pkgdir=$OCAMLPATH && \ -- make all && make install install-META) -+ make $CAMLP4_TARGET && make install install-META) - (cd lwt_camlp4-2018-03-25 && jbuilder build @install && jbuilder install) - (cd type_conv-113.00.02 && ./configure --prefix $DESTDIR && make && make install) - (cd obus-1.1.7 && diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 0e476d06..00000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -mips.patch -lwt-mips.patch diff --git a/debian/rules b/debian/rules index 9815ba34..fc323ac9 100755 --- a/debian/rules +++ b/debian/rules @@ -14,12 +14,11 @@ build-indep: build-arch: build-stamp VENDOR := /tmp/0install-build-vendor -OCAMLPATH := $(VENDOR)/usr/lib/ocaml -PATH := $(VENDOR)/usr/bin:$(PATH) +OCAMLPATH := $(VENDOR)/lib build-stamp: dh_testdir - (cd vendor && ./fix-debian.sh) && rm -rf vendor + mv vendor/lwt_glib-1.1.1 . && dune build @lwt_glib-1.1.1/install && dune install --prefix=$(VENDOR) lwt_glib && rm -rf lwt_glib-1.1.1 if [ -x /usr/bin/ocamlopt ]; then \ make OCAMLPATH=$(OCAMLPATH) TYPE=native; \ else \ diff --git a/docker-template/Dockerfile b/docker-template/Dockerfile index 00e14df0..4a6d54a6 100644 --- a/docker-template/Dockerfile +++ b/docker-template/Dockerfile @@ -1,5 +1,4 @@ FROM debian:sid -RUN apt-get update # Core build tools @@ -33,7 +32,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y xdg-utils python-gobject-2 ocaml-native-compilers # merge-me -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y unzip ocamlbuild --no-install-recommends +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y unzip ocamlbuild libppxlib-ocaml-dev liblwt-log-ocaml-dev menhir --no-install-recommends RUN useradd -U -u 1000 -m tal diff --git a/makedeb.debian b/makedeb.debian index b6bf6f47..c6bc69ad 100755 --- a/makedeb.debian +++ b/makedeb.debian @@ -14,32 +14,29 @@ OLD_DEB_VERSION="2.14.1-1" VERSION="$1" DEBIANVERSION=`echo $VERSION | sed 's/-/~/g'` -DEBIANMOD="-3" -TMP_TAR="/home/tal/Out/zero-install/0install/$VERSION/0install-$VERSION.tar.bz2" +DEBIANMOD="-1" +#TMP_TAR="/home/tal/Out/zero-install/0install/$VERSION/0install-$VERSION.tar.bz2" +TMP_TAR="/home/tal/Out/zero-install/0install/$VERSION/0install-$VERSION-debian.tar.bz2" if [ ! -e "$TMP_TAR" ]; then echo Missing: $TMP_TAR exit 1 fi -TMP_TAR=/DISABLED -orig="zeroinstall-injector_$DEBIANVERSION.orig.tar.gz" +orig="zeroinstall-injector_$DEBIANVERSION.orig.tar.bz2" BUILD_DIR="build-$VERSION$DEBIANMOD" if true; then rm -rf "$BUILD_DIR" mkdir -p "$BUILD_DIR" - #echo "Copying $TMP_TAR as $BUILD_DIR/$orig..." + echo "Copying $TMP_TAR as $BUILD_DIR/$orig..." - #cp "$TMP_TAR" "$BUILD_DIR/$orig" - #cp "$TMP_TAR".sig "$BUILD_DIR/$orig".asc + cp "$TMP_TAR" "$BUILD_DIR/$orig" + cp "$TMP_TAR".sig "$BUILD_DIR/$orig".asc cd "$BUILD_DIR" - cp ../$orig . - cp ../$orig.asc . tar xf "$orig" - mv 0install-debian-fix-debian-4.05 0install-$DEBIANVERSION cp -r ../debian 0install-$DEBIANVERSION/ cd .. @@ -77,11 +74,11 @@ if [ "$BINARY" = "y" ]; then cp test-script $BUILD_DIR mkdir $BUILD_DIR/gnupg - docker run --rm -u tal -it -u root -v `pwd`/$BUILD_DIR:/mnt talex5/deb-builder ./test-script + docker run --rm -it -u root -v `pwd`/$BUILD_DIR:/mnt talex5/deb-builder ./test-script DEB=$BUILD_DIR/0install-core_${DEBIANVERSION}${DEBIANMOD}_amd64.deb - echo "OK! Hint:" - echo docker run --rm -u tal -v `pwd`:/mnt -v `pwd`/gnupg:/mnt/gnupg -it -w /mnt/$BUILD_DIR talex5/deb-builder dput "$CHANGES" + #echo "OK! Now do a source build." + #echo docker run --rm -u tal -v `pwd`:/mnt -v `pwd`/gnupg:/mnt/gnupg -it -w /mnt/$BUILD_DIR talex5/deb-builder dput "$CHANGES" else # sudo pbuilder --create sid --debootstrapopts --variant=buildd --removepackages tzdata #echo "Updating pbuilder"