From e6be8b1478a5d142a081ed349f1e37524a28154a Mon Sep 17 00:00:00 2001 From: geos_one Date: Sun, 24 Oct 2010 18:10:38 +0000 Subject: [PATCH] delete and add new packages git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/genlink@2576 6952d904-891a-0410-993b-d76249ca496b --- .../buffalo_ls_pro_live-sources/Manifest | 5 + .../buffalo_ls_pro_live-sources-2.6.35.ebuild | 21 +++ sys-kernel/genkernel/Manifest | 17 ++ .../genkernel-3.4.11-aufs-slowusb.patch | 126 +++++++++++++++ .../3.4.11/genkernel-3.4.11-branding.patch | 68 ++++++++ ....11-btrfs-partial-support-bug-303529.patch | 12 ++ ...el-3.4.11-partial-fix-to-console-arg.patch | 11 ++ .../genkernel-3.4.11-sdelay-compat.patch | 11 ++ .../files/genkernel-crypt-config.patch | 19 +++ sys-kernel/genkernel/files/genkernel.bash | 73 +++++++++ .../genkernel/genkernel-3.4.10.907-r3.ebuild | 148 ++++++++++++++++++ .../linux-buffalo_ls_pro_live-2.6.35.ebuild | 3 +- .../linux-buffalo_ls_xhl-2.6.35-r1.ebuild | 1 - sys-kernel/linux-firmwares/Manifest | 6 + .../linux-firmwares-2.6.35.ebuild | 15 ++ sys-kernel/nas-sources/ChangeLog | 13 -- sys-kernel/nas-sources/Manifest | 7 - sys-kernel/nas-sources/metadata.xml | 34 ---- .../nas-sources/nas-sources-2.6.35-r1.ebuild | 13 -- 19 files changed, 533 insertions(+), 70 deletions(-) create mode 100644 sys-kernel/buffalo_ls_pro_live-sources/Manifest create mode 100644 sys-kernel/buffalo_ls_pro_live-sources/buffalo_ls_pro_live-sources-2.6.35.ebuild create mode 100644 sys-kernel/genkernel/Manifest create mode 100644 sys-kernel/genkernel/files/3.4.11/genkernel-3.4.11-aufs-slowusb.patch create mode 100644 sys-kernel/genkernel/files/3.4.11/genkernel-3.4.11-branding.patch create mode 100644 sys-kernel/genkernel/files/3.4.11/genkernel-3.4.11-btrfs-partial-support-bug-303529.patch create mode 100644 sys-kernel/genkernel/files/3.4.11/genkernel-3.4.11-partial-fix-to-console-arg.patch create mode 100644 sys-kernel/genkernel/files/3.4.11/genkernel-3.4.11-sdelay-compat.patch create mode 100644 sys-kernel/genkernel/files/genkernel-crypt-config.patch create mode 100644 sys-kernel/genkernel/files/genkernel.bash create mode 100644 sys-kernel/genkernel/genkernel-3.4.10.907-r3.ebuild create mode 100644 sys-kernel/linux-firmwares/Manifest create mode 100644 sys-kernel/linux-firmwares/linux-firmwares-2.6.35.ebuild delete mode 100644 sys-kernel/nas-sources/ChangeLog delete mode 100644 sys-kernel/nas-sources/Manifest delete mode 100644 sys-kernel/nas-sources/metadata.xml delete mode 100644 sys-kernel/nas-sources/nas-sources-2.6.35-r1.ebuild diff --git a/sys-kernel/buffalo_ls_pro_live-sources/Manifest b/sys-kernel/buffalo_ls_pro_live-sources/Manifest new file mode 100644 index 0000000..47cd9b1 --- /dev/null +++ b/sys-kernel/buffalo_ls_pro_live-sources/Manifest @@ -0,0 +1,5 @@ +DIST buffalo_ls_pro_live-2.6.35-arm.config 88886 RMD160 9cb91d591975265d9b9b25c496bcedb1e772e53c SHA1 cf7b0ad2036a7a0bf804ccc58f404b09e3be0db5 SHA256 3e11698088df35da9383b03fc3af352a9b81a50c9a0592f2de07d54ba03efff7 +DIST linux-2.6.35.tar.bz2 69305709 RMD160 f5d91abb4fa72fac812578d830b22180d85a0e6f SHA1 4cb1fbfbeedcd658ca37739679c65dfaa136bf4e SHA256 18b2e2c336032e366c942622b77302cb05fc034fb19018f086a4ebc9ed41bfcf +DIST nas-patches-2.6.35-3.tar.bz2 544891 RMD160 2ec18e1b33e793b14a3b4e73faf8efa86f070800 SHA1 844e108b45e6879172ec496d2ce4ebad4c0a877c SHA256 d894bcba25fdb6cb65a7b92fcac2b82ae1df369bcc979eed3ae3a6b5241f089b +DIST patch-2.6.35.7.bz2 141728 RMD160 fbde02939d58fe2f9fd9f3fae1141a08e00c2f4a SHA1 e898d93008cecdd429a9332b148eda2b446b9fd5 SHA256 e917d593b975853be4118934c35919936dec6069b35c277d26e7e85e88af062e +EBUILD buffalo_ls_pro_live-sources-2.6.35.ebuild 615 RMD160 d8c1a1758405cfcd7b9b622d4298b1a18e941a25 SHA1 f99eac5c91bc845c75a0979fe1e76500190a6882 SHA256 e32d0d80c96cf3787476f9708df1a3cdf28e9c4282b4187b8b04910dc0431503 diff --git a/sys-kernel/buffalo_ls_pro_live-sources/buffalo_ls_pro_live-sources-2.6.35.ebuild b/sys-kernel/buffalo_ls_pro_live-sources/buffalo_ls_pro_live-sources-2.6.35.ebuild new file mode 100644 index 0000000..b690298 --- /dev/null +++ b/sys-kernel/buffalo_ls_pro_live-sources/buffalo_ls_pro_live-sources-2.6.35.ebuild @@ -0,0 +1,21 @@ +# Copyright 2004-2010 Sabayon Linux +# Distributed under the terms of the GNU General Public License v2 + +ETYPE="sources" +K_WANT_GENPATCHES="" +K_GENPATCHES_VER="" +K_NASPATCHES_VER="3" +K_KERNEL_PATCH_VER="7" +K_NASKERNEL_NAME="buffalo_ls_pro_live" +K_NASKERNEL_URI_CONFIG="yes" +K_ONLY_SOURCES="1" +inherit nas-kernel +KEYWORDS="~arm" +DESCRIPTION="Official Genlink Buffalo Linkstation Pro/Live Linux kernel sources" +RESTRICT="mirror" +IUSE="sources_standalone" + +DEPEND="${DEPEND} + sources_standalone? ( !=sys-kernel/linux-buffalo_ls_pro_live-${PVR} ) + !sources_standalone? ( =sys-kernel/linux-buffalo_ls_pro_live-${PVR} )" + diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest new file mode 100644 index 0000000..b35d4c6 --- /dev/null +++ b/sys-kernel/genkernel/Manifest @@ -0,0 +1,17 @@ +AUX 3.4.11/genkernel-3.4.11-aufs-slowusb.patch 3425 RMD160 74add9c16143240da14ad307a25d5cccba58e893 SHA1 ffeee71f9e2146e0533591e62c0b3d1e0f77efd7 SHA256 8a131caf94253c0799daa18e0146b13b96f0667552ad6f97ce246c13f403a900 +AUX 3.4.11/genkernel-3.4.11-branding.patch 3273 RMD160 8234e9da1ee6e4f89074b3a97a8508db07a6be01 SHA1 f7fa1b8b07aa334b54e96a510756d6f82954ed90 SHA256 d9a9907c5bd316ee7384f4dcb3f2d80775b5aed1fb6b40763bce8543ecee86a2 +AUX 3.4.11/genkernel-3.4.11-btrfs-partial-support-bug-303529.patch 291 RMD160 06cea814b7f1a44bda3a46bb5939ebc5649be485 SHA1 eb65b70222e3063379d71d3e2091ffb8b6b2cbc6 SHA256 c4f83688c1bec65bd7082d93be0e014163c9ecf0c9f5a0d36ec1ed5645bfca2b +AUX 3.4.11/genkernel-3.4.11-partial-fix-to-console-arg.patch 464 RMD160 d2d132f6527e3f386cc0719bd82cdf561cd76a66 SHA1 2c67a1cd3b4b1fb7b2b39487dcc761486b39bcd7 SHA256 c8c87497f35f6d47749040f53b94b30610818aeb91e6f962f522f9b84a902646 +AUX 3.4.11/genkernel-3.4.11-sdelay-compat.patch 274 RMD160 5170828fb8039d246f8a7357d3a78274fc25cc50 SHA1 e4bf22da7fe1ceedd300a37332c3295d342202b1 SHA256 fcaa04f4ae9183ebe0512f1100a4ee74bcffbaa02d91b75c3c075e95c02b215c +AUX genkernel-crypt-config.patch 1005 RMD160 4a72594eeb122022acb70854720196cb80fa3114 SHA1 86b2c46afd686a846fdf59b7ad030761cfbcc5c6 SHA256 547eadbb63b54c28d6ff4fe197478408c76ec30d863e8ee0d9cce4169b9f9cb1 +AUX genkernel.bash 2438 RMD160 b3d8e4436d8768c07d18c5aaff9c14fc16641729 SHA1 e15a9c6ef506aa6872a6a97d26751246dedded04 SHA256 e7de9771ba79ef878e2c9a21a1c1720f092c6047d3cc7d4a49ff6b90e7e2c248 +DIST LVM2.2.02.28.tgz 531905 RMD160 bf6f25db6e34bf362353ae9557691a7f01962502 SHA1 6eb2f6e1228b017ad23d0b7f2bb12fd113f96616 SHA256 2d8d7b123e427d0bfb7471d7c17dfd88890eb98257ca22ea3be5d7307e83aceb +DIST busybox-1.7.4.tar.bz2 1727940 RMD160 a4b71a246449f88a59acda6ecf019f66b9b7c19b SHA1 e5dcaa25525ca63663c3d4e7027897fed54a4f95 SHA256 8480a7c1b9ac0fddff55e8daae807ccf0a47aa292137fa8c9f97cf0733b459c7 +DIST device-mapper.1.02.22.tgz 189726 RMD160 8bf9986536c49f53c398d6a2180e21e1235bea18 SHA1 a4533872c32951a1b549bb9207a13b7e4dae0701 SHA256 ff833a6cd6246686f5b3f5692fd6597f1ffbc60f08929e5fe68304cdafb61595 +DIST dmraid-1.0.0.rc14.tar.bz2 164234 RMD160 9cd238a981cfef9c5c1f2f1d6466b70c95ec9c7c SHA1 2b3284db46a995967d88993ae5ae36b57c513bc4 SHA256 a777354d6d69a9b58d84966cc7b37bc3f5c89539f885ad25fd874ed1c388fbec +DIST e2fsprogs-1.41.9.tar.gz 4452610 RMD160 b30a1bb1c984811b82f6130da3ed6ff12573d508 SHA1 e30d6bc67ac7b14cd817986c9bff13fb695d7a35 SHA256 cbf1e34261a16b3d7911b60b91290b19f2010036d6ba628d45b5f0b2af2b66e8 +DIST fuse-2.7.4.tar.gz 506658 RMD160 fe1808cfd58ad6651259245b424301e99881faa2 SHA1 7a86f5cf39f38e64ccbae093599d64a895b950ba SHA256 c8b070ece5d4e09bd06eea6c28818c718f803d93a4b85bacb9982deb8ded49e6 +DIST genkernel-3.4.10.907.tar.bz2 202413 RMD160 81ea32bb0b91ed7114bd825b7339132214abc2df SHA1 f2f2ab0658283e3a17caaa3fcc93ddf619e04afa SHA256 0fe4bd273d3ab9fe87e12fbf65b41edafc05cce95e0412e3f5450a0ca6010f12 +DIST open-iscsi-2.0-871.tar.gz 330514 RMD160 f996d9145bc3727394f1a4999f430bd5ea5c2a0d SHA1 968baf16d4094fb9842bc04b0fe8109103356252 SHA256 bcea8746ae82f2ada7bc05d2aa59bcda1ca0d5197f05f2e16744aae59f0a7dcb +DIST unionfs-fuse-0.22.tar.bz2 27355 RMD160 f29cbf41af0ba8f2181ac565a6663871676f6488 SHA1 e95799923ee3938e1fb44c6fd9aa7154d720063e SHA256 fa0c494a8ce63f235601fcc35e3a96527831169d6d5921ee49faccf3b25feb78 +EBUILD genkernel-3.4.10.907-r3.ebuild 4999 RMD160 62c8143b33e3adaa30bdba8f49e2ffce490d14dc SHA1 358b380847cd846633c9edbbb3e700ed4930b31b SHA256 1f3a1f2dd51d2b782b140aeed8cbf362ccf5d6907be24f1c9b4ad5c330f8b696 diff --git a/sys-kernel/genkernel/files/3.4.11/genkernel-3.4.11-aufs-slowusb.patch b/sys-kernel/genkernel/files/3.4.11/genkernel-3.4.11-aufs-slowusb.patch new file mode 100644 index 0000000..b61d9f4 --- /dev/null +++ b/sys-kernel/genkernel/files/3.4.11/genkernel-3.4.11-aufs-slowusb.patch @@ -0,0 +1,126 @@ +diff -Nurp genkernel-3.4.10.906.orig/defaults/initrd.scripts genkernel-3.4.10.906/defaults/initrd.scripts +--- genkernel-3.4.10.906.orig/defaults/initrd.scripts 2009-08-11 18:42:31.669397498 +0200 ++++ genkernel-3.4.10.906/defaults/initrd.scripts 2009-08-11 19:16:22.161397604 +0200 +@@ -195,6 +195,13 @@ mount_sysfs() { + [ "$ret" -eq '0' ] || bad_msg "Failed to mount /sys!" + } + ++aufs_setup_dir() { ++ mount -t aufs -o "br:$OVERLAY=rw:$2=ro" -- aufs $1 ++ if [ "$?" -eq '0' ]; then ++ good_msg "Addition of $2 to $OVERLAY merged into $1" ++ fi ++} ++ + findnfsmount() { + if [ "${IP}" != '' ] || busybox udhcpc -n -T 15 -q + then +@@ -378,9 +385,10 @@ setup_hotplug() { + + check_slowusb() { + [ "${DO_slowusb}" ] || \ +- for dir in /sys/bus/usb/drivers/usb-storage/* ++ for x in /sys/bus/usb/drivers/usb-storage/* + do +- [ -d "${dir}" ] && FORCE_slowusb="1" ++ [ -d "${x}" ] && [ "${x}" != "/sys/bus/usb/drivers/usb-storage/module" ] \ ++ && FORCE_slowusb="1" + done + } + +@@ -388,9 +396,7 @@ start_dev_mgr() { + if [ "${KV_2_6_OR_GREATER}" ] + then + cd /sys +- [ "${DO_slowusb}" ] && sdelay + check_slowusb +- [ "${FORCE_slowusb}" ] && sdelay + good_msg 'Activating mdev' + runmdev + [ "${DO_slowusb}" ] || \ +@@ -928,6 +934,34 @@ getdvhoff() { + echo $(( $(hexdump -n 4 -s $((316 + 12 * $2)) -e '"%i"' $1) * 512)) + } + ++setup_aufs() { ++ ++ # Directory used for rw changes in union mount filesystem ++ UNION=/aufs ++ OVERLAY=/overlay ++ ++ mkdir -p "${UNION}" ++ mkdir -p "${OVERLAY}" ++ mount -t tmpfs none "${OVERLAY}" ++ good_msg "Loading aufs module (if module)" ++ modprobe aufs > /dev/null 2>&1 ++ ++ aufs_setup_dir "${UNION}" "${NEW_ROOT}/${FS_LOCATION}" ++ ++ # setup internal mounts ++ mkdir -p "${UNION}/mnt/livecd" ++ if [ ! -e "${UNION}/mnt/cdrom" ]; then ++ mkdir "${UNION}/mnt/cdrom" -p ++ fi ++ mount --bind "${NEW_ROOT}/${FS_LOCATION}" "${UNION}/mnt/livecd" ++ mount --bind "${NEW_ROOT}/mnt/cdrom" "${UNION}/mnt/cdrom" ++ ++ # Make sure fstab notes livecd is mounted ro. Makes system skip remount which fails on aufs $ ++ sed -e 's|\(.*\s/\s*tmpfs\s*\)defaults\(.*\)|\1defaults,ro\2|' "/${UNION}/etc/fstab" > "/${UNION}/etc/fstab.new" ++ mv "/${UNION}/etc/fstab.new" "/${UNION}/etc/fstab" ++ ++} ++ + setup_unionfs() { + local rw_dir=$1 + local ro_dir=$2 +diff -Nurp genkernel-3.4.10.906.orig/defaults/linuxrc genkernel-3.4.10.906/defaults/linuxrc +--- genkernel-3.4.10.906.orig/defaults/linuxrc 2009-02-04 14:30:48.000000000 +0100 ++++ genkernel-3.4.10.906/defaults/linuxrc 2009-08-11 19:19:48.949397441 +0200 +@@ -191,6 +191,9 @@ do + USE_UNIONFS_NORMAL=1 + fi + ;; ++ aufs) ++ USE_AUFS_NORMAL=1 ++ ;; + nounionfs) + USE_UNIONFS_NORMAL=0 + ;; +@@ -587,7 +588,13 @@ then + fi + + +- if [ "${USE_UNIONFS_NORMAL}" = '1' ] ++ if [ "${USE_AUFS_NORMAL}" -eq '1' ] ++ then ++ good_msg 'Setting up aufs mounts' ++ setup_aufs ++ CHROOT="${UNION}" ++ ++ elif [ "${USE_UNIONFS_NORMAL}" = '1' ] + then + setup_unionfs ${NEW_ROOT} ${NEW_ROOT}/${FS_LOCATION} + CHROOT=/union +@@ -636,10 +643,6 @@ then + fi + done + +- if [ "${DO_slowusb}" ] || [ "${FORCE_slowusb}" ] +- then +- sleep 10 +- fi + mkdir initramfs proc tmp sys 2>/dev/null + chmod 1777 tmp + +@@ -668,6 +671,11 @@ else + setup_unionfs /union_changes ${NEW_ROOT} + mkdir -p ${UNION}/tmp/.initrd + fi ++ if [ "${USE_AUFS_NORMAL}" -eq '1' ] ++ then ++ setup_aufs ++ mkdir -p ${UNION}/tmp/.initrd ++ fi + fi + + # Execute script on the cdrom just before boot to update things if necessary diff --git a/sys-kernel/genkernel/files/3.4.11/genkernel-3.4.11-branding.patch b/sys-kernel/genkernel/files/3.4.11/genkernel-3.4.11-branding.patch new file mode 100644 index 0000000..5be757a --- /dev/null +++ b/sys-kernel/genkernel/files/3.4.11/genkernel-3.4.11-branding.patch @@ -0,0 +1,68 @@ +diff -Nurp genkernel-3.4.10.906.orig/gen_bootloader.sh genkernel-3.4.10.906/gen_bootloader.sh +--- genkernel-3.4.10.906.orig/gen_bootloader.sh 2009-08-05 15:19:47.000000000 +0200 ++++ genkernel-3.4.10.906/gen_bootloader.sh 2009-08-11 18:40:03.292176371 +0200 +@@ -62,7 +62,7 @@ set_bootloader_grub() { + + # Add grub configuration to grub.conf + echo "# Genkernel generated entry, see GRUB documentation for details" >> ${GRUB_CONF} +- echo "title=Gentoo Linux ($KV)" >> ${GRUB_CONF} ++ echo "title=Genlink Linux ($KV)" >> ${GRUB_CONF} + if [ "${BUILD_INITRD}" -eq '0' ] + then + echo -e "\tkernel /kernel-${KNAME}-${ARCH}-${KV} root=${GRUB_ROOTFS}" >> ${GRUB_CONF} +@@ -139,7 +139,7 @@ set_bootloader_grub_duplicate_default() + sed -n 1,$((${startline}-1))p "${GRUB_CONF}" > "${GRUB_CONF_TMP}" + + # Put in our title +- echo "title=Gentoo Linux (${KV})" >> "${GRUB_CONF_TMP}" ++ echo "title=Genlink Linux (${KV})" >> "${GRUB_CONF_TMP}" + + # Pass the default entry (minus the title) through to the replacement function and pipe the output to GRUB_CONF_TMP + sed -n $((${startline}+1)),$((${stopline}-1))p "${GRUB_CONF}" | set_bootloader_grub_duplicate_default_replace_kernel_initrd >> "${GRUB_CONF_TMP}" +diff -Nurp genkernel-3.4.10.906.orig/gen_cmdline.sh genkernel-3.4.10.906/gen_cmdline.sh +--- genkernel-3.4.10.906.orig/gen_cmdline.sh 2009-08-05 15:19:47.000000000 +0200 ++++ genkernel-3.4.10.906/gen_cmdline.sh 2009-08-11 18:40:03.292176371 +0200 +@@ -2,7 +2,7 @@ + # $Id: 20380ac6f16d8c9be4dcfbfd6bc1e0b0ba1979b3 $ + + longusage() { +- echo "Gentoo Linux Genkernel ${GK_V}" ++ echo "Genlink/Gentoo Linux Genkernel ${GK_V}" + echo "Usage: " + echo " genkernel [options] action" + echo +@@ -136,7 +136,7 @@ longusage() { + } + + usage() { +- echo "Gentoo Linux Genkernel ${GK_V}" ++ echo "Genlink/Gentoo Linux Genkernel ${GK_V}" + echo "Usage: " + echo " genkernel [options] all" + echo +diff -Nurp genkernel-3.4.10.906.orig/genkernel genkernel-3.4.10.906/genkernel +--- genkernel-3.4.10.906.orig/genkernel 2009-08-05 15:22:28.000000000 +0200 ++++ genkernel-3.4.10.906/genkernel 2009-08-11 18:40:03.292176371 +0200 +@@ -93,7 +93,7 @@ then + fi + + clear_log +-NORMAL=${GOOD} print_info 1 "Gentoo Linux Genkernel; Version ${GK_V}${NORMAL}" ++NORMAL=${GOOD} print_info 1 "Genlink/Gentoo Linux Genkernel; Version ${GK_V}${NORMAL}" + print_info 1 "Running with options: ${Options}" + echo + +diff -Nurp genkernel-3.4.10.906.orig/netboot/linuxrc.x genkernel-3.4.10.906/netboot/linuxrc.x +--- genkernel-3.4.10.906.orig/netboot/linuxrc.x 2008-12-24 17:17:49.000000000 +0100 ++++ genkernel-3.4.10.906/netboot/linuxrc.x 2009-08-11 18:40:03.293490689 +0200 +@@ -249,8 +249,8 @@ SubGenius() { + GenMotd() { + echo -e "" > /etc/motd + echo -e "" >> /etc/motd +- echo -e "Gentoo Linux; http://www.gentoo.org/" >> /etc/motd +- echo -e " Copyright 2001-${CPYYEAR} Gentoo Foundation; Distributed under the GPL" >> /etc/motd ++ echo -e "Genlink Linux; http://linamh.disconnected-by-peer.at/wiki/Genlink/" >> /etc/motd ++ echo -e " Copyright 2004-${CPYYEAR} Genlink Linux; Distributed under the GPL" >> /etc/motd + echo -e "" >> /etc/motd + echo -e " Gentoo/${MYARCH} Netboot for ${MACHTYPE} Systems" >> /etc/motd + echo -e " ${BUILDDATE}" >> /etc/motd diff --git a/sys-kernel/genkernel/files/3.4.11/genkernel-3.4.11-btrfs-partial-support-bug-303529.patch b/sys-kernel/genkernel/files/3.4.11/genkernel-3.4.11-btrfs-partial-support-bug-303529.patch new file mode 100644 index 0000000..ed7651f --- /dev/null +++ b/sys-kernel/genkernel/files/3.4.11/genkernel-3.4.11-btrfs-partial-support-bug-303529.patch @@ -0,0 +1,12 @@ +--- genkernel-3.4.10.906.orig/defaults/linuxrc ++++ genkernel-3.4.10.906/defaults/linuxrc +@@ -229,6 +229,9 @@ + # Start device manager + start_dev_mgr + ++# start BTRFS volume detection ++[ -x /sbin/btrfsctl ] && /sbin/btrfsctl -a ++ + # Setup md device nodes if they dont exist + setup_md_device + diff --git a/sys-kernel/genkernel/files/3.4.11/genkernel-3.4.11-partial-fix-to-console-arg.patch b/sys-kernel/genkernel/files/3.4.11/genkernel-3.4.11-partial-fix-to-console-arg.patch new file mode 100644 index 0000000..11e1dfa --- /dev/null +++ b/sys-kernel/genkernel/files/3.4.11/genkernel-3.4.11-partial-fix-to-console-arg.patch @@ -0,0 +1,11 @@ +diff -Nurp genkernel-3.4.10.906.orig/defaults/linuxrc genkernel-3.4.10.906/defaults/linuxrc +--- genkernel-3.4.10.906.orig/defaults/linuxrc 2009-08-12 14:28:26.919151873 +0200 ++++ genkernel-3.4.10.906/defaults/linuxrc 2009-08-12 14:30:39.632271882 +0200 +@@ -132,6 +132,7 @@ do + # Redirect output to a specific tty + CONSOLE\=*|console\=*) + CONSOLE=`parse_opt "${x}"` ++ CONSOLE=`basename ${CONSOLE}` + # exec >${CONSOLE} <${CONSOLE} 2>&1 + ;; + # /dev/md diff --git a/sys-kernel/genkernel/files/3.4.11/genkernel-3.4.11-sdelay-compat.patch b/sys-kernel/genkernel/files/3.4.11/genkernel-3.4.11-sdelay-compat.patch new file mode 100644 index 0000000..acb7fea --- /dev/null +++ b/sys-kernel/genkernel/files/3.4.11/genkernel-3.4.11-sdelay-compat.patch @@ -0,0 +1,11 @@ +--- genkernel-3.4.10.906.orig/defaults/initrd.scripts ++++ genkernel-3.4.10.906/defaults/initrd.scripts +@@ -794,6 +794,8 @@ sdelay() { + if [ -n "${SDELAY}" ] + then + sleep ${SDELAY} ++ elif grep cdroot /proc/cmdline > /dev/null 2>&1; then ++ sleep 3 + else + sleep 1 + fi diff --git a/sys-kernel/genkernel/files/genkernel-crypt-config.patch b/sys-kernel/genkernel/files/genkernel-crypt-config.patch new file mode 100644 index 0000000..d67f102 --- /dev/null +++ b/sys-kernel/genkernel/files/genkernel-crypt-config.patch @@ -0,0 +1,19 @@ +diff -Nurp genkernel-3.4.10.907.orig/arch/x86/modules_load genkernel-3.4.10.907/arch/x86/modules_load +--- genkernel-3.4.10.907.orig/arch/x86/modules_load 2009-12-17 05:21:37.000000000 +0100 ++++ genkernel-3.4.10.907/arch/x86/modules_load 2010-04-10 21:53:00.590161869 +0200 +@@ -28,3 +28,5 @@ MODULES_USB="ehci-hcd uhci usb-ohci hid + # Filesystems + MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs fuse" + ++# Crypto stuff, required for Sabayon crypt installs ++MODULES_CRYPT="aes sha1 sha256 sha512 xts" +diff -Nurp genkernel-3.4.10.907.orig/arch/x86_64/modules_load genkernel-3.4.10.907/arch/x86_64/modules_load +--- genkernel-3.4.10.907.orig/arch/x86_64/modules_load 2009-12-17 05:21:37.000000000 +0100 ++++ genkernel-3.4.10.907/arch/x86_64/modules_load 2010-04-10 21:53:12.358096340 +0200 +@@ -26,3 +26,6 @@ MODULES_USB="ehci-hcd uhci usb-ohci hid + + # Filesystems + MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs fuse" ++ ++# Crypto stuff, required for Sabayon crypt installs ++MODULES_CRYPT="aes sha1 sha256 sha512 xts" diff --git a/sys-kernel/genkernel/files/genkernel.bash b/sys-kernel/genkernel/files/genkernel.bash new file mode 100644 index 0000000..ed6b1c1 --- /dev/null +++ b/sys-kernel/genkernel/files/genkernel.bash @@ -0,0 +1,73 @@ +# genkernel (8) completion +# Copyright 2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# Written by Aron Griffis + +_genkernel() +{ + declare cur prev genkernel_help actions params + COMPREPLY=() + cur=${COMP_WORDS[COMP_CWORD]} + prev=${COMP_WORDS[COMP_CWORD-1]} + + # extract initial list of params/actions from genkernel --help + genkernel_help=$(command genkernel --help) + actions=( $(<<<"$genkernel_help" sed -n \ + '/^Available Actions:/,/^$/s/^[[:space:]]\+\([^[:space:]]\+\).*/\1/p') ) + params=( $(<<<"$genkernel_help" egrep -oe '--[^[:space:]]{2,}') ) + + # attempt to complete the current parameter based on the list + COMPREPLY=($(compgen -W "${params[*]/=*/=} ${actions[*]}" -- "$cur")) + + # if we don't have a rhs to complete + if [[ ${#COMPREPLY[@]} -gt 1 ]]; then + return + elif [[ ${#COMPREPLY[@]} -eq 0 && $cur != --*=* ]]; then + return + elif [[ ${#COMPREPLY[@]} -eq 1 && $COMPREPLY != --*= ]]; then + # using nospace completion, add an explicit space + COMPREPLY="${COMPREPLY} " + return + fi + + # we have a unique lhs and need to complete the rhs + declare args lhs rhs + if [[ ${#COMPREPLY[@]} -eq 1 ]]; then + lhs=$COMPREPLY + else + lhs=${cur%%=*}= + rhs=${cur#*=} + fi + + # genkernel's help gives clues as to what belongs on the rhs. + # extract the clue for the current parameter + args=" ${params[*]} " + args="${args##* $lhs}" + args="${args%% *}" + + # generate a list of completions for the argument; this replaces args with + # an array of results + args=( $(case $args in + ('<0-5>') compgen -W "$(echo {1..5})" -- "$rhs" ;; + (''|'') compgen -A file -o plusdirs -- "$rhs" ;; + ('') compgen -A directory -S / -- "$rhs" ;; + ('') compgen -G '*.tbz2' -G '*.tar.bz2' -o plusdirs -- "$rhs" ;; + (*) compgen -o bashdefault -- "$rhs" ;; # punt + esac) ) + + # we're using nospace completion to prevent spaces after paths that aren't + # "done" yet. So do some hacking to the args to add spaces after + # non-directories. + declare slash=/ + args=( "${args[@]/%/ }" ) # add space to all + args=( "${args[@]/%$slash /$slash}" ) # remove space from dirs + + # recreate COMPREPLY + if [[ $cur == "$lhs"* ]]; then + COMPREPLY=( "${args[@]}" ) + elif [[ ${#args[@]} -gt 0 ]]; then + COMPREPLY=( "${args[@]/#/$lhs}" ) + fi +} + +complete -o nospace -F _genkernel genkernel diff --git a/sys-kernel/genkernel/genkernel-3.4.10.907-r3.ebuild b/sys-kernel/genkernel/genkernel-3.4.10.907-r3.ebuild new file mode 100644 index 0000000..95688dc --- /dev/null +++ b/sys-kernel/genkernel/genkernel-3.4.10.907-r3.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.10.907.ebuild,v 1.1 2009/12/17 04:37:13 robbat2 Exp $ + +# genkernel-9999 -> latest SVN +# genkernel-9999.REV -> use SVN REV +# genkernel-VERSION -> normal genkernel release + +VERSION_BUSYBOX='1.7.4' +VERSION_DMAP='1.02.22' +VERSION_DMRAID='1.0.0.rc14' +VERSION_E2FSPROGS='1.41.9' +VERSION_FUSE='2.7.4' +VERSION_ISCSI='2.0-871' +VERSION_LVM='2.02.28' +VERSION_UNIONFS_FUSE='0.22' + +MY_HOME="http://wolf31o2.org" +RH_HOME="ftp://sources.redhat.com/pub" +DM_HOME="http://people.redhat.com/~heinzm/sw/dmraid/src" +BB_HOME="http://www.busybox.net/downloads" + +COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2 + ${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2 + ${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz + ${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz + ${RH_HOME}/dm/device-mapper.${VERSION_DMAP}.tgz + ${RH_HOME}/dm/old/device-mapper.${VERSION_DMAP}.tgz + ${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2 + http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz + mirror://sourceforge/e2fsprogs/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz + mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz + http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2" + +if [[ ${PV} == 9999* ]] +then + [[ ${PV} == 9999.* ]] && ESVN_UPDATE_CMD="svn up -r ${PV/9999./}" + EGIT_REPO_URI="git://git.wolf31o2.org/projs/genkernel.git" + #EGIT_BRANCH='' + inherit git bash-completion eutils + S="${WORKDIR}/${PN}" + SRC_URI="${COMMON_URI}" +else + inherit bash-completion eutils + SRC_URI="mirror://gentoo/${P}.tar.bz2 + ${MY_HOME}/sources/genkernel/${P}.tar.bz2 + ${COMMON_URI}" +fi + +DESCRIPTION="Gentoo automatic kernel building scripts" +HOMEPAGE="http://www.gentoo.org" + +LICENSE="GPL-2" +SLOT="0" +RESTRICT="" +# Please don't touch individual KEYWORDS. Since this is maintained/tested by +# Release Engineering, it's easier for us to deal with all arches at once. +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +#KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86" +#KEYWORDS="" +IUSE="ibm selinux" + +DEPEND="sys-fs/e2fsprogs + selinux? ( sys-libs/libselinux )" +RDEPEND="${DEPEND} app-arch/cpio" + +src_unpack() { + if [[ ${PV} == 9999* ]] ; then + git_src_unpack + else + unpack ${P}.tar.bz2 + fi + use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh + + cd "${S}" + # Add unionfs/aufs support. + for i in ${FILESDIR}/3.4.11/*.patch; do + epatch "${i}" + done + # Add crypt support + epatch "${FILESDIR}"/${PN}-crypt-config.patch + +} + +src_install() { + # This block updates genkernel.conf + sed \ + -e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \ + -e "s:VERSION_DMAP:$VERSION_DMAP:" \ + -e "s:VERSION_DMRAID:$VERSION_DMRAID:" \ + -e "s:VERSION_E2FSPROGS:$VERSION_E2FSPROGS:" \ + -e "s:VERSION_FUSE:$VERSION_FUSE:" \ + -e "s:VERSION_ISCSI:$VERSION_ISCSI:" \ + -e "s:VERSION_LVM:$VERSION_LVM:" \ + -e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \ + "${S}"/genkernel.conf > "${T}"/genkernel.conf \ + || die "Could not adjust versions" + insinto /etc + doins "${T}"/genkernel.conf || die "doins genkernel.conf" + + doman genkernel.8 || die "doman" + dodoc AUTHORS ChangeLog README TODO || die "dodoc" + + dobin genkernel || die "dobin genkernel" + + rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf + + insinto /usr/share/genkernel + doins -r "${S}"/* || die "doins" + use ibm && cp "${S}"/ppc64/kernel-2.6-pSeries "${S}"/ppc64/kernel-2.6 || \ + cp "${S}"/arch/ppc64/kernel-2.6.g5 "${S}"/arch/ppc64/kernel-2.6 + + # Copy files to /var/cache/genkernel/src + elog "Copying files to /var/cache/genkernel/src..." + mkdir -p "${D}"/var/cache/genkernel/src + cp -f \ + "${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2 \ + "${DISTDIR}"/LVM2.${VERSION_LVM}.tgz \ + "${DISTDIR}"/device-mapper.${VERSION_DMAP}.tgz \ + "${DISTDIR}"/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz \ + "${DISTDIR}"/busybox-${VERSION_BUSYBOX}.tar.bz2 \ + "${DISTDIR}"/fuse-${VERSION_FUSE}.tar.gz \ + "${DISTDIR}"/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2 \ + "${DISTDIR}"/open-iscsi-${VERSION_ISCSI}.tar.gz \ + "${D}"/var/cache/genkernel/src || die "Copying distfiles..." + + dobashcompletion "${FILESDIR}"/genkernel.bash +} + +pkg_postinst() { + echo + elog 'Documentation is available in the genkernel manual page' + elog 'as well as the following URL:' + echo + elog 'http://www.gentoo.org/doc/en/genkernel.xml' + echo + ewarn "This package is known to not work with reiser4. If you are running" + ewarn "reiser4 and have a problem, do not file a bug. We know it does not" + ewarn "work and we don't plan on fixing it since reiser4 is the one that is" + ewarn "broken in this regard. Try using a sane filesystem like ext3 or" + ewarn "even reiser3." + echo + ewarn "The LUKS support has changed from versions prior to 3.4.4. Now," + ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah." + echo + + bash-completion_pkg_postinst +} diff --git a/sys-kernel/linux-buffalo_ls_pro_live/linux-buffalo_ls_pro_live-2.6.35.ebuild b/sys-kernel/linux-buffalo_ls_pro_live/linux-buffalo_ls_pro_live-2.6.35.ebuild index c8ecde8..e19c8fd 100644 --- a/sys-kernel/linux-buffalo_ls_pro_live/linux-buffalo_ls_pro_live-2.6.35.ebuild +++ b/sys-kernel/linux-buffalo_ls_pro_live/linux-buffalo_ls_pro_live-2.6.35.ebuild @@ -4,9 +4,8 @@ ETYPE="sources" K_NASPATCHES_VER="3" K_KERNEL_PATCH_VER="7" -K_KERNEL_SOURCES_PKG="sys-kernel/linux-nas-sources-${PVR}" K_NASKERNEL_URI_CONFIG="yes" inherit nas-kernel KEYWORDS="~arm" -DESCRIPTION="Official Genlink Buffalo Linkstation Pro/Live Linux Server kernel image" +DESCRIPTION="Official Genlink Buffalo Linkstation Pro/Live Linux kernel image" RESTRICT="mirror" diff --git a/sys-kernel/linux-buffalo_ls_xhl/linux-buffalo_ls_xhl-2.6.35-r1.ebuild b/sys-kernel/linux-buffalo_ls_xhl/linux-buffalo_ls_xhl-2.6.35-r1.ebuild index 00b8fc1..43557bf 100644 --- a/sys-kernel/linux-buffalo_ls_xhl/linux-buffalo_ls_xhl-2.6.35-r1.ebuild +++ b/sys-kernel/linux-buffalo_ls_xhl/linux-buffalo_ls_xhl-2.6.35-r1.ebuild @@ -4,7 +4,6 @@ ETYPE="sources" K_NASPATCHES_VER="1" K_KERNEL_PATCH_VER="7" -K_KERNEL_SOURCES_PKG="sys-kernel/linux-nas-sources-${PVR}" K_NASKERNEL_URI_CONFIG="yes" inherit nas-kernel KEYWORDS="~arm" diff --git a/sys-kernel/linux-firmwares/Manifest b/sys-kernel/linux-firmwares/Manifest new file mode 100644 index 0000000..dbf110d --- /dev/null +++ b/sys-kernel/linux-firmwares/Manifest @@ -0,0 +1,6 @@ +DIST 2.6.35-9.tar.bz2 262028 RMD160 f396aeadc5a5a7bd1a8ecbcf56259157c1555ccf SHA1 7fbd88f36626517e08e18fa57fa2ee08a38e0858 SHA256 94995e8df57acff81c0393dc047d8c5e430c23c815a52d1c3127ca7048fa8413 +DIST linux-2.6.35.tar.bz2 69305709 RMD160 f5d91abb4fa72fac812578d830b22180d85a0e6f SHA1 4cb1fbfbeedcd658ca37739679c65dfaa136bf4e SHA256 18b2e2c336032e366c942622b77302cb05fc034fb19018f086a4ebc9ed41bfcf +DIST patch-2.6.35.3.bz2 39766 RMD160 de90d8444497c1eaa222cf9df6e81f35a388423e SHA1 38717af633669750bc7e65508ae7253de3c5c527 SHA256 94d321099f20f47dc681304a630391322e0e4d6672bb1106a621e6347c44db83 +DIST sabayon-2.6.35-r5-amd64.config 116173 RMD160 92791e5a35b24af194c42028efad2093d5041b5b SHA1 d9ccc66b5b844e6dca922a2920a98fefc632a891 SHA256 580bf67b069038fcccf250500ae4bc2df212f194491983a0dc2302f66df6f0fa +DIST sabayon-2.6.35-r5-x86.config 121509 RMD160 8a4410bf1127fc92626993daaeada9dd98a5e868 SHA1 ecb676d13bc8e39ba7b30d2573dfca76b5a50555 SHA256 d3623c92fadae87ddfa88062f3b6758865a374079aaed9081076dc7743f12664 +EBUILD linux-firmwares-2.6.35-r5.ebuild 481 RMD160 d897fa4c8ed06a083eb5303721c79c047b26b963 SHA1 ab9841c75b8a15863008550bdc3c0f1da22edbe7 SHA256 6ab6fe8d336bcc3d64686c0d50e98742e4f6f2c7419921d850047600e85eac5c diff --git a/sys-kernel/linux-firmwares/linux-firmwares-2.6.35.ebuild b/sys-kernel/linux-firmwares/linux-firmwares-2.6.35.ebuild new file mode 100644 index 0000000..ce43984 --- /dev/null +++ b/sys-kernel/linux-firmwares/linux-firmwares-2.6.35.ebuild @@ -0,0 +1,15 @@ +# Copyright 2004-2010 Sabayon Linux +# Distributed under the terms of the GNU General Public License v2 + +ETYPE="sources" +K_NASPATCHES_VER="3" +K_KERNEL_PATCH_VER="7" +K_NASKERNEL_URI_CONFIG="yes" +# Doesn't make any difference, but a valid kernel .config +# file is required in order to build kernel firmwares +K_SABKERNEL_NAME="buffalo_ls_pro_live" +K_FIRMWARE_PACKAGE="1" +inherit nas-kernel +KEYWORDS="~arm" +DESCRIPTION="Linux Kernel firmwares from kernel.org tarballs" +RESTRICT="mirror" diff --git a/sys-kernel/nas-sources/ChangeLog b/sys-kernel/nas-sources/ChangeLog deleted file mode 100644 index 2394ffa..0000000 --- a/sys-kernel/nas-sources/ChangeLog +++ /dev/null @@ -1,13 +0,0 @@ -# ChangeLog for sys-kernel/nas-sources -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 17 Oct 2010; Mario Fetka - nas-sources-2.6.35-r1.ebuild: - no depend - - 17 Oct 2010; Mario Fetka - +nas-sources-2.6.35-r1.ebuild, -nas-sources-2.6.35-r6.ebuild, - +metadata.xml: - initial ebuild for the nas sources - diff --git a/sys-kernel/nas-sources/Manifest b/sys-kernel/nas-sources/Manifest deleted file mode 100644 index 893a0b5..0000000 --- a/sys-kernel/nas-sources/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -DIST linux-2.6.35.tar.bz2 69305709 RMD160 f5d91abb4fa72fac812578d830b22180d85a0e6f SHA1 4cb1fbfbeedcd658ca37739679c65dfaa136bf4e SHA256 18b2e2c336032e366c942622b77302cb05fc034fb19018f086a4ebc9ed41bfcf -DIST nas-patches-2.6.35-1.tar.bz2 505500 RMD160 ce158370e8dc40246511fe3acd56f3ebe60f289e SHA1 bcd9c86c98031ecc0d42300735562efe1e72c0f8 SHA256 229aecb5fc2fb86447402949908940788094ad1423c4d7155eba7bb1e6aefc5e -DIST patch-2.6.35.7.bz2 141728 RMD160 fbde02939d58fe2f9fd9f3fae1141a08e00c2f4a SHA1 e898d93008cecdd429a9332b148eda2b446b9fd5 SHA256 e917d593b975853be4118934c35919936dec6069b35c277d26e7e85e88af062e -DIST server-2.6.35-r1-arm.config 121641 RMD160 ec930e27853aba07fec610e8d859d609a94201af SHA1 203d7191be89daffd7c829f84b9c5eed0a89e6b5 SHA256 a757eada636d38a845ccafbdc14a001cf79154d0f89e79efa880ea58b1131e3a -EBUILD nas-sources-2.6.35-r1.ebuild 346 RMD160 09a7432a3c7d1acb1f4ab7e2f1e4863dfd7f6f2c SHA1 06944d4d845c81524f1b4a79fbf19ec48b68858f SHA256 a59b92175da448acb68889361b63ed7ab7aaa0689397e3d159266944602d9736 -MISC ChangeLog 389 RMD160 63d335f8ea2901716c2d739665ab4cf2296c82bc SHA1 201f9ba2de82a93ad71126515c7e47d4b66d812a SHA256 a8214f0b3dfa47c6ed6962a817269482de9448c5d67b25766d072216c6dbd03a -MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 diff --git a/sys-kernel/nas-sources/metadata.xml b/sys-kernel/nas-sources/metadata.xml deleted file mode 100644 index 46a44e5..0000000 --- a/sys-kernel/nas-sources/metadata.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - -no-herd - - @gentoo.org - - - - - diff --git a/sys-kernel/nas-sources/nas-sources-2.6.35-r1.ebuild b/sys-kernel/nas-sources/nas-sources-2.6.35-r1.ebuild deleted file mode 100644 index e966d43..0000000 --- a/sys-kernel/nas-sources/nas-sources-2.6.35-r1.ebuild +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2004-2010 Sabayon Linux -# Distributed under the terms of the GNU General Public License v2 - -ETYPE="sources" -K_NASPATCHES_VER="1" -K_KERNEL_PATCH_VER="7" -K_NASKERNEL_NAME="server" -K_NASKERNEL_URI_CONFIG="yes" -K_ONLY_SOURCES="1" -inherit nas-kernel -KEYWORDS="~arm" -DESCRIPTION="Official NAS Linux Server kernel sources" -RESTRICT="mirror"