diff options
-rw-r--r-- | .SRCINFO | 24 | ||||
-rw-r--r-- | 01_no_githooks.patch | 31 | ||||
-rw-r--r-- | PKGBUILD | 41 | ||||
-rw-r--r-- | cockroach.default | 1 | ||||
-rw-r--r-- | cockroach.install | 9 | ||||
-rw-r--r-- | cockroach.service | 16 | ||||
-rw-r--r-- | cockroach.sysusers | 3 |
7 files changed, 125 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..66ecdc0c2640 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,24 @@ +pkgbase = cockroach + pkgdesc = A scalable, survivable, strongly-consistent SQL database + pkgver = 19.1.1 + pkgrel = 1 + url = https://www.cockroachlabs.com + install = cockroach.install + arch = x86_64 + license = CCL + makedepends = go-pie + makedepends = cmake + backup = etc/default/cockroach + source = cockroach-19.1.1.tar.gz::https://binaries.cockroachdb.com/cockroach-v19.1.1.src.tgz + source = cockroach.service + source = cockroach.default + source = cockroach.sysusers + source = 01_no_githooks.patch + md5sums = 71a0e1f88aa2d5a528d7d7046c9eebda + md5sums = 2eadebb6eb17e584ecdc469411cd53e8 + md5sums = 15e9d2cd9ef82ca26b56179859e2a6af + md5sums = c4d4dcb51ce92cb03bc46c04a8151c20 + md5sums = 2ec5af308106c99eeadfa6f69ffedaa8 + +pkgname = cockroach + diff --git a/01_no_githooks.patch b/01_no_githooks.patch new file mode 100644 index 000000000000..ef6418042610 --- /dev/null +++ b/01_no_githooks.patch @@ -0,0 +1,31 @@ +diff --git a/src/github.com/cockroachdb/cockroach/Makefile b/src/github.com/cockroachdb/cockroach/Makefile +index f988916..5d0bf8d 100644 +--- a/src/github.com/cockroachdb/cockroach/Makefile ++++ b/src/github.com/cockroachdb/cockroach/Makefile +@@ -253,18 +253,18 @@ $(foreach v,$(filter-out $(strip $(VALID_VARS)),$(.VARIABLES)),\ + .ALWAYS_REBUILD: + .PHONY: .ALWAYS_REBUILD + +-ifneq ($(GIT_DIR),) ++#ifneq ($(GIT_DIR),) + # If we're in a git worktree, the git hooks directory may not be in our root, + # so we ask git for the location. + # + # Note that `git rev-parse --git-path hooks` requires git 2.5+. +-GITHOOKS := $(subst githooks/,$(GITHOOKSDIR)/,$(wildcard githooks/*)) +-$(GITHOOKSDIR)/%: githooks/% +- @echo installing $< +- @rm -f $@ +- @mkdir -p $(dir $@) +- @ln -s ../../$(basename $<) $(dir $@) +-endif ++#GITHOOKS := $(subst githooks/,$(GITHOOKSDIR)/,$(wildcard githooks/*)) ++#$(GITHOOKSDIR)/%: githooks/% ++# @echo installing $< ++# @rm -f $@ ++# @mkdir -p $(dir $@) ++# @ln -s ../../$(basename $<) $(dir $@) ++#endif + + .SECONDARY: pkg/ui/yarn.installed + pkg/ui/yarn.installed: pkg/ui/package.json pkg/ui/yarn.lock pkg/ui/yarn.protobufjs-cli.lock | bin/.submodules-initialized diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..8e5b54445953 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,41 @@ +# Maintainer: Joe Holden <jwh@zorins.us> + +pkgname=cockroach +pkgver=19.1.1 +pkgrel=1 +pkgdesc="A scalable, survivable, strongly-consistent SQL database" +arch=('x86_64') +url="https://www.cockroachlabs.com" +license=('CCL') +makedepends=('go-pie' 'cmake') +source=("${pkgname}-${pkgver}.tar.gz::https://binaries.cockroachdb.com/cockroach-v${pkgver}.src.tgz" + "${pkgname}.service" + "${pkgname}.default" + "${pkgname}.sysusers" + "01_no_githooks.patch") +install="${pkgname}.install" +backup=("etc/default/${pkgname}") + +prepare() { + patch -p1 -N -d ${srcdir}/${pkgname}-v${pkgver} -i ${srcdir}/01_no_githooks.patch +} + +build() { + cd ${srcdir}/${pkgname}-v${pkgver} + make -j$(nproc) buildoss +} + +package() { + install -Dm644 "${srcdir}/${pkgname}.default" "${pkgdir}/etc/default/${pkgname}" + + install -Dm644 "${srcdir}/${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service" + install -Dm644 "${srcdir}/${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf" + + install -Dm750 ${srcdir}/cockroach-v${pkgver}/src/github.com/cockroachdb/cockroach/cockroachoss ${pkgdir}/usr/bin/${pkgname} +} +md5sums=('71a0e1f88aa2d5a528d7d7046c9eebda' + '2eadebb6eb17e584ecdc469411cd53e8' + '15e9d2cd9ef82ca26b56179859e2a6af' + 'c4d4dcb51ce92cb03bc46c04a8151c20' + '2ec5af308106c99eeadfa6f69ffedaa8') + diff --git a/cockroach.default b/cockroach.default new file mode 100644 index 000000000000..4274b419690b --- /dev/null +++ b/cockroach.default @@ -0,0 +1 @@ +CONSUL_FLAGS="" diff --git a/cockroach.install b/cockroach.install new file mode 100644 index 000000000000..149ee47de780 --- /dev/null +++ b/cockroach.install @@ -0,0 +1,9 @@ +post_upgrade() { + # improved permissions since 0.9.3-1 + if [ "$(vercmp "$2" "0.9.3")" -lt 0 ]; then + chown 0:208 /etc/consul.d + chmod 0750 /etc/consul.d + echo -en "----\nThe directory permissions for /etc/consul.d/ have been fixed.\n----\n" + fi + true +} diff --git a/cockroach.service b/cockroach.service new file mode 100644 index 000000000000..f6a2b404c0ba --- /dev/null +++ b/cockroach.service @@ -0,0 +1,16 @@ +[Unit] +Description=Consul Agent +Requires=network-online.target +After=network-online.target + +[Service] +User=consul +Group=consul +EnvironmentFile=-/etc/default/consul +Restart=on-failure +ExecStart=/usr/bin/consul agent $CONSUL_FLAGS -config-dir=/etc/consul.d +ExecReload=/usr/bin/kill -HUP $MAINPID +KillSignal=SIGINT + +[Install] +WantedBy=multi-user.target diff --git a/cockroach.sysusers b/cockroach.sysusers new file mode 100644 index 000000000000..963503e7409c --- /dev/null +++ b/cockroach.sysusers @@ -0,0 +1,3 @@ +u cockroach - - /var/lib/cockroach +g cockroach - - +m cockroach cockroach |