mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-06-22 12:54:20 +08:00
Merge pull request #9 from ids1024/pkgutils
Use "pkg create" and generate package metadata file
This commit is contained in:
commit
fa389690bb
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -2,3 +2,6 @@
|
||||
path = libc-artifacts
|
||||
url = https://github.com/redox-os/libc-artifacts.git
|
||||
branch = master
|
||||
[submodule "pkgutils"]
|
||||
path = pkgutils
|
||||
url = https://github.com/redox-os/pkgutils.git
|
||||
|
||||
10
cook.sh
10
cook.sh
@ -195,12 +195,14 @@ function op {
|
||||
rm -rfv stage
|
||||
;;
|
||||
tar)
|
||||
pushd stage > /dev/null
|
||||
tar cfv ../stage.tar .
|
||||
popd > /dev/null
|
||||
mkdir -p stage/etc/pkg.d
|
||||
echo "name = \"$1\"" > "stage/etc/pkg.d/$1.toml"
|
||||
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)
|
||||
rm -rfv stage.tar
|
||||
rm -rfv stage.tar stage.sig
|
||||
;;
|
||||
publish)
|
||||
mkdir -p "$REPO"
|
||||
|
||||
1
pkgutils
Submodule
1
pkgutils
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 4cf2e9d216721282a8f2bb82c031ee90ede878f4
|
||||
9
setup.sh
9
setup.sh
@ -4,6 +4,9 @@ set -e
|
||||
echo "Downloading latest libc-artifacts"
|
||||
git submodule update --init --remote libc-artifacts
|
||||
|
||||
echo "Downloading latest pkgutils"
|
||||
git submodule update --init --remote pkgutils
|
||||
|
||||
echo "Defaulting to rust nightly"
|
||||
rustup override set nightly
|
||||
echo "Update rust nightly"
|
||||
@ -21,4 +24,10 @@ then
|
||||
cargo install -f xargo
|
||||
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"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user