system/iso
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated ISO kernel and busybox versions, added support for custom package extensions

Browse Source
This commit is contained in:
Matt Housh 2010-07-13 15:45:37 -05:00
parent f255034ec3
commit 39d5cbc304
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -7,9 +7,9 @@ CRUXVERSION = 2.7
CUSTOMVERSION =
COLLECTIONS = core opt xorg
KERNEL_MIRROR = ftp://ftp.kernel.org
KERNEL_VERSION = 2.6.33.2
KERNEL_VERSION = 2.6.34
KERNEL_PATCHES =
BB_VERSION = 1.14.1
BB_VERSION = 1.16.2
SYSLINUX_VERSION = 3.86
SQUASHFS_VERSION = 4.0
PKG_EXT = pkg.tar.xz
@ -268,7 +268,7 @@ squashfs: kernel busybox
@rm -rf $(SQUASHFS_DIR)
@mkdir -p $(SQUASHFS_DIR)
@for PACKAGE in $(ISO_PACKAGES); do \
tar -C $(SQUASHFS_DIR) -xzpf $(PORTS_DIR)/*/$$PACKAGE/$$PACKAGE\#*.$(PKG_EXT); \
bsdtar -C $(SQUASHFS_DIR) -xpf $(PORTS_DIR)/*/$$PACKAGE/$$PACKAGE\#*.$(PKG_EXT); \
done
@sed -i -e 's/^#PermitRootLogin yes/PermitRootLogin yes/' \
$(SQUASHFS_DIR)/etc/ssh/sshd_config

14
iso/bin/setup
View File

@ -111,14 +111,14 @@ select_packages() {
fi
do_dialog --aspect 50 --infobox "Searching for packages, please wait..." 0 0
TITLE="Select $collection packages to install:"
PKG_LIST=`find $collection -name '*.pkg.tar.gz' -printf "%f ($collection) $checked\n" | sed 's/.pkg.tar.gz//g' | sort | xargs echo ' '`
PKG_LIST=`find $collection \( -name '*.pkg.tar.gz' -o -name '*.pkg.tar.bz2' -o -name '*.pkg.tar.xz' \) -printf "%f ($collection) $checked\n" | sed 's/.pkg.tar.[^ ]*//g' | sort | xargs echo ' '`
do_select --separate-output --checklist "$TITLE" 19 60 12 $PKG_LIST 2>> $pkgfile
done
else # no detailed selection
for collection in core opt xorg; do
presel=`grep $collection $collfile`
if [ "$presel" == "$collection" ]; then
find $collection -name '*.pkg.tar.gz' -printf "%f\n" | sed 's/.pkg.tar.gz//g' | sort >> $pkgfile
find $collection \( -name '*.pkg.tar.gz' -o -name '*.pkg.tar.bz2' -o -name '*.pkg.tar.xz' \) -printf "%f\n" | sed 's/.pkg.tar.*//g' | sort >> $pkgfile
fi
done
fi
@ -128,9 +128,9 @@ select_packages() {
TITLE="Select packages to upgrade:"
INSTALLED_PACKAGES=`pkginfo -r $ROOT -i | gawk '{ print $1; }'`
for package in $INSTALLED_PACKAGES; do
CORE_LIST="$CORE_LIST `find core -name \"${package}#*.pkg.tar.gz\" -printf '%f (core) ON\n' | sed 's/.pkg.tar.gz/ /g' | sort | xargs echo ' '`"
OPT_LIST="$OPT_LIST `find opt -name \"${package}#*.pkg.tar.gz\" -printf '%f (opt) ON\n' | sed 's/.pkg.tar.gz/ /g' | sort | xargs echo ' '`"
XORG_LIST="$XORG_LIST `find xorg -name \"${package}#*.pkg.tar.gz\" -printf '%f (xorg) ON\n' | sed 's/.pkg.tar.gz/ /g' | sort | xargs echo ' '`"
CORE_LIST="$CORE_LIST `find core \( -name \"${package}#*.pkg.tar.gz\" -o -name \"${package}#*.pkg.tar.bz2\" -o -name \"${package}#*.pkg.tar.xz\" \) -printf '%f (core) ON\n' | sed 's/.pkg.tar.[^ ]*/ /g' | sort | xargs echo ' '`"
OPT_LIST="$OPT_LIST `find opt \( -name \"${package}#*.pkg.tar.gz\" -o -name \"${package}#*.pkg.tar.bz2\" -o -name \"${package}#*.pkg.tar.xz\" \) -printf '%f (opt) ON\n' | sed 's/.pkg.tar.[^ ]*/ /g' | sort | xargs echo ' '`"
XORG_LIST="$XORG_LIST `find xorg \( -name \"${package}#*.pkg.tar.gz\" -o -name \"${package}#*.pkg.tar.bz2\" -o -name \"${package}#*.pkg.tar.xz\" \) -printf '%f (xorg) ON\n' | sed 's/.pkg.tar.[^ ]*/ /g' | sort | xargs echo ' '`"
done
do_select --separate-output --checklist "$TITLE" 19 60 12 $CORE_LIST $OPT_LIST $XORG_LIST 2> $pkgfile
fi
@ -144,7 +144,7 @@ check_dependencies() {
get_missing_deps
if [ -n "$MISSING_DEPS" ]; then
for package in $MISSING_DEPS; do
MISSING_LIST="$MISSING_LIST `find . -name \"${package}#*.pkg.tar.gz\" -printf '%f %p ON\n' | sed 's/.pkg.tar.gz/ /g' | sed 's|./|(|;s|/.* O|) O|' | sort | xargs echo ' '`"
MISSING_LIST="$MISSING_LIST `find . \( -name \"${package}#*.pkg.tar.gz\" -o -name \"${package}#*.pkg.tar.bz2\" -o -name \"${package}#*.pkg.tar.xz\" \) -printf '%f %p ON\n' | sed 's/.pkg.tar.[^ ]*/ /g' | sed 's|./|(|;s|/.* O|) O|' | sort | xargs echo ' '`"
done
TITLE="The following packages are needed by the ones you selected"
do_select --separate-output --checklist "$TITLE" 19 60 12 $MISSING_LIST 2>> $pkgfile
@ -221,7 +221,7 @@ install_packages() {
for FILE in `cat $pkgfile`; do
progressbar "Installing $FILE..."
echo -n "Installing $FILE....." >> $logfile
PKG_FILE=`find . -name "$FILE.pkg.tar.gz"`
PKG_FILE=`find . \( -name "$FILE.pkg.tar.gz" -o -name "$FILE.pkg.tar.bz2" -o -name "$FILE.pkg.tar.xz" \)`
pkgadd -r $ROOT $PKGARGS $PKG_FILE > $tmpfile 2>&1
if [ $? = 0 ]; then
echo "OK" >> $logfile

2
iso/bin/setup-helper
View File

@ -73,7 +73,7 @@ inject_packages() {
for package in $@; do
if [ -z `is_installed $package` ]; then
echo "Package injected: $package"
pkg="`find core opt xorg -name \"${package}#*.pkg.tar.gz\" &2> /dev/null`"
pkg="`find core opt xorg \( -name \"${package}#*.pkg.tar.gz\" -o -name \"${package}#*.pkg.tar.bz2\" -o -name \"${package}#*.pkg.tar.xz\" \)&2> /dev/null`"
if [ -n "$pkg" ]; then
$PKGADD -r $ROOT -f $pkg
else