saad/minimal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed felix glibc_full java and mll_utils bundles

Browse Source
This commit is contained in:
bauen1 2017-07-06 19:06:49 +02:00
parent 6dc65c95f6
commit 5e3565a81b
No known key found for this signature in database
GPG Key ID: FF0AAF5E0812BA9C
8 changed files with 46 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/minimal_overlay/bundles/felix/01_get.sh
View File

@ -2,10 +2,7 @@
SRC_DIR=$(pwd) SRC_DIR=$(pwd)
# Find the main source directory . ../../common.sh
cd ../../..
MAIN_SRC_DIR=$(pwd)
cd $SRC_DIR
# Grab everything after the '=' character. # Grab everything after the '=' character.
DOWNLOAD_URL=$(grep -i FELIX_SOURCE_URL $MAIN_SRC_DIR/.config | cut -f2 -d'=') DOWNLOAD_URL=$(grep -i FELIX_SOURCE_URL $MAIN_SRC_DIR/.config | cut -f2 -d'=')
@ -33,12 +30,12 @@ fi
# Delete folder with previously extracted Felix. # Delete folder with previously extracted Felix.
echo "Removing Apache Felix work area. This may take a while..." echo "Removing Apache Felix work area. This may take a while..."
rm -rf ../../work/overlay/felix rm -rf $WORK_DIR/overlay/felix
mkdir ../../work/overlay/felix mkdir $WORK_DIR/overlay/felix
# Extract Felix to folder 'work/overlay/felix'. # Extract Felix to folder 'work/overlay/felix'.
# Full path will be something like 'work/overlay/felix/felix-framework-5.4.0'. # Full path will be something like 'work/overlay/felix/felix-framework-5.4.0'.
tar -xvf $ARCHIVE_FILE -C ../../work/overlay/felix tar -xvf $ARCHIVE_FILE -C $WORK_DIR/overlay/felix
cd $SRC_DIR cd $SRC_DIR

21
src/minimal_overlay/bundles/felix/02_install.sh
View File

@ -2,17 +2,14 @@
SRC_DIR=$(pwd) SRC_DIR=$(pwd)
# Find the main source directory . ../../common.sh
cd ../../..
MAIN_SRC_DIR=$(pwd)
cd $SRC_DIR
echo "Removing old Apache Felix artifacts. This may take a while..." echo "Removing old Apache Felix artifacts. This may take a while..."
rm -rf $MAIN_SRC_DIR/work/overlay/felix/felix_installed rm -rf $WORK_DIR/overlay/felix/felix_installed
mkdir -p $MAIN_SRC_DIR/work/overlay/felix/felix_installed/opt/felix mkdir -p $WORK_DIR/overlay/felix/felix_installed/opt/felix
mkdir -p $MAIN_SRC_DIR/work/overlay/felix/felix_installed/bin mkdir -p $WORK_DIR/overlay/felix/felix_installed/bin
cd $MAIN_SRC_DIR/work/overlay/felix cd $WORK_DIR/overlay/felix
cd $(ls -d felix-*) cd $(ls -d felix-*)
cat << CEOF > bin/felix-start.sh cat << CEOF > bin/felix-start.sh
@ -25,14 +22,14 @@ CEOF
chmod +rx bin/felix-start.sh chmod +rx bin/felix-start.sh
cp -r * $MAIN_SRC_DIR/work/overlay/felix/felix_installed/opt/felix cp -r * $WORK_DIR/overlay/felix/felix_installed/opt/felix
cd $MAIN_SRC_DIR/work/overlay/felix/felix_installed cd $WORK_DIR/overlay/felix/felix_installed
ln -s ../opt/felix/bin/felix-start.sh bin/felix-start ln -s ../opt/felix/bin/felix-start.sh bin/felix-start
cp -r $MAIN_SRC_DIR/work/overlay/felix/felix_installed/* \ cp -r $WORK_DIR/overlay/felix/felix_installed/* \
$MAIN_SRC_DIR/work/src/minimal_overlay/rootfs $WORK_DIR/src/minimal_overlay/rootfs
echo "Apache Felix has been installed." echo "Apache Felix has been installed."

2
src/minimal_overlay/bundles/glibc_full/bundle.sh
View File

@ -4,7 +4,7 @@ SRC_DIR=$(pwd)
. ../../common.sh . ../../common.sh
if [ ! -d $WORK_DIR/glibc/glibc_prepared ] ; then if [ ! -d $SYSROOT ] ; then
echo "Cannot continue - GLIBC is missing. Please buld GLIBC first." echo "Cannot continue - GLIBC is missing. Please buld GLIBC first."
exit 1 exit 1
fi fi

19
src/minimal_overlay/bundles/java/bundle.sh
View File

@ -18,10 +18,7 @@
SRC_DIR=$(pwd) SRC_DIR=$(pwd)
# Find the main source directory . ../../common.sh
cd ../../..
MAIN_SRC_DIR=$(pwd)
cd $SRC_DIR
# Read the 'JAVA_ARCHIVE' property from '.config' # Read the 'JAVA_ARCHIVE' property from '.config'
JAVA_ARCHIVE="$(grep -i ^JAVA_ARCHIVE $MAIN_SRC_DIR/.config | cut -f2 -d'=')" JAVA_ARCHIVE="$(grep -i ^JAVA_ARCHIVE $MAIN_SRC_DIR/.config | cut -f2 -d'=')"
@ -34,25 +31,25 @@ elif [ ! -f "$JAVA_ARCHIVE" ] ; then
exit 1 exit 1
fi fi
rm -rf $MAIN_SRC_DIR/work/overlay/java rm -rf $WORK_DIR/overlay/java
mkdir -p $MAIN_SRC_DIR/work/overlay/java/opt mkdir -p $WORK_DIR/overlay/java/opt
tar -xvf \ tar -xvf \
$JAVA_ARCHIVE \ $JAVA_ARCHIVE \
-C $MAIN_SRC_DIR/work/overlay/java/opt -C $WORK_DIR/overlay/java/opt
cd $MAIN_SRC_DIR/work/overlay/java/opt cd $WORK_DIR/overlay/java/opt
mv $(ls -d *) java mv $(ls -d *) java
mkdir $MAIN_SRC_DIR/work/overlay/java/bin mkdir $WORK_DIR/overlay/java/bin
for FILE in $(ls java/bin) for FILE in $(ls java/bin)
do do
ln -s ../opt/java/bin/$FILE ../bin/$FILE ln -s ../opt/java/bin/$FILE ../bin/$FILE
done done
cp -r $MAIN_SRC_DIR/work/overlay/java/* \ cp -r $WORK_DIR/overlay/java/* \
$MAIN_SRC_DIR/work/src/minimal_overlay/rootfs $WORK_DIR/src/minimal_overlay/rootfs
echo "Java has been installed." echo "Java has been installed."

9
src/minimal_overlay/bundles/mll_utils/01_prepare.sh
View File

@ -2,14 +2,11 @@
SRC_DIR=$(pwd) SRC_DIR=$(pwd)
# Find the main source directory . ../../common.sh
cd ../../..
MAIN_SRC_DIR=$(pwd)
cd $SRC_DIR
echo "Preparing the Minimal Linux Live utilities folder. This may take a while..." echo "Preparing the Minimal Linux Live utilities folder. This may take a while..."
rm -rf $MAIN_SRC_DIR/work/overlay/mll_utils rm -rf $WORK_DIR/overlay/mll_utils
mkdir -p $MAIN_SRC_DIR/work/overlay/mll_utils/sbin mkdir -p $WORK_DIR/overlay/mll_utils/sbin
echo "Miminal Linux Live utilities folder has been prepared." echo "Miminal Linux Live utilities folder has been prepared."

11
src/minimal_overlay/bundles/mll_utils/02_disk_erase.sh
View File

@ -2,17 +2,14 @@
SRC_DIR=$(pwd) SRC_DIR=$(pwd)
# Find the main source directory . ../../common.sh
cd ../../..
MAIN_SRC_DIR=$(pwd)
cd $SRC_DIR
if [ ! -d "$MAIN_SRC_DIR/work/overlay/mll_utils" ] ; then if [ ! -d "$WORK_DIR/overlay/mll_utils" ] ; then
echo "The directory $MAIN_SRC_DIR/work/overlay/mll_utils does not exist. Cannot continue." echo "The directory $WORK_DIR/overlay/mll_utils does not exist. Cannot continue."
exit 1 exit 1
fi fi
cd $MAIN_SRC_DIR/work/overlay/mll_utils cd $WORK_DIR/overlay/mll_utils
# 'mll-disk-erase' BEGIN # 'mll-disk-erase' BEGIN

29
src/minimal_overlay/bundles/mll_utils/03_installer.sh
View File

@ -2,17 +2,14 @@
SRC_DIR=$(pwd) SRC_DIR=$(pwd)
# Find the main source directory . ../../common.sh
cd ../../..
MAIN_SRC_DIR=$(pwd)
cd $SRC_DIR
if [ ! -d "$MAIN_SRC_DIR/work/overlay/mll_utils" ] ; then if [ ! -d "$WORK_DIR/overlay/mll_utils" ] ; then
echo "The directory $MAIN_SRC_DIR/work/overlay/mll_utils does not exist. Cannot continue." echo "The directory $WORK_DIR/overlay/mll_utils does not exist. Cannot continue."
exit 1 exit 1
fi fi
cd $MAIN_SRC_DIR/work/overlay/mll_utils cd $WORK_DIR/overlay/mll_utils
# 'mll-install' BEGIN # 'mll-install' BEGIN
@ -102,30 +99,30 @@ chmod +rx sbin/mll-install
# 'mll-install' END # 'mll-install' END
if [ ! -d "$MAIN_SRC_DIR/work/syslinux" ] ; then if [ ! -d "$WORK_DIR/syslinux" ] ; then
echo "The installer depends on Syslinux which is missing. Cannot continue." echo "The installer depends on Syslinux which is missing. Cannot continue."
exit 1 exit 1
fi; fi;
cd $MAIN_SRC_DIR/work/syslinux cd $WORK_DIR/syslinux
cd $(ls -d syslinux-*) cd $(ls -d syslinux-*)
cp bios/extlinux/extlinux \ cp bios/extlinux/extlinux \
$MAIN_SRC_DIR/work/overlay/mll_utils/sbin $WORK_DIR/overlay/mll_utils/sbin
mkdir -p $MAIN_SRC_DIR/work/overlay/mll_utils/opt/syslinux mkdir -p $WORK_DIR/overlay/mll_utils/opt/syslinux
cp bios/mbr/mbr.bin \ cp bios/mbr/mbr.bin \
$MAIN_SRC_DIR/work/overlay/mll_utils/opt/syslinux $WORK_DIR/overlay/mll_utils/opt/syslinux
# Big mama hack - need to find proper workaround!!! # Big mama hack - need to find proper workaround!!!
# Both syslinux and extlinux are 32-bit executables which require 32-bit libs. # Both syslinux and extlinux are 32-bit executables which require 32-bit libs.
# Possible solution 1 - build 32-bit GLIBC on demand. # Possible solution 1 - build 32-bit GLIBC on demand.
# Possible solution 2 - drop 32-bit MLL and provide 64-bit with multi-arch. # Possible solution 2 - drop 32-bit MLL and provide 64-bit with multi-arch.
mkdir -p $MAIN_SRC_DIR/work/overlay/mll_utils/lib mkdir -p $WORK_DIR/overlay/mll_utils/lib
mkdir -p $MAIN_SRC_DIR/work/overlay/mll_utils/usr/lib mkdir -p $WORK_DIR/overlay/mll_utils/usr/lib
cp /lib/ld-linux.so.2 \ cp /lib/ld-linux.so.2 \
$MAIN_SRC_DIR/work/overlay/mll_utils/lib $WORK_DIR/overlay/mll_utils/lib
cp /lib/i386-linux-gnu/libc.so.6 \ cp /lib/i386-linux-gnu/libc.so.6 \
$MAIN_SRC_DIR/work/overlay/mll_utils/usr/lib $WORK_DIR/overlay/mll_utils/usr/lib
# Big mama hack - end. # Big mama hack - end.
echo "Minimal Linux Live installer has been generated." echo "Minimal Linux Live installer has been generated."

12
src/minimal_overlay/bundles/mll_utils/04_install.sh
View File

@ -2,19 +2,15 @@
SRC_DIR=$(pwd) SRC_DIR=$(pwd)
# Find the main source directory . ../../common.sh
cd ../../..
MAIN_SRC_DIR=$(pwd)
cd $SRC_DIR
if [ ! -d "$MAIN_SRC_DIR/work/overlay/mll_utils" ] ; then if [ ! -d "$WORK_DIR/overlay/mll_utils" ] ; then
echo "The directory $MAIN_SRC_DIR/work/overlay/mll_utils does not exist. Cannot continue." echo "The directory $WORK_DIR/overlay/mll_utils does not exist. Cannot continue."
exit 1 exit 1
fi fi
# Copy all generated files to the source overlay folder. # Copy all generated files to the source overlay folder.
cp -r $MAIN_SRC_DIR/work/overlay/mll_utils/* \ cp -r $WORK_DIR/overlay/mll_utils/* $WORK_DIR/src/minimal_overlay/rootfs
$MAIN_SRC_DIR/work/src/minimal_overlay/rootfs
echo "All MLL utilities have been installed." echo "All MLL utilities have been installed."