Add limine
This commit is contained in:
2 files changed
+33
-3
No files matched your search
@@ -53,9 +53,11 @@ if [ -d "/omarchy-pkgs" ]; then
|
||||
cp "$OMARCHY_SETTINGS_PKG" "$offline_mirror_dir/"
|
||||
cp "$OMARCHY_INSTALLER_PKG" "$offline_mirror_dir/"
|
||||
cp "$OMARCHY_PKG" "$offline_mirror_dir/"
|
||||
cp "$OMARCHY_LIMINE_PKG" "$offline_mirror_dir/"
|
||||
|
||||
echo "✓ omarchy-settings will be installed in ISO (configs, binaries)"
|
||||
echo "✓ omarchy-installer will be installed in ISO (install scripts, helpers)"
|
||||
echo "✓ omarchy-limine available in offline mirror for installation"
|
||||
echo "✓ All omarchy packages available in offline mirror for installation"
|
||||
echo "✓ No git clone needed - everything comes from packages!"
|
||||
else
|
||||
@@ -92,18 +94,18 @@ printf '%s\n' "${arch_packages[@]}" >>"$build_cache_dir/packages.x86_64"
|
||||
|
||||
# Build list of all the packages needed for the offline mirror
|
||||
# Start with packages.x86_64 but exclude locally-built packages
|
||||
all_packages=($(cat "$build_cache_dir/packages.x86_64" | grep -vE '^(omarchy|omarchy-settings|omarchy-installer)$'))
|
||||
all_packages=($(cat "$build_cache_dir/packages.x86_64" | grep -vE '^(omarchy|omarchy-settings|omarchy-installer|omarchy-limine)$'))
|
||||
|
||||
# Add omarchy package lists from source, excluding locally-built packages
|
||||
if [ -n "$OMARCHY_INSTALLER_SRC" ] && [ -d "$OMARCHY_INSTALLER_SRC" ]; then
|
||||
# Filter out locally-built packages and known problematic packages
|
||||
all_packages+=($(grep -v '^#' "$OMARCHY_INSTALLER_SRC/install/omarchy-base.packages" | grep -v '^$' | grep -vE '^(omarchy|omarchy-settings|omarchy-installer)$'))
|
||||
all_packages+=($(grep -v '^#' "$OMARCHY_INSTALLER_SRC/install/omarchy-base.packages" | grep -v '^$' | grep -vE '^(omarchy|omarchy-settings|omarchy-installer|omarchy-limine)$'))
|
||||
all_packages+=($(grep -v '^#' "$OMARCHY_INSTALLER_SRC/install/omarchy-other.packages" | grep -v '^$' | grep -vE '^qt5-remoteobjects$'))
|
||||
else
|
||||
echo "WARNING: Could not find omarchy package lists, offline mirror may be incomplete"
|
||||
fi
|
||||
|
||||
all_packages+=($(grep -v '^#' /builder/archinstall.packages | grep -v '^$' | grep -vE '^(omarchy|omarchy-settings|omarchy-installer)$'))
|
||||
all_packages+=($(grep -v '^#' /builder/archinstall.packages | grep -v '^$' | grep -vE '^(omarchy|omarchy-settings|omarchy-installer|omarchy-limine)$'))
|
||||
|
||||
# Remove duplicates
|
||||
all_packages=($(printf '%s\n' "${all_packages[@]}" | sort -u))
|
||||
|
||||
@@ -186,6 +186,34 @@ fi
|
||||
echo "✓ Successfully built: $(basename $OMARCHY_PKG)"
|
||||
echo "Package location: $OMARCHY_PKG"
|
||||
|
||||
# Now build the omarchy-limine package
|
||||
echo ""
|
||||
echo "========================================="
|
||||
echo "Building omarchy-limine package"
|
||||
echo "========================================="
|
||||
|
||||
# Copy omarchy-limine package files to writable location
|
||||
cp -r /omarchy-pkgs/pkgbuilds/omarchy-limine "$WORK_DIR/"
|
||||
cd "$WORK_DIR/omarchy-limine"
|
||||
|
||||
# Give builder ownership
|
||||
chown -R builder:builder "$WORK_DIR/omarchy-limine"
|
||||
|
||||
# Build the omarchy-limine package (no source needed, just config files)
|
||||
su builder -c "cd $WORK_DIR/omarchy-limine && makepkg --noconfirm --skippgpcheck -d"
|
||||
|
||||
# Find the built package
|
||||
OMARCHY_LIMINE_PKG=$(ls -t "$BUILD_DIR"/omarchy-limine-*.pkg.tar.zst 2>/dev/null | head -n1)
|
||||
|
||||
if [ -z "$OMARCHY_LIMINE_PKG" ]; then
|
||||
echo "ERROR: Failed to build omarchy-limine package"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "✓ Successfully built: $(basename $OMARCHY_LIMINE_PKG)"
|
||||
echo "Package location: $OMARCHY_LIMINE_PKG"
|
||||
|
||||
# Export for use by build-iso.sh
|
||||
export OMARCHY_PKG="$OMARCHY_PKG"
|
||||
export OMARCHY_INSTALLER_PKG="$OMARCHY_INSTALLER_PKG"
|
||||
export OMARCHY_LIMINE_PKG="$OMARCHY_LIMINE_PKG"
|
||||
Reference in new issue
Block a user