From f2d6f96d105eda9cc5a8734ba54a65978f76d179 Mon Sep 17 00:00:00 2001 From: "Andreas V. 'netrunner' Meier" Date: Wed, 16 Feb 2005 15:40:41 +0000 Subject: [PATCH] Andreas V. Meier: update uml_utilities for 24, it's merged in 26 now update Create-UMLRootfs: use mine to install, run 00-updates, etc [2005012813263007307] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5616 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- ...kg_linux_pre.conf => pkg_linux24_pre.conf} | 13 ++----- .../base/uml_utilities/pkg_linux26_pre.conf | 10 +++++ package/base/uml_utilities/uml_utilities.desc | 2 +- scripts/Create-UMLRootfs | 39 +++++++++++++++---- 4 files changed, 46 insertions(+), 18 deletions(-) rename package/base/uml_utilities/{pkg_linux_pre.conf => pkg_linux24_pre.conf} (54%) create mode 100644 package/base/uml_utilities/pkg_linux26_pre.conf diff --git a/package/base/uml_utilities/pkg_linux_pre.conf b/package/base/uml_utilities/pkg_linux24_pre.conf similarity index 54% rename from package/base/uml_utilities/pkg_linux_pre.conf rename to package/base/uml_utilities/pkg_linux24_pre.conf index 4ab631972..bc7fdfd3d 100644 --- a/package/base/uml_utilities/pkg_linux_pre.conf +++ b/package/base/uml_utilities/pkg_linux24_pre.conf @@ -8,16 +8,9 @@ for i in $uml_patch $uml_24host26 $uml_24cmdline; do done if [ "$ROCKCFG_KERNEL_UMLPATCH" == '1' ] ; then - if [ "$xpkg" = "linux24" ] ; then - var_append patchfiles " " "$uml_patch" - var_append patchfiles " " "$uml_24host26" - var_append patchfiles " " "$uml_24cmdline" - elif [ "$xpkg" = "linux26" ] ; then - var_append patchfiles " " "$uml_patch" - # fix for the arch/um/kernel/ksyms.c:90: redefinition of `__kstrtab_os_ioctl_generic' - hook_add postpatch 3 \ - "sed -e 's,\(EXPORT_SYMBOL(os_ioctl_generic);\),// \1,1' -i arch/um/kernel/ksyms.c" - fi + var_append patchfiles " " "$uml_patch" + var_append patchfiles " " "$uml_24host26" + var_append patchfiles " " "$uml_24cmdline" echo_status "Including UML Patch for $xpkg ($ver): $uml_patch." export arch_machine="um" var_insert makeopt " " "ARCH=um" diff --git a/package/base/uml_utilities/pkg_linux26_pre.conf b/package/base/uml_utilities/pkg_linux26_pre.conf new file mode 100644 index 000000000..2d9b580c3 --- /dev/null +++ b/package/base/uml_utilities/pkg_linux26_pre.conf @@ -0,0 +1,10 @@ +if [ "$ROCKCFG_KERNEL_UMLPATCH" == '1' ] ; then + # fix for the arch/um/kernel/ksyms.c:90: + # redefinition of `__kstrtab_os_ioctl_generic' + hook_add postpatch 3 \ + "sed -e 's,\(EXPORT_SYMBOL(os_ioctl_generic);\),// \1,1' -i arch/um/kernel/ksyms.c" + fi + echo_status "Building UML kernel for $xpkg ($ver)." + export arch_machine="um" + var_insert makeopt " " "ARCH=um" +fi diff --git a/package/base/uml_utilities/uml_utilities.desc b/package/base/uml_utilities/uml_utilities.desc index 4e28ea0eb..d05779cb7 100644 --- a/package/base/uml_utilities/uml_utilities.desc +++ b/package/base/uml_utilities/uml_utilities.desc @@ -39,6 +39,6 @@ [D] 1163032836 uml_utilities_20040406.tar.bz2 http://dl.sourceforge.net/sourceforge/user-mode-linux/ [D] 3565257192 uml-patch-2.6.8.1-1.bz2 http://dl.sourceforge.net/user-mode-linux/ -[D] 2488277907 uml-patch-2.4.26-3.bz2 http://dl.sourceforge.net/user-mode-linux/ +[D] 3715834792 uml-patch-2.4.27-1.bz2 http://dl.sourceforge.net/user-mode-linux/ [D] 2612233733 uml-patch-hostis26.diff.bz2 http://home.in.tum.de/~meiera/projects/rocklinux/download/base/uml_utilities/ [D] 1813879424 uml-patch-kernel-cmdline.diff.bz2 http://home.in.tum.de/~meiera/projects/rocklinux/download/base/uml_utilities/ diff --git a/scripts/Create-UMLRootfs b/scripts/Create-UMLRootfs index 3ed195dbd..3c24da5b6 100644 --- a/scripts/Create-UMLRootfs +++ b/scripts/Create-UMLRootfs @@ -29,9 +29,10 @@ eval `grep rockver scripts/parse-config` if [ $# -eq 0 ] ; then echo - echo "Usage: $0 [ -size MB ] [ -mkdebug ] [-prefix FS-Prefix] [-fs filesystem] Config" + echo "Usage: $0 [-size MB] [-debug] [-verbose] [-full]" + echo " [-prefix FS-Prefix] [-fs filesystem] Config" echo - echo "E.g.: $0 -prefix my myconfig" + echo "E.g.: $0 -full -prefix my myconfig" echo "this will leave you with a file 'my_linux' (the kernel) and a file" echo "'my_rootfs' (the file system). Just start it with ./linux" echo @@ -45,8 +46,10 @@ while true ; do case "$1" in -size) fssize=$2 ; shift ; shift ;; - -mkdebug) - mkdebug=1 ; shift ;; + -debug) + debug=1 ; shift ;; + -verbose) + verbose=1 ; shift ;; -fs) filesystem=$2; shift; shift ;; -prefix) @@ -130,13 +133,35 @@ mount -t $filesystem $loopdevice $mountpoint # install all echo "Installing files, may take some time..." if [ $full = 1 ]; then - for i in build/$buildid/*; do - if [ $i = "build/$buildid/ROCK" ]; then continue; fi - cp -rp $i $mountpoint +# for i in build/$buildid/*; do +# if [ $i = "build/$buildid/ROCK" ]; then continue; fi +# cp -rp $i $mountpoint +# done + for i in build/$buildid/ROCK/pkgs/*gem; do + if [ 'x1' = "x$verbose" ]; then + echo "Installing ${i/*\//}" + fi + mine -i -R $mountpoint $i done fi +# call the update script and some other tweaks +echo "Doing post-install adoptions" +chroot $mountpoint bash /etc/cron.d/00-updates +sed -i -e 's,vc/1,vc/0,' -e 's,^\([2-6]:\),#\1,' $mountpoint/etc/inittab +cat >$mountpoint/etc/fstab <