- die Dateien für den entsprechenden Kernel liegen in folgenden Verzeichnissen
(dbox2-2.4 oder dbox2-2.6; tuxbox-cvs-2.4 oder tuxbox-cvs-2.6)
- die Verzeichnisse patches bzw locals müssen auch um die entsprechenden Kernelversion erweitert werden
(locals-2.4 oder locals-2.6 ; patches-2.4 oder patches-2.6)
-Umschaltung erfolgt im "configure"-Menu
Code: Alles auswählen
diff -u --recursive --new-file --exclude='*.log' ybuild/include/_yb_basisconf.inc.sh tuxbox/ybuild/include/_yb_basisconf.inc.sh
--- ybuild/include/_yb_basisconf.inc.sh 2008-09-13 12:14:11.000000000 +0200
+++ tuxbox/ybuild/include/_yb_basisconf.inc.sh 2008-09-15 06:44:23.000000000 +0200
@@ -21,14 +21,14 @@
echo "1 - Custom Directory......: $cMYFILESDIR ($cWORKINGDIR/$cMYFILESDIR)"
echo "2 - Logos Directory....: $cLOGOSDIR ($cWORKINGDIR/$cMYFILESDIR/$cLOGOSDIR)"
echo "3 - Ucodes Directory....: $cUCODESDIR ($cWORKINGDIR/$cMYFILESDIR/$cUCODESDIR)"
- echo "4 - locals Directory....: $cMyLOCALSDIR ($cWORKINGDIR/$cMYFILESDIR/$cMyLOCALSDIR)"
- echo "5 - Patches Directory...: $cMyPATCHESDIR ($cWORKINGDIR/$cMYFILESDIR/$cMyPATCHESDIR)"
+ echo "4 - locals Directory....: $cMyLOCALSDIR ($cWORKINGDIR/$cMYFILESDIR/$cMyLOCALSDIR-$confkernel)"
+ echo "5 - Patches Directory...: $cMyPATCHESDIR ($cWORKINGDIR/$cMYFILESDIR/$cMyPATCHESDIR-$confkernel)"
echo "6 - dbox-Files Directory: $cMyDBOXFILESDIR ($cWORKINGDIR/$cMYFILESDIR/$cMyDBOXFILESDIR)"
- echo "7 - DBOX Directory........: $cDBOX_PREFIX ($cWORKINGDIR/$cDBOX_PREFIX)"
+ echo "7 - DBOX Directory........: $cDBOX_PREFIX ($cWORKINGDIR/$cDBOX_PREFIX-$confkernel)"
echo "8 - ARCHIVE Directory.....: $cARCHIVEDIR ($cWORKINGDIR/$cARCHIVEDIR)"
- echo "9 - CVS Directory.........: $cCVSDIR ($cWORKINGDIR/$cCVSDIR)"
+ echo "9 - CVS Directory.........: $cCVSDIR ($cWORKINGDIR/$cCVSDIR-$confkernel)"
echo "u - CVS Username..........: $CVSNAME (for anonymous: anoncvs)"
- echo "c - ccache path...........: $cCCACHEDIR ($cWORKINGDIR/$cDBOX_PREFIX/$cCCACHEDIR)"
+ echo "c - ccache path...........: $cCCACHEDIR ($cWORKINGDIR/$cDBOX_PREFIX-$confkernel/$cCCACHEDIR)"
echo ""
echo "b - Back"
echo "==============================================================================="
diff -u --recursive --new-file --exclude='*.log' ybuild/include/_yb_configureconf.inc.sh tuxbox/ybuild/include/_yb_configureconf.inc.sh
--- ybuild/include/_yb_configureconf.inc.sh 2008-09-13 12:14:11.000000000 +0200
+++ tuxbox/ybuild/include/_yb_configureconf.inc.sh 2008-09-25 08:29:38.000000000 +0200
@@ -31,7 +31,9 @@
echo "af/ay - patch before configure (autom.).Flash: $confautopatch_FLASH YADD: $confautopatch_YADD"
echo "uf/uy - upnp client.....................Flash: $confupnp_FLASH YADD: $confupnp_YADD"
echo "ff/fy - flac............................Flash: $confflac_FLASH YADD: $confflac_YADD"
+ echo "yf/yy - libcrypto.......................Flash: $conflibcrypto_FLASH YADD: $conflibcrypto_YADD"
echo ""
+ echo "k - kernel version.......: $confkernel"
echo "c - use ccache...........: $confccache"
echo "0 - RootPartitionSize*)..: $ROOTPARTSIZE"
echo "h - Update http URL......: $UPDATEHTTPPREFIX"
@@ -69,6 +71,8 @@
a) setting="confautopatch" ;;
u) setting="confupnp" ;;
f) setting="confflac" ;;
+ y) setting="conflibcrypto" ;;
+ k) config_editvariable "confkernel" "2.4" "kernel version" ;;
c) config_editvariable "confccache" "y" "Use ccache" ;;
0) config_editvariable "ROOTPARTSIZE" "0x600000" "RootPartitionSize" ;;
h) config_editvariable "UPDATEHTTPPREFIX" "" "Update http URL" ;;
diff -u --recursive --new-file --exclude='*.log' ybuild/include/_yb_library.inc.sh tuxbox/ybuild/include/_yb_library.inc.sh
--- ybuild/include/_yb_library.inc.sh 2008-09-13 12:14:11.000000000 +0200
+++ tuxbox/ybuild/include/_yb_library.inc.sh 2008-09-15 06:45:32.000000000 +0200
@@ -17,13 +17,13 @@
MYFILESDIR=$cWORKINGDIR/$cMYFILESDIR
LOGOSDIR=$cWORKINGDIR/$cMYFILESDIR/$cLOGOSDIR
UCODESDIR=$cWORKINGDIR/$cMYFILESDIR/$cUCODESDIR
- MyLOCALSDIR=$cWORKINGDIR/$cMYFILESDIR/$cMyLOCALSDIR
- MyPATCHESDIR=$cWORKINGDIR/$cMYFILESDIR/$cMyPATCHESDIR
+ MyLOCALSDIR=$cWORKINGDIR/$cMYFILESDIR/$cMyLOCALSDIR-$confkernel
+ MyPATCHESDIR=$cWORKINGDIR/$cMYFILESDIR/$cMyPATCHESDIR-$confkernel
MyDBOXFILESDIR=$cWORKINGDIR/$cMYFILESDIR/$cMyDBOXFILESDIR
- CVSDIR=$cWORKINGDIR/$cCVSDIR
- DBOX_PREFIX=$cWORKINGDIR/$cDBOX_PREFIX
+ CVSDIR=$cWORKINGDIR/$cCVSDIR-$confkernel
+ DBOX_PREFIX=$cWORKINGDIR/$cDBOX_PREFIX-$confkernel
ARCHIVEDIR=$cWORKINGDIR/$cARCHIVEDIR
- CCACHEDIR=$cWORKINGDIR/$cDBOX_PREFIX/$cCCACHEDIR
+ CCACHEDIR=$cWORKINGDIR/$cDBOX_PREFIX-$confkernel/$cCCACHEDIR
#------------------------------------------
# other Settings
@@ -40,12 +40,12 @@
echo " -- Custom Directory.......: $cMYFILESDIR ($cWORKINGDIR/$cMYFILESDIR)"
echo " --- Logos Directory....: $cLOGOSDIR ($cWORKINGDIR/$cMYFILESDIR/$cLOGOSDIR)"
echo " --- Ucodes Directory....: $cUCODESDIR ($cWORKINGDIR/$cMYFILESDIR/$cUCODESDIR)"
- echo " --- locals Directory....: $cMyLOCALSDIR ($cWORKINGDIR/$cMYFILESDIR/$cMyLOCALSDIR)"
- echo " --- Patches Directory...: $cMyPATCHESDIR ($cWORKINGDIR/$cMYFILESDIR/$cMyPATCHESDIR)"
+ echo " --- locals Directory....: $cMyLOCALSDIR ($cWORKINGDIR/$cMYFILESDIR/$cMyLOCALSDIR-$confkernel)"
+ echo " --- Patches Directory...: $cMyPATCHESDIR ($cWORKINGDIR/$cMYFILESDIR/$cMyPATCHESDIR-$confkernel)"
echo " --- dbox-Files Directory: $cMyDBOXFILESDIR ($cWORKINGDIR/$cMYFILESDIR/$cMyDBOXFILESDIR)"
- echo " -- DBOX Directory.........: $cDBOX_PREFIX ($cWORKINGDIR/$cDBOX_PREFIX)"
+ echo " -- DBOX Directory.........: $cDBOX_PREFIX ($cWORKINGDIR/$cDBOX_PREFIX-$confkernel)"
echo " -- ARCHIVE Directory......: $cARCHIVEDIR ($cWORKINGDIR/$cARCHIVEDIR)"
- echo " -- CVS Directory..........: $cCVSDIR ($cWORKINGDIR/$cCVSDIR)"
+ echo " -- CVS Directory..........: $cCVSDIR ($cWORKINGDIR/$cCVSDIR-$confkernel)"
echo ""
echo " CVS Username..............: $CVSNAME (for anonymous: anoncvs)"
}
diff -u --recursive --new-file --exclude='*.log' ybuild/include/_yb_patchmgr.inc.sh tuxbox/ybuild/include/_yb_patchmgr.inc.sh
--- ybuild/include/_yb_patchmgr.inc.sh 2008-09-13 12:14:11.000000000 +0200
+++ tuxbox/ybuild/include/_yb_patchmgr.inc.sh 2008-09-30 15:39:22.000000000 +0200
@@ -98,7 +98,8 @@
if [ "$1" == "" -o "$1" == "$j" ]; then
echo "Info: patch $patch_file at path: $patch_path slashes: $patch_num_slashes"
echo "Info: patch -d $CVSDIR/$patch_path -b -B $MyPATCHESDIR/backup/$patch_path/ -p$patch_num_slashes <$MyPATCHESDIR/$patch_file"
- patch -d $CVSDIR/$patch_path -b -B $MyPATCHESDIR/backup/$patch_path/ -p$patch_num_slashes <$MyPATCHESDIR/$patch_file echo "$i" >>$MyPATCHESDIR/backup/done_patches.txt
+ patch -d $CVSDIR/$patch_path -b -B $MyPATCHESDIR/backup/$patch_path/ -p$patch_num_slashes <$MyPATCHESDIR/$patch_file
+ echo "$i" >>$MyPATCHESDIR/backup/done_patches.txt
fi
else
break;
@@ -124,7 +125,7 @@
echo "restore previously patched files from local cvs"
echo "=============================================================="
echo "Copy all backuped files $MyPATCHESDIR/backup $CVSDIR"
- cp -r -v $MyPATCHESDIR/backup/* $CVSDIR
+ cp -rf -v $MyPATCHESDIR/backup/* $CVSDIR
echo "Remove $CVSDIR/done_patches.txt and $MyPATCHESDIR/backup"
rm -f $CVSDIR/done_patches.txt
rm -rf $MyPATCHESDIR/backup
diff -u --recursive --new-file --exclude='*.log' ybuild/yb_globals.conf tuxbox/ybuild/yb_globals.conf
--- ybuild/yb_globals.conf 2008-09-13 12:14:11.000000000 +0200
+++ tuxbox/ybuild/yb_globals.conf 2008-09-30 14:00:49.000000000 +0200
@@ -11,7 +11,7 @@
# relative Directories Definitions
cLOGOSDIR=Logos
cUCODESDIR=Ucodes
-cMYFILESDIR=y/Private
+cMYFILESDIR=Private
cCVSDIR=tuxbox-cvs
cDBOX_PREFIX=dbox2
cARCHIVEDIR=Archive
@@ -25,38 +25,41 @@
# Build
cBuildTARGET=flash
cBuildGUI=neutrino
-cBuildFS=jffs2
-cBuildCHIPS=2x
+cBuildFS=squashfs
+cBuildCHIPS=all
# Configure Settings
confide_FLASH=y
confide_YADD=y
conflirc_FLASH=n
conflirc_YADD=n
-confcdkVcInfo_FLASH=n
+confcdkVcInfo_FLASH=y
confcdkVcInfo_YADD=y
confgermankeymaps_FLASH=n
confgermankeymaps_YADD=n
confext3_FLASH=y
confext3_YADD=y
-confxfs_FLASH=n
-confxfs_YADD=n
+confxfs_FLASH=y
+confxfs_YADD=y
confnfsserver_FLASH=n
confnfsserver_YADD=y
-confsambaserver_FLASH=y
+confsambaserver_FLASH=n
confsambaserver_YADD=y
confautopatch_FLASH=n
confautopatch_YADD=n
-ROOTPARTSIZE=0x600000
-
-# Others
-confdosfstools_FLASH=n
-confdosfstools_YADD=n
+confdosfstools_FLASH=y
+confdosfstools_YADD=y
confupnp_FLASH=n
-confupnp_YADD=n
-confccache=y
+confupnp_YADD=y
confflac_FLASH=n
-confflac_YADD=n
+confflac_YADD=y
+conflibcrypto_FLASH=y
+conflibcrypto_YADD=y
+confkernel=2.6
+confccache=n
+ROOTPARTSIZE=0x560000
+
+# Others
cCCACHEPATH=/bin/ccache
cSetupServerIP=192.168.0.37
cSetupDboxIP=192.168.0.15
diff -u --recursive --new-file --exclude='*.log' ybuild/ybstart.sh tuxbox/ybuild/ybstart.sh
--- ybuild/ybstart.sh 2008-09-13 12:14:11.000000000 +0200
+++ tuxbox/ybuild/ybstart.sh 2008-09-30 15:33:59.000000000 +0200
@@ -148,7 +148,7 @@
do_configure_build_features()
{
flags=""
- for f in "ide" "lirc" "ext3" "xfs" "nfsserver" "sambaserver" "cdkVcInfo" "dosfstools" "upnp" "flac"
+ for f in "ide" "lirc" "ext3" "xfs" "nfsserver" "sambaserver" "cdkVcInfo" "dosfstools" "upnp" "flac" "libcrypto"
do
_do_configure_build_features $f $1 $f
flags="$flags $flag"
@@ -164,6 +164,9 @@
flags="$flags --with-ccachedir=$CCACHEDIR"
fi
fi
+ if [ "$confkernel" == "2.6" ]; then
+ flags="$flags --enable-kernel26"
+ fi
}
# -----------------------------------------------------------------------------------------------------------
@@ -201,13 +204,15 @@
echo "FLAGS generated = $flags"
# start configure
- ./configure --prefix="$DBOX_PREFIX" --with-cvsdir="$CVSDIR" --enable-flashrules \
- --with-logosdir="$LOGOSDIR" \
- --with-ucodesdir=$UCODESDIR \
- --with-checkImage=rename \
- --enable-maintainer-mode \
- --with-customizationsdir="$MyLOCALSDIR" \
- $flags
+ ./configure --prefix="$DBOX_PREFIX" \
+ --with-cvsdir="$CVSDIR" \
+ --enable-flashrules \
+ --with-logosdir="$LOGOSDIR" \
+ --with-ucodesdir=$UCODESDIR \
+ --with-checkImage=rename \
+ --enable-maintainer-mode \
+ --with-customizationsdir="$MyLOCALSDIR" \
+ $flags
fi
}
@@ -243,12 +248,13 @@
echo "FLAGS generated = $flags"
# start configure
- ./configure --prefix="$DBOX_PREFIX" --with-cvsdir="$CVSDIR" \
- --with-logosdir="$LOGOSDIR" \
- --with-ucodesdir=$UCODESDIR \
- --enable-maintainer-mode \
- --with-customizationsdir="$MyLOCALSDIR" \
- $flags
+ ./configure --prefix="$DBOX_PREFIX" \
+ --with-cvsdir="$CVSDIR" \
+ --with-logosdir="$LOGOSDIR" \
+ --with-ucodesdir=$UCODESDIR \
+ --enable-maintainer-mode \
+ --with-customizationsdir="$MyLOCALSDIR" \
+ $flags
fi
}
@@ -281,7 +287,14 @@
echo "--------------------------------------------------------------"
cd "$CVSDIR"
set CVS_RSH=ssh && cvs $cvs_debug -d anoncvs@cvs.tuxbox.org:/cvs/tuxbox -z3 co -f -r newmake -P .
- else
+ if [ "$confkernel" == "2.6" ];then
+ # Checkout additional files for kernel 2.6
+ echo "--------------------------------------------------------------"
+ echo "Checkout additional files for kernel 2.6"
+ echo "--------------------------------------------------------------"
+ cvs -qz9 update -dP -r driver_2_6_branch driver/
+ fi
+ else
# Checkout if CVS-User is a registred user
cd "$CVSDIR"
echo "--------------------------------------------------------------"
@@ -299,6 +312,13 @@
cvs -z3 $cvs_debug -d "$CVSNAME@cvs.tuxbox.org:/cvs/tuxbox" co -r newmake -P cdk/newmake.files
cd "$CVSDIR"
cvs -z3 $cvs_debug -d "$CVSNAME@cvs.tuxbox.org:/cvs/tuxbox" co -f -r newmake `cat cdk/newmake.files`
+ if [ "$confkernel" == "2.6" ];then
+ # Checkout additional files for kernel 2.6
+ echo "--------------------------------------------------------------"
+ echo "Checkout additional files for kernel 2.6"
+ echo "--------------------------------------------------------------"
+ cvs -qz9 update -dP -r driver_2_6_branch driver/
+ fi
fi
rm $CVSDIR/cdk/root/etc/init.d/rcS $CVSDIR/cdk/root/etc/init.d/rcS.insmod
fi
@@ -331,6 +351,13 @@
echo "--------------------------------------------------------------"
cd "$CVSDIR"
set CVS_RSH=ssh && cvs $cvs_debug -d anoncvs@cvs.tuxbox.org:/cvs/tuxbox -z3 co -f -r newmake -P .
+ if [ "$confkernel" == "2.6" ];then
+ # Checkout additional files for kernel 2.6
+ echo "--------------------------------------------------------------"
+ echo "Checkout additional files for kernel 2.6"
+ echo "--------------------------------------------------------------"
+ cvs -qz9 update -dP -r driver_2_6_branch driver/
+ fi
else
# Checkout if CVS-User is a registred user
cd "$CVSDIR"
@@ -345,6 +372,13 @@
cvs -z3 $cvs_debug -d "$CVSNAME@cvs.tuxbox.org:/cvs/tuxbox" co -r newmake -P cdk/newmake.files
cd "$CVSDIR"
cvs -z3 $cvs_debug -d "$CVSNAME@cvs.tuxbox.org:/cvs/tuxbox" co -f -r newmake `cat cdk/newmake.files`
+ if [ "$confkernel" == "2.6" ];then
+ # Checkout additional files for kernel 2.6
+ echo "--------------------------------------------------------------"
+ echo "Checkout additional files for kernel 2.6"
+ echo "--------------------------------------------------------------"
+ cvs -qz9 update -dP -r driver_2_6_branch driver/
+ fi
fi
rm $CVSDIR/cdk/root/etc/init.d/rcS $CVSDIR/cdk/root/etc/init.d/rcS.insmod
fi
Edit: ein paar Code-Bereinigungen