Skip to content
Snippets Groups Projects
Commit fa389690 authored by Jeremy Soller's avatar Jeremy Soller Committed by GitHub
Browse files

Merge pull request #9 from ids1024/pkgutils

Use "pkg create" and generate package metadata file
parents 3be88e16 a0928148
No related branches found
No related tags found
No related merge requests found
...@@ -2,3 +2,6 @@ ...@@ -2,3 +2,6 @@
path = libc-artifacts path = libc-artifacts
url = https://github.com/redox-os/libc-artifacts.git url = https://github.com/redox-os/libc-artifacts.git
branch = master branch = master
[submodule "pkgutils"]
path = pkgutils
url = https://github.com/redox-os/pkgutils.git
...@@ -195,12 +195,14 @@ function op { ...@@ -195,12 +195,14 @@ function op {
rm -rfv stage rm -rfv stage
;; ;;
tar) tar)
pushd stage > /dev/null mkdir -p stage/etc/pkg.d
tar cfv ../stage.tar . echo "name = \"$1\"" > "stage/etc/pkg.d/$1.toml"
popd > /dev/null echo "version = \"$(op $1 version)\"" >> "stage/etc/pkg.d/$1.toml"
echo "target = \"$TARGET\"" >> "stage/etc/pkg.d/$1.toml"
$ROOT/pkgutils/target/release/pkg create stage
;; ;;
untar) untar)
rm -rfv stage.tar rm -rfv stage.tar stage.sig
;; ;;
publish) publish)
mkdir -p "$REPO" mkdir -p "$REPO"
......
Subproject commit 4cf2e9d216721282a8f2bb82c031ee90ede878f4
...@@ -4,6 +4,9 @@ set -e ...@@ -4,6 +4,9 @@ set -e
echo "Downloading latest libc-artifacts" echo "Downloading latest libc-artifacts"
git submodule update --init --remote libc-artifacts git submodule update --init --remote libc-artifacts
echo "Downloading latest pkgutils"
git submodule update --init --remote pkgutils
echo "Defaulting to rust nightly" echo "Defaulting to rust nightly"
rustup override set nightly rustup override set nightly
echo "Update rust nightly" echo "Update rust nightly"
...@@ -21,4 +24,10 @@ then ...@@ -21,4 +24,10 @@ then
cargo install -f xargo cargo install -f xargo
fi fi
echo "Building pkgutils"
pushd pkgutils
# TODO Change pkgutils to not hard code TARGET
TARGET=x86_64-unknown-redox cargo build --release
popd
echo "cook.sh is ready to use" echo "cook.sh is ready to use"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment