From c9dc25bb55abb9ab410ddec8aa95ff383fe63c38 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Wed, 16 Mar 2011 15:55:15 +0100 Subject: [PATCH 1/4] docs: mention keyword InVCS in HACKING --- HACKING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HACKING b/HACKING index b379bf4..2626963 100644 --- a/HACKING +++ b/HACKING @@ -19,4 +19,4 @@ Rolling a release: - make dist - upload genkernel-${PV}.tar.bz2 to the hosting: scp genkernel-${PV}.tar.bz2 ${USER}@dev.gentoo.org:/space/distfiles-local/ -- check open bugs with keyword "InSVN" for closability +- check open bugs with keyword "InSVN" or "InVCS" for closability From c579bd11949a48c4757b64b561163951f829a4a6 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Tue, 22 Mar 2011 13:02:05 +0100 Subject: [PATCH 2/4] open-iscsi: fix compilation when openslp is installed. Two main issues: 1. open-iscsi build system, inside Makefile, user target, calls ./configure (which is very bad itself) without letting to choose configure options. Fixed in: open-iscsi-2.0.872-omg-calling-configure.patch 2. when openslp support is automagically enabled, -lslp didn't get added to compiler arguments. Fixed in: open-iscsi-2.0.872-slp.patch Peace. --- gen_compile.sh | 7 ++++++- .../open-iscsi-2.0.872-omg-calling-configure.patch | 11 +++++++++++ patches/iscsi/2.0-872/open-iscsi-2.0.872-slp.patch | 11 +++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 patches/iscsi/2.0-872/open-iscsi-2.0.872-omg-calling-configure.patch create mode 100644 patches/iscsi/2.0-872/open-iscsi-2.0.872-slp.patch diff --git a/gen_compile.sh b/gen_compile.sh index b60b921..00b5de9 100755 --- a/gen_compile.sh +++ b/gen_compile.sh @@ -685,10 +685,15 @@ compile_iscsi() { gen_die "ISCSI directory ${ISCSI_DIR} invalid" print_info 1 'iSCSI: >> Compiling...' cd "${TEMP}/${ISCSI_DIR}" + apply_patches iscsi ${ISCSI_VER} # Only build userspace + print_info 1 'iSCSI: >> Configuring userspace...' + cd utils/open-isns || gen_die 'Could not enter open-isns dir' + ./configure --without-slp >> ${LOGFILE} 2>&1 || gen_die 'Could not configure userspace' + cd ../.. || gen_die 'wtf?' MAKE=${UTILS_MAKE} compile_generic "user" "" - + # if kernel modules exist, copy them to initramfs, otherwise it will be compiled into the kernel mkdir -p "${TEMP}/initramfs-iscsi-temp/lib/modules/${RELEASE}/kernel/drivers/scsi/" for modname in iscsi_tcp libiscsi scsi_transport_iscsi diff --git a/patches/iscsi/2.0-872/open-iscsi-2.0.872-omg-calling-configure.patch b/patches/iscsi/2.0-872/open-iscsi-2.0.872-omg-calling-configure.patch new file mode 100644 index 0000000..185f1ac --- /dev/null +++ b/patches/iscsi/2.0-872/open-iscsi-2.0.872-omg-calling-configure.patch @@ -0,0 +1,11 @@ +--- open-iscsi-2.0-872.orig/Makefile ++++ open-iscsi-2.0-872/Makefile +@@ -27,7 +27,7 @@ IFACEFILES = etc/iface.example + all: user kernel + + user: ; +- cd utils/open-isns; ./configure; $(MAKE) ++ cd utils/open-isns; $(MAKE) + $(MAKE) -C utils/sysdeps + $(MAKE) -C utils/fwparam_ibft + $(MAKE) -C usr diff --git a/patches/iscsi/2.0-872/open-iscsi-2.0.872-slp.patch b/patches/iscsi/2.0-872/open-iscsi-2.0.872-slp.patch new file mode 100644 index 0000000..16658f3 --- /dev/null +++ b/patches/iscsi/2.0-872/open-iscsi-2.0.872-slp.patch @@ -0,0 +1,11 @@ +--- open-iscsi-2.0-872.orig/utils/open-isns/configure.ac ++++ open-iscsi-2.0-872/utils/open-isns/configure.ac +@@ -79,7 +79,7 @@ AC_ARG_WITH(slp, + WITH_SLP=$withval + else + WITH_SLP=yes +- CPPFLAGS="$CPPFLAGS -I${withval}" ++ CPPFLAGS="$CPPFLAGS -I${withval} -lslp" + LDFLAGS="$LDFLAGS -L${withval}" + fi + ] From ad2842f6701c0eea0666a4b2e510f1cd078de6fe Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Tue, 22 Mar 2011 19:23:59 +0100 Subject: [PATCH 3/4] iSCSI: open-iscsi patchwork: add -lslp to LDFLAGS, and properly call autoconf --- gen_compile.sh | 3 +++ patches/iscsi/2.0-872/open-iscsi-2.0.872-slp.patch | 14 +++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/gen_compile.sh b/gen_compile.sh index 00b5de9..ec752ce 100755 --- a/gen_compile.sh +++ b/gen_compile.sh @@ -690,6 +690,9 @@ compile_iscsi() { # Only build userspace print_info 1 'iSCSI: >> Configuring userspace...' cd utils/open-isns || gen_die 'Could not enter open-isns dir' + # we currently have a patch that changes configure.ac + # once given patch is dropped, drop autoconf too + autoconf || gen_die 'Could not tweak open-iscsi configuration' ./configure --without-slp >> ${LOGFILE} 2>&1 || gen_die 'Could not configure userspace' cd ../.. || gen_die 'wtf?' MAKE=${UTILS_MAKE} compile_generic "user" "" diff --git a/patches/iscsi/2.0-872/open-iscsi-2.0.872-slp.patch b/patches/iscsi/2.0-872/open-iscsi-2.0.872-slp.patch index 16658f3..51ca3e5 100644 --- a/patches/iscsi/2.0-872/open-iscsi-2.0.872-slp.patch +++ b/patches/iscsi/2.0-872/open-iscsi-2.0.872-slp.patch @@ -1,11 +1,11 @@ ---- open-iscsi-2.0-872.orig/utils/open-isns/configure.ac -+++ open-iscsi-2.0-872/utils/open-isns/configure.ac -@@ -79,7 +79,7 @@ AC_ARG_WITH(slp, - WITH_SLP=$withval +--- a/utils/open-isns/configure.ac ++++ b/utils/open-isns/configure.ac +@@ -80,7 +80,7 @@ AC_ARG_WITH(slp, else WITH_SLP=yes -- CPPFLAGS="$CPPFLAGS -I${withval}" -+ CPPFLAGS="$CPPFLAGS -I${withval} -lslp" - LDFLAGS="$LDFLAGS -L${withval}" + CPPFLAGS="$CPPFLAGS -I${withval}" +- LDFLAGS="$LDFLAGS -L${withval}" ++ LDFLAGS="$LDFLAGS -L${withval} -lslp" fi ] + ) From f3d1fe4a46885d138ad79924691d1b4de8131321 Mon Sep 17 00:00:00 2001 From: Ian Date: Thu, 24 Mar 2011 21:05:07 +0100 Subject: [PATCH 4/4] Fix typo "initamfs" --- doc/genkernel.8.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/genkernel.8.txt b/doc/genkernel.8.txt index a74df82..a78da11 100644 --- a/doc/genkernel.8.txt +++ b/doc/genkernel.8.txt @@ -130,7 +130,7 @@ KERNEL COMPILATION to the second most recently built image, if one exists. Similar symlinks (both * and *.old) are managed for initramfs and System.map. The corresponding work products (i.e., the actual kernel - and initamfs images, and System.map) are also managed accordingly. + and initramfs images, and System.map) are also managed accordingly. NOTE: Specifying *--symlink* does nothing unless *--install* is also specified.