Fierelier/windvn
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Various fixes for the previous commit

Browse Source
This commit is contained in:
Fierelier 2022-05-23 07:24:47 +02:00
parent cabb7fee92
commit 27bff76662
8 changed files with 57 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
input/grub/modscript Executable file
View File

@ -0,0 +1,2 @@
#!/usr/bin/env bash
export OPUS_PACKAGES="$OPUS_PACKAGES grub2"

0
input/raw-disk/data/isRawImage → input/image-raw/data/isRawImage
View File

0
input/raw-disk/data/setupdisk → input/image-raw/data/setupdisk
View File

2
input/mandb-disable/data/chroot Executable file
View File

@ -0,0 +1,2 @@
#!/usr/bin/env bash
dpkg-divert --divert /usr/bin/mandb /usr/bin/mandb.bak

1
input/mandb-disable/data/etc/dpkg/99-opus-no_mandb
View File

@ -1 +0,0 @@
path-exclude=/usr/bin/mandb

2
input/oobe/modscript
View File

@ -1,3 +1,3 @@
#!/usr/bin/env bash #!/usr/bin/env bash
export OPUS_PACKAGES="$OPUS_PACKAGES keyboard-configuration network-manager python3" export OPUS_PACKAGES="$OPUS_PACKAGES sudo keyboard-configuration network-manager python3"
export OPUS_PACKAGES_DL="$OPUS_PACKAGES console-setup locales tzdata" export OPUS_PACKAGES_DL="$OPUS_PACKAGES console-setup locales tzdata"

35
make-os
View File

@ -8,46 +8,45 @@ if
cd "$(dirname "$(realpath -s "$BASH_SOURCE")")" cd "$(dirname "$(realpath -s "$BASH_SOURCE")")"
source shell source shell
source "env-$1" source "env-$1"
make-base "$OPUS_OUTPUT/$1" # Base image #export OPUS_IMAGEDIR="/media/zram/$1"
export OPUS_IMAGEDIR="$OPUS_OUTPUT/$1"
make-base "$OPUS_IMAGEDIR" # Base image
export OPUS_PACKAGES="" export OPUS_PACKAGES=""
export OPUS_PACKAGES_DL="" export OPUS_PACKAGES_DL=""
export OPUS_PACKAGES_REMOVE="" export OPUS_PACKAGES_REMOVE=""
source apply-mod "$OPUS_HOME/mkinitramfs-disable" "$OPUS_OUTPUT/$1" source apply-mod "$OPUS_HOME/mandb-disable" "$OPUS_IMAGEDIR"
source apply-mod "$OPUS_HOME/mandb-disable" "$OPUS_OUTPUT/$1"
# Base # Base
source apply-mod "$OPUS_HOME/input/sources" "$OPUS_OUTPUT/$1" source apply-mod "$OPUS_HOME/input/sources" "$OPUS_IMAGEDIR"
source apply-mod "$OPUS_HOME/input/oobe" "$OPUS_OUTPUT/$1" source apply-mod "$OPUS_HOME/input/oobe" "$OPUS_IMAGEDIR"
# Base - Hardware # Base - Hardware
source apply-mod "$OPUS_HOME/input/kernel" "$OPUS_OUTPUT/$1" source apply-mod "$OPUS_HOME/input/kernel" "$OPUS_IMAGEDIR"
source apply-mod "$OPUS_HOME/input/firmware-free" "$OPUS_OUTPUT/$1" source apply-mod "$OPUS_HOME/input/firmware-free" "$OPUS_IMAGEDIR"
source apply-mod "$OPUS_HOME/input/grub" "$OPUS_IMAGEDIR"
# Graphical # Graphical
source apply-mod "$OPUS_HOME/input/packages-graphical" "$OPUS_OUTPUT/$1" source apply-mod "$OPUS_HOME/input/packages-graphical" "$OPUS_IMAGEDIR"
# Overrides # Overrides
source apply-mod "$OPUS_HOME/input/hostname" "$OPUS_OUTPUT/$1" source apply-mod "$OPUS_HOME/input/hostname" "$OPUS_IMAGEDIR"
source apply-mod "$OPUS_HOME/input/user-config" "$OPUS_OUTPUT/$1" source apply-mod "$OPUS_HOME/input/user-config" "$OPUS_IMAGEDIR"
# Extra - hardware
source apply-mod "$OPUS_HOME/enable-mkinitramfs" "$OPUS_OUTPUT/$1"
# Raw image # Raw image
source apply-mod "$OPUS_HOME/input/raw-disk" "$OPUS_OUTPUT/$1" source apply-mod "$OPUS_HOME/input/image-raw" "$OPUS_IMAGEDIR"
# Packages # Packages
source apply-mod "$OPUS_HOME/input/packages-apply" "$OPUS_OUTPUT/$1" source apply-mod "$OPUS_HOME/input/packages-apply" "$OPUS_IMAGEDIR"
make-image "$OPUS_OUTPUT/$1" "$OPUS_OUTPUT/${OPUS_NAME}-${OPUS_DIST}-${OPUS_ARCH}_$(date "+%Y.%m.%d-%H.%M.%S").img" # Disk image make-image "$OPUS_IMAGEDIR" "$OPUS_OUTPUT/${OPUS_NAME}-${OPUS_DIST}-${OPUS_ARCH}_$(date "+%Y.%m.%d-%H.%M.%S").img" # Disk image
then then
set +e set +e
else else
set +e set +e
echo echo
echo Script execution ended due to error. Cleaning up... echo Script execution ended due to error. Cleaning up...
fchroot-end "$OPUS_OUTPUT/$1" fchroot-end "$OPUS_IMAGEDIR"
rm -r "$OPUS_OUTPUT/$1" rm -r "$OPUS_IMAGEDIR"
echo Script execution ended due to error. echo Script execution ended due to error.
fi fi

45
make-os-proprietary
View File

@ -8,21 +8,46 @@ if
cd "$(dirname "$(realpath -s "$BASH_SOURCE")")" cd "$(dirname "$(realpath -s "$BASH_SOURCE")")"
source shell source shell
source "env-$1" source "env-$1"
source "env-proprietary" #export OPUS_IMAGEDIR="/media/zram/$1"
make-base "$OPUS_OUTPUT/$1" # Base image export OPUS_IMAGEDIR="$OPUS_OUTPUT/$1"
apply-stage "$OPUS_HOME/input/stage01" "$OPUS_OUTPUT/$1" # Packages (non-graphical) make-base "$OPUS_IMAGEDIR" # Base image
apply-stage "$OPUS_HOME/input/stage49" "$OPUS_OUTPUT/$1" # Packages (proprietary firmware) export OPUS_PACKAGES=""
apply-stage "$OPUS_HOME/input/stage50" "$OPUS_OUTPUT/$1" # Packages (graphical) export OPUS_PACKAGES_DL=""
apply-stage "$OPUS_HOME/input/stage98" "$OPUS_OUTPUT/$1" # Default configs, etc. export OPUS_PACKAGES_REMOVE=""
apply-stage "$OPUS_HOME/input/stage99" "$OPUS_OUTPUT/$1" # Disk image preparation
make-image "$OPUS_OUTPUT/$1" "$OPUS_OUTPUT/${OPUS_NAME}-${OPUS_DIST}-${OPUS_ARCH}_$(date "+%Y.%m.%d-%H.%M.%S").img" # Disk image source apply-mod "$OPUS_HOME/mandb-disable" "$OPUS_IMAGEDIR"
# Base
source apply-mod "$OPUS_HOME/input/sources" "$OPUS_IMAGEDIR"
source apply-mod "$OPUS_HOME/input/oobe" "$OPUS_IMAGEDIR"
# Base - Hardware
source apply-mod "$OPUS_HOME/input/kernel" "$OPUS_IMAGEDIR"
source apply-mod "$OPUS_HOME/input/firmware-free" "$OPUS_IMAGEDIR"
source apply-mod "$OPUS_HOME/input/firmware-proprietary" "$OPUS_IMAGEDIR"
source apply-mod "$OPUS_HOME/input/grub" "$OPUS_IMAGEDIR"
# Graphical
source apply-mod "$OPUS_HOME/input/packages-graphical" "$OPUS_IMAGEDIR"
# Overrides
source apply-mod "$OPUS_HOME/input/hostname" "$OPUS_IMAGEDIR"
source apply-mod "$OPUS_HOME/input/user-config" "$OPUS_IMAGEDIR"
# Raw image
source apply-mod "$OPUS_HOME/input/image-raw" "$OPUS_IMAGEDIR"
# Packages
source apply-mod "$OPUS_HOME/input/packages-apply" "$OPUS_IMAGEDIR"
make-image "$OPUS_IMAGEDIR" "$OPUS_OUTPUT/${OPUS_NAME}-${OPUS_DIST}-${OPUS_ARCH}_$(date "+%Y.%m.%d-%H.%M.%S").img" # Disk image
then then
set +e set +e
else else
set +e set +e
echo echo
echo Script execution ended due to error. Cleaning up... echo Script execution ended due to error. Cleaning up...
fchroot-end "$OPUS_OUTPUT/$1" fchroot-end "$OPUS_IMAGEDIR"
rm -r "$OPUS_OUTPUT/$1" rm -r "$OPUS_IMAGEDIR"
echo Script execution ended due to error. echo Script execution ended due to error.
fi fi