nix files update + docs update
This commit is contained in:
parent
fc283e6531
commit
a268f2730f
|
@ -38,7 +38,7 @@ test -d /dev/browser || {
|
||||||
}
|
}
|
||||||
|
|
||||||
setup_overlayfs(){
|
setup_overlayfs(){
|
||||||
test -f /mnt/overlayfs.zip && unzip /mnt/overlayfs.zip -d /
|
test -f /mnt/overlayfs.zip && ziprun /mnt/overlayfs.zip
|
||||||
}
|
}
|
||||||
|
|
||||||
setup_incoming_cmds(){
|
setup_incoming_cmds(){
|
||||||
|
|
|
@ -1,12 +1,13 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
source /etc/profile.sh # expose xrsh cmds like require etc
|
source /etc/profile.sh # expose xrsh cmds like require etc
|
||||||
|
|
||||||
if [[ "$1" =~ pos=|t= ]] then
|
if [[ "$1" =~ "pos=|t=" ]]; then
|
||||||
# we are dealing with XR or Media Fragments
|
# we are dealing with XR or Media Fragments (ignore for now)
|
||||||
exit # ignore for now
|
echo "[x] detected Media/XR Fragment in URI: $1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# otherwise execute
|
# otherwise execute
|
||||||
echo "" # clear line
|
echo "" # clear line
|
||||||
$* # simply execute
|
$* # simply execute
|
||||||
echo "$*" >> /tmp/frag.log
|
echo "$*" >> /tmp/frag.log
|
||||||
|
|
||||||
|
|
Binary file not shown.
8
edit.sh
8
edit.sh
|
@ -1,11 +1,15 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -e
|
set -e
|
||||||
make BR2_EXTERNAL=/buildroot-v86 v86_defconfig
|
export BR2_EXTERNAL=/buildroot-v86
|
||||||
|
export BR2_PACKAGE_BUSYBOX_CONFIG=/buildroot-v86/configs/busybox.config
|
||||||
|
make v86_defconfig
|
||||||
|
|
||||||
make menuconfig
|
make menuconfig
|
||||||
make busybox-menuconfig
|
make busybox-menuconfig
|
||||||
make linux-menuconfig
|
make linux-menuconfig
|
||||||
make savedefconfig
|
make savedefconfig # /buildroot-v86/configs/v86_defconfig
|
||||||
make linux-savedefconfig
|
make linux-savedefconfig
|
||||||
|
make linux-update-defconfig # /buildroot-v86/configs/linux.config
|
||||||
|
make busybox-update-defconfig # /buildroot-v86/configs/linux.config
|
||||||
|
|
||||||
make
|
make
|
||||||
|
|
|
@ -14,7 +14,7 @@ hello: ELF 32-bit LSB executable, Intel 80386, version 1 (SYSV), statically link
|
||||||
# building a nixos pkg
|
# building a nixos pkg
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
$ nix-build '<nixpkgs>' --pure -I nixpkgs=channel:nixos-24.05 -A pkgsCross.$ARCH.pkgsStatic.hello
|
$ nix-build '<nixpkgs>' --pure -I nixpkgs=channel:nixos-24.05 -A pkgsCross.musl32.pkgsStatic.hello
|
||||||
$ file hello
|
$ file hello
|
||||||
hello: ELF 32-bit LSB executable, Intel 80386, version 1 (SYSV), statically linked, not stripped
|
hello: ELF 32-bit LSB executable, Intel 80386, version 1 (SYSV), statically linked, not stripped
|
||||||
```
|
```
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
#test -n "$ARCH" || ARCH=i686-embedded
|
#test -n "$ARCH" || ARCH=i686-embedded
|
||||||
test -n "$ARCH" || ARCH=musl32
|
test -n "$ARCH" || ARCH=musl32
|
||||||
test -n "$CHANNEL" || CHANNEL=nixos-24.05
|
test -n "$CHANNEL" || CHANNEL=nixos-24.05
|
||||||
test -n "$1" || { echo "usage: [ARCH=...] [CHANNEL=...] build_nixpkg.sh <packagename>"; exit 0; }
|
test -n "$1" || { echo "usage: [ARCH=...] [CHANNEL=...] build_nixpkg.sh <packagename> [outfile]"; exit 0; }
|
||||||
set -x
|
set -xe
|
||||||
nix-build '<nixpkgs>' --pure -I nixpkgs=channel:$CHANNEL -A pkgsCross.$ARCH.pkgsStatic.$1
|
nix-build '<nixpkgs>' --pure -I nixpkgs=channel:$CHANNEL -A pkgsCross.$ARCH.pkgsStatic.$1
|
||||||
|
test -n "$2" && cp result/bin/$1 $2
|
||||||
|
|
|
@ -5,8 +5,8 @@ in
|
||||||
|
|
||||||
# callPackage is needed due to https://github.com/NixOS/nixpkgs/pull/126844
|
# callPackage is needed due to https://github.com/NixOS/nixpkgs/pull/126844
|
||||||
pkgs.pkgsStatic.callPackage ({ mkShell, fuse, pkg-config, file }: mkShell {
|
pkgs.pkgsStatic.callPackage ({ mkShell, fuse, pkg-config, file }: mkShell {
|
||||||
# these tools run on the build platform, but are configured to target the host platform
|
## these tools run on the build platform, but are configured to target the host platform
|
||||||
nativeBuildInputs = [ pkg-config file ];
|
#nativeBuildInputs = [ pkg-config file ];
|
||||||
# libraries needed for the host platform
|
## libraries needed for the host platform
|
||||||
buildInputs = [ fuse ];
|
#buildInputs = [ fuse ];
|
||||||
}) {}
|
}) {}
|
||||||
|
|
Loading…
Reference in New Issue