diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..d394f1c --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "upstream"] + path = upstream + url = https://github.com/junegunn/fzf.git diff --git a/Dockerfile.builder b/Dockerfile.builder index 22f371c..38502e3 100644 --- a/Dockerfile.builder +++ b/Dockerfile.builder @@ -3,4 +3,4 @@ FROM ubuntu:24.04 RUN apt-get update && \ apt-get install -y curl \ make \ - # other packages to build \ + golang diff --git a/Makefile b/Makefile index 55cb353..5536969 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,13 @@ -package = mypackage.deb +package = fzf-main.deb .PHONY: compile compile: - cd upstream && echo compile + cd upstream && make .PHONY: dpkg dpkg: mkdir -p deb-package/usr/bin/ - cp upstream/bin deb-package/usr/bin/ + cp upstream/target/fzf-linux_amd64 deb-package/usr/bin/fzf chmod -R o-w deb-package/ sed -i "s|%date%|`date +%Y%m%d%H%M%S`|g" deb-package/DEBIAN/control dpkg-deb --build deb-package/ $(package) diff --git a/README.md b/README.md index fb5f849..d52893c 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,15 @@ -# Template for external project package building +# Unofficial dpkg fzf build from main branch -- git submodule add upstream -- Makefile: change package name & compile / dpkg target instructions -- Dockerfile.builder: required deb packages / base image -- deb-package/DEBIAN/control: Package name, depends, conflict & description +fzf is a command-line fuzzy finder: -## Use template +- -When using this template check Git content, Issue labels & Branch protection +All credit to junegunn and other contributors of this useful project! -![Template use form showing checked items](assets/use_template.png) +This repo provide semi-automatic build of main branch to ubuntu 24.04 (noble) +dpkg package: + + + +License file in this repo only apply to build & packaging step files, fzf is +licensed as MIT, see upstream project for details. diff --git a/deb-package/DEBIAN/control b/deb-package/DEBIAN/control index 9c38df5..760bda0 100644 --- a/deb-package/DEBIAN/control +++ b/deb-package/DEBIAN/control @@ -1,12 +1,12 @@ -Package: mypackage-main +Package: fzf-main Version: 0.0.1~git%date%-1 Section: base Priority: optional Architecture: amd64 Maintainer: pips -Homepage: https://example.com -Suggests: suggeted-packages -Depends: depends (>= X.Y.Z), packages (>= X.Y) -Conflicts: package-from-official-repo -Description: Description of mypackage - Auto packaging of mypackage following main dev branch +Homepage: https://forge.e5150.fr/ext/fzf +Depends: libc6 (>= 2.34) +Conflicts: fzf +Replaces: fzf +Description: fzf build from main + Auto packaging of fzf following main dev branch diff --git a/upstream b/upstream new file mode 160000 index 0000000..3401c2e --- /dev/null +++ b/upstream @@ -0,0 +1 @@ +Subproject commit 3401c2e0c7c441c2a13c11e958f6b99efc50bd29