Compare commits

..

No commits in common. "28d09dff4969b8051d88176f197483580452d637" and "2ecd6ac473d4c2a8a02ab8525ff3a74b5febffab" have entirely different histories.

7 changed files with 5 additions and 19 deletions

@ -1 +1 @@
Subproject commit 1e636820814db1704034a0945ba177d87690225a Subproject commit d553dbc09dafa31579741608642dd2156c933934

View File

@ -9,8 +9,8 @@ prompt = false
[packages] [packages]
drivers = {} drivers = {}
init = {} init = {}
nulld = {}
#pciids = {} #pciids = {}
nulld = {}
ramfs = {} ramfs = {}
randd = {} randd = {}
redoxfs = {} redoxfs = {}

View File

@ -11,7 +11,6 @@ drivers = {}
init = {} init = {}
nulld = {} nulld = {}
#pciids = {} #pciids = {}
ramfs = {}
randd = {} randd = {}
redoxfs = {} redoxfs = {}
zerod = {} zerod = {}
@ -27,7 +26,6 @@ randd
vesad T T G vesad T T G
stdio display:1 stdio display:1
ps2d us ps2d us
ramfs logging
pcid /etc/pcid/initfs.toml pcid /etc/pcid/initfs.toml
redoxfs disk/live: file redoxfs disk/live: file
cd file: cd file:

View File

@ -11,7 +11,6 @@ drivers = {}
init = {} init = {}
nulld = {} nulld = {}
#pciids = {} #pciids = {}
ramfs = {}
randd = {} randd = {}
redoxfs = {} redoxfs = {}
zerod = {} zerod = {}
@ -27,7 +26,6 @@ randd
vesad T T G vesad T T G
stdio display:1 stdio display:1
ps2d us ps2d us
ramfs logging
pcid /etc/pcid/initfs.toml pcid /etc/pcid/initfs.toml
redoxfs disk/live: file redoxfs disk/live: file
cd file: cd file:

2
kernel

@ -1 +1 @@
Subproject commit 903390283066a988b74e86e3630106b12b4df806 Subproject commit cff858b45560b529d95c5e0ec93c2accb5a7876a

View File

@ -1,5 +1,3 @@
INITFS_RM_BINS=alxd e1000d ihdad ixgbed pcspkrd redoxfs-ar redoxfs-mkfs rtl8168d usbctl usbhidd usbscsid xhcid
build/initfs.tag: initfs.toml prefix build/initfs.tag: initfs.toml prefix
cargo build --manifest-path cookbook/Cargo.toml --release cargo build --manifest-path cookbook/Cargo.toml --release
cargo build --manifest-path installer/Cargo.toml --release cargo build --manifest-path installer/Cargo.toml --release
@ -8,7 +6,7 @@ build/initfs.tag: initfs.toml prefix
mkdir -p build/initfs mkdir -p build/initfs
$(INSTALLER) -c $< build/initfs/ $(INSTALLER) -c $< build/initfs/
#TODO: HACK FOR SMALLER INITFS, FIX IN PACKAGING #TODO: HACK FOR SMALLER INITFS, FIX IN PACKAGING
for bin in $(INITFS_RM_BINS); do \ for bin in alxd e1000d ihdad ixgbed pcspkrd redoxfs-ar redoxfs-mkfs rtl8168d usbctl usbhidd usbscsid xhcid; do \
rm -f build/initfs/bin/$$bin; \ rm -f build/initfs/bin/$$bin; \
done done
touch $@ touch $@
@ -20,10 +18,6 @@ build/initfs_coreboot.tag: initfs_coreboot.toml prefix
rm -rf build/initfs_coreboot rm -rf build/initfs_coreboot
mkdir -p build/initfs_coreboot mkdir -p build/initfs_coreboot
$(INSTALLER) -c $< build/initfs_coreboot/ $(INSTALLER) -c $< build/initfs_coreboot/
#TODO: HACK FOR SMALLER INITFS, FIX IN PACKAGING
for bin in $(INITFS_RM_BINS); do \
rm -f build/initfs_coreboot/bin/$$bin; \
done
touch $@ touch $@
build/initfs_live.tag: initfs_live.toml prefix build/initfs_live.tag: initfs_live.toml prefix
@ -33,8 +27,4 @@ build/initfs_live.tag: initfs_live.toml prefix
rm -rf build/initfs_live rm -rf build/initfs_live
mkdir -p build/initfs_live mkdir -p build/initfs_live
$(INSTALLER) -c $< build/initfs_live/ $(INSTALLER) -c $< build/initfs_live/
#TODO: HACK FOR SMALLER INITFS, FIX IN PACKAGING
for bin in $(INITFS_RM_BINS); do \
rm -f build/initfs_live/bin/$$bin; \
done
touch $@ touch $@

2
relibc

@ -1 +1 @@
Subproject commit 928b18b3062e4fe797d6dd548823e9e65fc2d508 Subproject commit 07ec3b6591878f23f3c4be80c26cbfc584abfe43