Commit 918e1fc4 authored by Michael Aaron Murphy's avatar Michael Aaron Murphy

Merge branch 'deb' into 'master'

Update debian packaging

See merge request redox-os/ion!892
parents 32319d7b 934e9a00
......@@ -5,6 +5,10 @@ DEBUG ?= 0
VENDORED = 0
REDOX ?= 0
GIT_REVISION=git_revision.txt
SRC=Cargo.toml src/* src/*/* members/* members/*/*
VENDOR=.cargo/config vendor.tar.xz
ifeq (0,$(DEBUG))
ARGS += --release
RELEASE = release
......@@ -21,7 +25,11 @@ endif
.PHONY: all clean distclean install uninstall
all: version extract .cargo/config
all: $(SRC) $(GIT_REVISION)
ifeq (1,$(REDOX))
mkdir -p .cargo
grep redox .cargo/config || cat redox_linker >> .cargo/config
endif
cargo build $(ARGS) $(ARGSV)
clean:
......@@ -43,33 +51,19 @@ install:
uninstall:
rm $(DESTDIR)/$(BINARY)
.cargo/config:
mkdir -p .cargo
echo $(wildcard vendor.tar.xz)
if [ "$(wildcard vendor.tar.xz)" != "" ]; then \
cp vendor_config $@; \
else \
cp nonvendor_config $@; \
fi
vendor.tar.xz:
cargo vendor
tar pcfJ vendor.tar.xz vendor
rm -rf vendor
vendor: $(VENDOR)
vendor: vendor.tar.xz .cargo/config
version: $(GIT_REVISION)
extract:
ifneq ($(wildcard vendor.tar.xz),)
ifneq (1,$(REDOX))
tar pxf vendor.tar.xz
endif
endif
version:
ifeq ($(wildcard git_revision.txt),)
$(GIT_REVISION):
git rev-parse master > git_revision.txt
endif
$(VENDOR):
mkdir -p .cargo
cargo vendor | head -n -1 > .cargo/config
echo 'directory = "vendor"' >> .cargo/config
tar pcfJ vendor.tar.xz vendor
rm -rf vendor
update-shells:
if ! grep ion /etc/shells >/dev/null; then \
......
ion-shell (1.0.0-alpha0-cosmic2) cosmic; urgency=medium
ion-shell (1:1.0.0-alpha1~cosmic0) cosmic; urgency=medium
* Upstream updates
-- Michael Aaron Murphy <michael@system76.com> Wed, 23 Jan 2019 22:54:59 -0700
ion-shell (1.0.0-alpha1~cosmic0) cosmic; urgency=medium
* Add postinst script for setting the shell.
......
......@@ -4,13 +4,14 @@
dh $@
override_dh_auto_clean:
cat git_revision.txt || echo git_revision.txt not found
make clean
make vendor
make version
if ! ischroot; then \
make vendor; \
fi
override_dh_auto_build:
cat .cargo/config
tar pxf vendor.tar.xz
make all
override_dh_auto_install:
......
[target.x86_64-unknown-redox]
linker = "x86_64-unknown-redox-gcc"
[source.crates-io]
replace-with = "vendored-sources"
[source."https://github.com/whitequark/rust-xdg"]
git = "https://github.com/whitequark/rust-xdg"
branch = "master"
replace-with = "vendored-sources"
[source."https://gitlab.redox-os.org/redox-os/liner"]
git = "https://gitlab.redox-os.org/redox-os/liner"
branch = "master"
replace-with = "vendored-sources"
[source."https://gitlab.redox-os.org/redox-os/small"]
git = "https://gitlab.redox-os.org/redox-os/small"
branch = "master"
replace-with = "vendored-sources"
[source."https://gitlab.redox-os.org/redox-os/syscall.git"]
git = "https://gitlab.redox-os.org/redox-os/syscall.git"
branch = "relibc"
replace-with = "vendored-sources"
[source."https://gitlab.redox-os.org/redox-os/termion"]
git = "https://gitlab.redox-os.org/redox-os/termion"
branch = "master"
replace-with = "vendored-sources"
[source.vendored-sources]
directory = "vendor"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment