* [gentoo-catalyst] [PATCH 01/17] livecdfs-update: No tmpfs on /lib/firmware
2014-03-22 17:02 [gentoo-catalyst] 2.X bugfixes Brian Dolbec
@ 2014-03-22 17:02 ` Brian Dolbec
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 02/17] update-modules doesn't exists anymore Brian Dolbec
` (16 subsequent siblings)
17 siblings, 0 replies; 20+ messages in thread
From: Brian Dolbec @ 2014-03-22 17:02 UTC (permalink / raw
To: gentoo-catalyst
From: Douglas Freed <dwfreed@mtu.edu>
As of a while ago, we no longer ship a separate firmware tarball, so we
don't need a tmpfs for /lib/firmware anymore, so let's stop mounting
one. Fixes firmware issues with current minimal install ISOs.
---
targets/support/livecdfs-update.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 2b41f9d..b017baf 100644
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -101,7 +101,6 @@ echo "####################################################" >> /etc/fstab
# fstab tweaks
echo "tmpfs / tmpfs defaults 0 0" >> /etc/fstab
-echo "tmpfs /lib/firmware tmpfs defaults 0 0" >> /etc/fstab
echo "tmpfs /usr/portage tmpfs defaults 0 0" >> /etc/fstab
# If /usr/lib/X11/xkb/compiled then make it tmpfs
if [ -d /usr/lib/X11/xkb/compiled ]
--
1.8.5.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-catalyst] [PATCH 02/17] update-modules doesn't exists anymore.
2014-03-22 17:02 [gentoo-catalyst] 2.X bugfixes Brian Dolbec
2014-03-22 17:02 ` [gentoo-catalyst] [PATCH 01/17] livecdfs-update: No tmpfs on /lib/firmware Brian Dolbec
@ 2014-03-22 17:03 ` Brian Dolbec
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 03/17] depscan.sh " Brian Dolbec
` (15 subsequent siblings)
17 siblings, 0 replies; 20+ messages in thread
From: Brian Dolbec @ 2014-03-22 17:03 UTC (permalink / raw
To: gentoo-catalyst
From: Guy Martin <gmsoft@gentoo.org>
---
targets/support/kmerge.sh | 2 --
1 file changed, 2 deletions(-)
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index ef3eb2e..8e832e1 100644
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -245,8 +245,6 @@ SUB=`grep ^SUBLEVEL\ \= /usr/src/linux/Makefile | awk '{ print $3 };'`
EXV=`grep ^EXTRAVERSION\ \= /usr/src/linux/Makefile | sed -e "s/EXTRAVERSION =//" -e "s/ //g"`
clst_fudgeuname=${VER}.${PAT}.${SUB}${EXV}
-/sbin/update-modules --assume-kernel=${clst_fudgeuname}
-
unset USE
echo ${clst_kernel_use} > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE
--
1.8.5.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-catalyst] [PATCH 03/17] depscan.sh doesn't exists anymore.
2014-03-22 17:02 [gentoo-catalyst] 2.X bugfixes Brian Dolbec
2014-03-22 17:02 ` [gentoo-catalyst] [PATCH 01/17] livecdfs-update: No tmpfs on /lib/firmware Brian Dolbec
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 02/17] update-modules doesn't exists anymore Brian Dolbec
@ 2014-03-22 17:03 ` Brian Dolbec
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 04/17] /etc/conf.d/rc " Brian Dolbec
` (14 subsequent siblings)
17 siblings, 0 replies; 20+ messages in thread
From: Brian Dolbec @ 2014-03-22 17:03 UTC (permalink / raw
To: gentoo-catalyst
From: Guy Martin <gmsoft@gentoo.org>
---
targets/support/post-kmerge.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/targets/support/post-kmerge.sh b/targets/support/post-kmerge.sh
index c17680c..58b2e08 100644
--- a/targets/support/post-kmerge.sh
+++ b/targets/support/post-kmerge.sh
@@ -7,6 +7,5 @@ source /tmp/chroot-functions.sh
# Only run depscan.sh if modules exist
if [ -n "$(ls /lib/modules)" ]
then
- /sbin/depscan.sh
find /lib/modules -name modules.dep -exec touch {} \;
fi
--
1.8.5.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-catalyst] [PATCH 04/17] /etc/conf.d/rc doesn't exists anymore.
2014-03-22 17:02 [gentoo-catalyst] 2.X bugfixes Brian Dolbec
` (2 preceding siblings ...)
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 03/17] depscan.sh " Brian Dolbec
@ 2014-03-22 17:03 ` Brian Dolbec
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 05/17] Fix merging kernel without kerncache enabled Brian Dolbec
` (13 subsequent siblings)
17 siblings, 0 replies; 20+ messages in thread
From: Brian Dolbec @ 2014-03-22 17:03 UTC (permalink / raw
To: gentoo-catalyst
From: Guy Martin <gmsoft@gentoo.org>
---
targets/support/livecdfs-update.sh | 6 ------
1 file changed, 6 deletions(-)
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index b017baf..1f924c3 100644
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -11,12 +11,6 @@ then
/etc/ssh/sshd_config
fi
-# Turn off udev tarball
-sed -i 's:RC_DEVICE_TARBALL="yes":RC_DEVICE_TARBALL="no":' /etc/conf.d/rc
-
-# Turn off udev coldplugging
-sed -i 's:RC_COLDPLUG="yes":RC_COLDPLUG="no":' /etc/conf.d/rc
-
# Clean up the time and set to UTC
rm -rf /etc/localtime
cp /usr/share/zoneinfo/UTC /etc/localtime
--
1.8.5.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-catalyst] [PATCH 05/17] Fix merging kernel without kerncache enabled.
2014-03-22 17:02 [gentoo-catalyst] 2.X bugfixes Brian Dolbec
` (3 preceding siblings ...)
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 04/17] /etc/conf.d/rc " Brian Dolbec
@ 2014-03-22 17:03 ` Brian Dolbec
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 06/17] Rename System.map in a way that it won't be matched if multiple kernel are used Brian Dolbec
` (12 subsequent siblings)
17 siblings, 0 replies; 20+ messages in thread
From: Brian Dolbec @ 2014-03-22 17:03 UTC (permalink / raw
To: gentoo-catalyst
From: Guy Martin <gmsoft@gentoo.org>
This is the proper fix for building kernels without kerncache.
It prevents the creation of kerncache specific files and does not check for them.
Build with kerncache require the later patch to work.
Conflicts:
targets/support/kmerge.sh
---
targets/support/kmerge.sh | 109 +++++++++++++++++++++++++---------------------
1 file changed, 59 insertions(+), 50 deletions(-)
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 8e832e1..fac6e9c 100644
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -109,7 +109,7 @@ genkernel_compile(){
else
genkernel ${GK_ARGS} || exit 1
fi
- if [ -e /var/tmp/${clst_kname}.config ]
+ if [ -n "${clst_KERNCACHE}" -a -e /var/tmp/${clst_kname}.config ]
then
md5sum /var/tmp/${clst_kname}.config | awk '{print $1}' > \
/tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG
@@ -144,63 +144,58 @@ fi
# USE variables (and thus different patches enabled/disabled.) Also, there's no
# real benefit in using the pkgcache for kernel source ebuilds.
-USE_MATCH=0
-if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE ]
+
+# Check if we have a match in kerncach
+
+if [ -n "${clst_KERNCACHE}" ]
then
- STR1=$(for i in `cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE`; do echo $i; done|sort)
- STR2=$(for i in ${clst_kernel_use}; do echo $i; done|sort)
- if [ "${STR1}" = "${STR2}" ]
+
+ USE_MATCH=0
+ if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE ]
then
- #echo "USE Flags match"
- USE_MATCH=1
- else
- if [ -n "${clst_KERNCACHE}" ]
+ STR1=$(for i in `cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE`; do echo $i; done|sort)
+ STR2=$(for i in ${clst_kernel_use}; do echo $i; done|sort)
+ if [ "${STR1}" = "${STR2}" ]
then
- [ -d /tmp/kerncache/${clst_kname}/ebuilds ] && \
- rm -r /tmp/kerncache/${clst_kname}/ebuilds
- [ -e /tmp/kerncache/${clst_kname}/usr/src/linux/.config ] && \
- rm /tmp/kerncache/${clst_kname}/usr/src/linux/.config
+ #echo "USE Flags match"
+ USE_MATCH=1
+ else
+ [ -d /tmp/kerncache/${clst_kname}/ebuilds ] && \
+ rm -r /tmp/kerncache/${clst_kname}/ebuilds
+ [ -e /tmp/kerncache/${clst_kname}/usr/src/linux/.config ] && \
+ rm /tmp/kerncache/${clst_kname}/usr/src/linux/.config
fi
fi
-fi
-EXTRAVERSION_MATCH=0
-if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION ]
-then
- STR1=`cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION`
- STR2=${clst_kextraversion}
- if [ "${STR1}" = "${STR2}" ]
+ EXTRAVERSION_MATCH=0
+ if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION ]
then
- if [ -n "${clst_KERNCACHE}" ]
+ STR1=`cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION`
+ STR2=${clst_kextraversion}
+ if [ "${STR1}" = "${STR2}" ]
then
#echo "EXTRAVERSION match"
EXTRAVERSION_MATCH=1
fi
fi
-fi
-CONFIG_MATCH=0
-if [ -n "${clst_KERNCACHE}" -a \
- -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG ]
-then
- if [ ! -e /var/tmp/${clst_kname}.config ]
+ CONFIG_MATCH=0
+ if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG ]
then
- CONFIG_MATCH=1
- else
- STR1=`cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG`
- STR2=`md5sum /var/tmp/${clst_kname}.config|awk '{print $1}'`
- if [ "${STR1}" = "${STR2}" ]
+ if [ ! -e /var/tmp/${clst_kname}.config ]
then
CONFIG_MATCH=1
+ else
+ STR1=`cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG`
+ STR2=`md5sum /var/tmp/${clst_kname}.config|awk '{print $1}'`
+ if [ "${STR1}" = "${STR2}" ]
+ then
+ CONFIG_MATCH=1
+ fi
fi
fi
-fi
-[ -e /etc/portage/make.conf ] && \
- echo "USE=\"\${USE} ${clst_kernel_use} \"" >> /etc/portage/make.conf
-
-if [ -n "${clst_KERNCACHE}" ]
-then
+ # Create the kerncache directory if it doesn't exists
mkdir -p /tmp/kerncache/${clst_kname}
clst_root_path=/tmp/kerncache/${clst_kname} PKGDIR=${PKGDIR} clst_myemergeopts="--quiet --update --newuse" run_merge "${clst_ksource}" || exit 1
KERNELVERSION=`portageq best_visible / "${clst_ksource}"`
@@ -216,26 +211,39 @@ then
fi
[ -L /usr/src/linux ] && rm -f /usr/src/linux
ln -s /tmp/kerncache/${clst_kname}/usr/src/linux /usr/src/linux
+
+ # If catalyst has set to a empty string, extraversion wasn't specified so we
+ # skip this part
+ if [ "${EXTRAVERSION_MATCH}" = "0" ]
+ then
+ if [ ! "${clst_kextraversion}" = "" ]
+ then
+ echo "Setting extraversion to ${clst_kextraversion}"
+ sed -i -e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1-${clst_kextraversion}:" /usr/src/linux/Makefile
+ echo ${clst_kextraversion} > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION
+ else
+ touch /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION
+ fi
+ fi
+
else
[ -L /usr/src/linux ] && rm -f /usr/src/linux
run_merge "${clst_ksource}" || exit 1
-fi
-make_destpath
-
-# If catalyst has set to a empty string, extraversion wasn't specified so we
-# skip this part
-if [ "${EXTRAVERSION_MATCH}" = "0" ]
-then
if [ ! "${clst_kextraversion}" = "" ]
then
echo "Setting extraversion to ${clst_kextraversion}"
sed -i -e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1-${clst_kextraversion}:" /usr/src/linux/Makefile
- echo ${clst_kextraversion} > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION
- else
- touch /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION
fi
fi
+
+# Update USE flag in make.conf
+[ -e ${clst_make_conf} ] && \
+ echo "USE=\"\${USE} ${clst_kernel_use} build\"" >> ${clst_make_conf}
+
+make_destpath
+
+
build_kernel
sed -i "/USE=\"\${USE} ${clst_kernel_use} \"/d" /etc/portage/make.conf
# grep out the kernel version so that we can do our modules magic
@@ -246,11 +254,12 @@ EXV=`grep ^EXTRAVERSION\ \= /usr/src/linux/Makefile | sed -e "s/EXTRAVERSION =//
clst_fudgeuname=${VER}.${PAT}.${SUB}${EXV}
unset USE
-echo ${clst_kernel_use} > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE
if [ -n "${clst_KERNCACHE}" ]
then
+ echo ${clst_kernel_use} > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE
+
if [ -e /etc/portage/profile/package.provided ]
then
sed -i "/^$(echo "${KERNELVERSION}" | sed -e 's|/|\\/|g')\$/d" /etc/portage/profile/package.provided
--
1.8.5.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-catalyst] [PATCH 06/17] Rename System.map in a way that it won't be matched if multiple kernel are used.
2014-03-22 17:02 [gentoo-catalyst] 2.X bugfixes Brian Dolbec
` (4 preceding siblings ...)
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 05/17] Fix merging kernel without kerncache enabled Brian Dolbec
@ 2014-03-22 17:03 ` Brian Dolbec
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 07/17] Allow kernelopts as a valid value for kernels Brian Dolbec
` (11 subsequent siblings)
17 siblings, 0 replies; 20+ messages in thread
From: Brian Dolbec @ 2014-03-22 17:03 UTC (permalink / raw
To: gentoo-catalyst
From: Guy Martin <gmsoft@gentoo.org>
The System.map-version file gets renamed to System.map-${kname}.
This causes some trouble when you have more than one kernel as the file from
the previous kernel will be matched as well. To prevent that, I change
the naming slightly.
---
targets/support/functions.sh | 4 ++--
targets/support/netboot2-final.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index 80e371c..b4335a5 100644
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -106,9 +106,9 @@ extract_kernels() {
mv ${1}/initramfs-* ${1}/${x}.igz
fi
- if [ -e ${1}/System.map-* ];
+ if [ -e ${1}/System.map-* ]
then
- mv ${1}/System.map-* ${1}/System.map-${x}
+ mv ${1}/System.map-* ${1}/System-${x}.map
fi
done
}
diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
index 2ee207e..7f85538 100644
--- a/targets/support/netboot2-final.sh
+++ b/targets/support/netboot2-final.sh
@@ -14,7 +14,7 @@ mkdir ${clst_target_path}kernels/misc
for x in ${clst_boot_kernel}; do
mv ${clst_target_path}boot/${x} ${clst_target_path}kernels
mv ${clst_target_path}boot/${x}.igz ${clst_target_path}kernels/misc
- mv ${clst_target_path}boot/System.map* ${clst_target_path}kernels/misc/System.map-${x}
+ mv ${clst_target_path}boot/System-${x}.map ${clst_target_path}kernels/misc
done
rmdir ${clst_target_path}boot
--
1.8.5.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-catalyst] [PATCH 07/17] Allow kernelopts as a valid value for kernels.
2014-03-22 17:02 [gentoo-catalyst] 2.X bugfixes Brian Dolbec
` (5 preceding siblings ...)
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 06/17] Rename System.map in a way that it won't be matched if multiple kernel are used Brian Dolbec
@ 2014-03-22 17:03 ` Brian Dolbec
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 08/17] Make use of _kernelopts for hppa Brian Dolbec
` (10 subsequent siblings)
17 siblings, 0 replies; 20+ messages in thread
From: Brian Dolbec @ 2014-03-22 17:03 UTC (permalink / raw
To: gentoo-catalyst
From: Guy Martin <gmsoft@gentoo.org>
---
modules/generic_stage_target.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 37d1fa1..530f7ee 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -579,6 +579,7 @@ class generic_stage_target(generic_target):
self.valid_values.append("boot/kernel/"+x+"/softlevel")
self.valid_values.append("boot/kernel/"+x+"/use")
self.valid_values.append("boot/kernel/"+x+"/packages")
+ self.valid_values.append("boot/kernel/"+x+"/kernelopts")
if "boot/kernel/"+x+"/packages" in addlargs:
if type(addlargs["boot/kernel/"+x+\
"/packages"])==types.StringType:
--
1.8.5.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-catalyst] [PATCH 08/17] Make use of _kernelopts for hppa.
2014-03-22 17:02 [gentoo-catalyst] 2.X bugfixes Brian Dolbec
` (6 preceding siblings ...)
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 07/17] Allow kernelopts as a valid value for kernels Brian Dolbec
@ 2014-03-22 17:03 ` Brian Dolbec
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 09/17] Fix and improve kernel build when kerncache is enabled Brian Dolbec
` (9 subsequent siblings)
17 siblings, 0 replies; 20+ messages in thread
From: Brian Dolbec @ 2014-03-22 17:03 UTC (permalink / raw
To: gentoo-catalyst
From: Guy Martin <gmsoft@gentoo.org>
Since hppa only support one command line for both 32 and 64bit kernel,
we merge both kernelopts in the same line.
This is useful for adding extra arguments like 'panic=30' directly in
the spec file.
Brian Dolbec: fix whitepace error.
---
targets/support/bootloader-setup.sh | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index a0bc5f5..a9c9e53 100644
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -47,7 +47,14 @@ case ${clst_hostarch} in
# Make sure we strip the extension to the kernel to allow palo to choose
boot_kernel_common_name=${first/%32/}
boot_kernel_common_name=${boot_kernel_common_name/%64/}
- echo "--commandline=0/${boot_kernel_common_name} initrd=${first}.igz root=/dev/ram0 init=/linuxrc cdroot ${cmdline_opts}" >> ${icfg}
+
+ for x in ${clst_boot_kernel}
+ do
+ eval kopts=\$clst_boot_kernel_${x}_kernelopts
+ my_kopts="${my_kopts} ${kopts}"
+ done
+
+ echo "--commandline=0/${boot_kernel_common_name} initrd=${first}.igz ${default_append_line} ${my_kopts}" >> ${icfg}
echo "--bootloader=boot/iplboot" >> ${icfg}
echo "--ramdisk=boot/${first}.igz" >> ${icfg}
for x in ${clst_boot_kernel}
--
1.8.5.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-catalyst] [PATCH 09/17] Fix and improve kernel build when kerncache is enabled.
2014-03-22 17:02 [gentoo-catalyst] 2.X bugfixes Brian Dolbec
` (7 preceding siblings ...)
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 08/17] Make use of _kernelopts for hppa Brian Dolbec
@ 2014-03-22 17:03 ` Brian Dolbec
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 10/17] Don't make cdtar mandatory Brian Dolbec
` (8 subsequent siblings)
17 siblings, 0 replies; 20+ messages in thread
From: Brian Dolbec @ 2014-03-22 17:03 UTC (permalink / raw
To: gentoo-catalyst
From: Guy Martin <gmsoft@gentoo.org>
This patch gets rid of setting ROOT for merging kernel sources. Instead, the
sources are moved manually to the kerncache directory. A new file is created
containing the kernel version and it is fed into package.provided to prevent
merging the kernel sources again.
Brian Dolbec: fix whitespace error.
Conflicts:
targets/support/kmerge.sh
---
targets/support/kmerge.sh | 38 ++++++++++++++++++++++++++++++--------
1 file changed, 30 insertions(+), 8 deletions(-)
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index fac6e9c..c1b6a35 100644
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -197,8 +197,17 @@ then
# Create the kerncache directory if it doesn't exists
mkdir -p /tmp/kerncache/${clst_kname}
- clst_root_path=/tmp/kerncache/${clst_kname} PKGDIR=${PKGDIR} clst_myemergeopts="--quiet --update --newuse" run_merge "${clst_ksource}" || exit 1
- KERNELVERSION=`portageq best_visible / "${clst_ksource}"`
+
+
+ if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.KERNELVERSION ]
+ then
+ KERNELVERSION=$(</tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.KERNELVERSION)
+ mkdir -p /etc/portage/profile
+ echo "${KERNELVERSION}" > /etc/portage/profile/package.provided
+ else
+ rm -f /etc/portage/profile/package.provided
+ fi
+
if [ ! -e /etc/portage/profile/package.provided ]
then
mkdir -p /etc/portage/profile
@@ -209,8 +218,26 @@ then
echo "${KERNELVERSION}" >> /etc/portage/profile/package.provided
fi
fi
+
[ -L /usr/src/linux ] && rm -f /usr/src/linux
- ln -s /tmp/kerncache/${clst_kname}/usr/src/linux /usr/src/linux
+
+ PKGDIR=${PKGDIR} clst_myemergeopts="--quiet --nodeps --update --newuse" run_merge "${clst_ksource}" || exit 1
+
+ SOURCESDIR="/tmp/kerncache/${clst_kname}/sources"
+ if [ -L /usr/src/linux ]
+ then
+
+ # A kernel was merged, move it to $SOURCESDIR
+ [ -e ${SOURCESDIR} ] && rm -Rf ${SOURCESDIR}
+
+ KERNELVERSION=`portageq best_visible / "${clst_ksource}"`
+ echo "${KERNELVERSION}" > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.KERNELVERSION
+
+ echo "Moving kernel sources to ${SOURCESDIR} ..."
+ mv `readlink -f /usr/src/linux` ${SOURCESDIR}
+
+ fi
+ ln -sf ${SOURCESDIR} /usr/src/linux
# If catalyst has set to a empty string, extraversion wasn't specified so we
# skip this part
@@ -259,9 +286,4 @@ unset USE
if [ -n "${clst_KERNCACHE}" ]
then
echo ${clst_kernel_use} > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE
-
- if [ -e /etc/portage/profile/package.provided ]
- then
- sed -i "/^$(echo "${KERNELVERSION}" | sed -e 's|/|\\/|g')\$/d" /etc/portage/profile/package.provided
- fi
fi
--
1.8.5.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-catalyst] [PATCH 10/17] Don't make cdtar mandatory.
2014-03-22 17:02 [gentoo-catalyst] 2.X bugfixes Brian Dolbec
` (8 preceding siblings ...)
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 09/17] Fix and improve kernel build when kerncache is enabled Brian Dolbec
@ 2014-03-22 17:03 ` Brian Dolbec
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 11/17] Use the system's iplboot to be sure it matches palo's version Brian Dolbec
` (7 subsequent siblings)
17 siblings, 0 replies; 20+ messages in thread
From: Brian Dolbec @ 2014-03-22 17:03 UTC (permalink / raw
To: gentoo-catalyst
From: Guy Martin <gmsoft@gentoo.org>
On hppa, we don't need cdtar.
---
targets/support/functions.sh | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index b4335a5..311ed7b 100644
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -51,8 +51,12 @@ extract_cdtar() {
# which will normally contains a pre-built binary
# boot-loader/filesystem skeleton for the ISO.
cdtar=${clst_cdtar}
- [ -z "${cdtar}" ] && die "Required key cdtar not defined, exiting"
- tar -I lbzip2 -xpf ${cdtar} -C $1 || die "Couldn't extract cdtar ${cdtar}"
+ if [ -z "${cdtar}" ]
+ then
+ echo "No cdtar specified. Skipping."
+ else
+ tar -I lbzip2 -xpf ${cdtar} -C $1 || die "Couldn't extract cdtar ${cdtar}"
+ fi
}
extract_kernels() {
--
1.8.5.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-catalyst] [PATCH 11/17] Use the system's iplboot to be sure it matches palo's version.
2014-03-22 17:02 [gentoo-catalyst] 2.X bugfixes Brian Dolbec
` (9 preceding siblings ...)
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 10/17] Don't make cdtar mandatory Brian Dolbec
@ 2014-03-22 17:03 ` Brian Dolbec
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 12/17] Remove unused hppa cdtar Brian Dolbec
` (6 subsequent siblings)
17 siblings, 0 replies; 20+ messages in thread
From: Brian Dolbec @ 2014-03-22 17:03 UTC (permalink / raw
To: gentoo-catalyst
From: Guy Martin <gmsoft@gentoo.org>
For hppa, cdtar is a bad idea because the iplboot version in the tar file
might not match palo's version.
---
targets/support/bootloader-setup.sh | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index a9c9e53..f3e0e62 100644
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -41,6 +41,8 @@ case ${clst_hostarch} in
;;
hppa)
# NO SOFTLEVEL SUPPORT YET
+ mkdir -p $1/boot
+
icfg=$1/boot/palo.conf
kmsg=$1/boot/kernels.msg
hmsg=$1/boot/help.msg
@@ -54,6 +56,9 @@ case ${clst_hostarch} in
my_kopts="${my_kopts} ${kopts}"
done
+ # copy the bootloader for the final image
+ cp /usr/share/palo/iplboot $1/boot/
+
echo "--commandline=0/${boot_kernel_common_name} initrd=${first}.igz ${default_append_line} ${my_kopts}" >> ${icfg}
echo "--bootloader=boot/iplboot" >> ${icfg}
echo "--ramdisk=boot/${first}.igz" >> ${icfg}
--
1.8.5.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-catalyst] [PATCH 12/17] Remove unused hppa cdtar.
2014-03-22 17:02 [gentoo-catalyst] 2.X bugfixes Brian Dolbec
` (10 preceding siblings ...)
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 11/17] Use the system's iplboot to be sure it matches palo's version Brian Dolbec
@ 2014-03-22 17:03 ` Brian Dolbec
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 13/17] chmod +x all sh scripts so they can run from the git checkout Brian Dolbec
` (5 subsequent siblings)
17 siblings, 0 replies; 20+ messages in thread
From: Brian Dolbec @ 2014-03-22 17:03 UTC (permalink / raw
To: gentoo-catalyst
From: Guy Martin <gmsoft@gentoo.org>
This file is now useless.
---
livecd/cdtar/palo-1.5_pre20040515-cdtar.tar.bz2 | Bin 17399 -> 0 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
delete mode 100644 livecd/cdtar/palo-1.5_pre20040515-cdtar.tar.bz2
diff --git a/livecd/cdtar/palo-1.5_pre20040515-cdtar.tar.bz2 b/livecd/cdtar/palo-1.5_pre20040515-cdtar.tar.bz2
deleted file mode 100644
index cec72ce55fe7ed7e911ac068a53cb2c4bec64f6d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 17399
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
--
1.8.5.3
^ permalink raw reply [flat|nested] 20+ messages in thread* [gentoo-catalyst] [PATCH 13/17] chmod +x all sh scripts so they can run from the git checkout
2014-03-22 17:02 [gentoo-catalyst] 2.X bugfixes Brian Dolbec
` (11 preceding siblings ...)
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 12/17] Remove unused hppa cdtar Brian Dolbec
@ 2014-03-22 17:03 ` Brian Dolbec
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 14/17] chmod +x targets/stage1/build.py Brian Dolbec
` (4 subsequent siblings)
17 siblings, 0 replies; 20+ messages in thread
From: Brian Dolbec @ 2014-03-22 17:03 UTC (permalink / raw
To: gentoo-catalyst
---
targets/embedded/embedded-chroot.sh | 0
targets/embedded/embedded-controller.sh | 0
targets/embedded/embedded-fs-runscript.sh | 0
targets/embedded/embedded-preclean-chroot.sh | 0
targets/embedded/unmerge.sh | 0
targets/grp/grp-chroot.sh | 0
targets/grp/grp-controller.sh | 0
targets/grp/grp-preclean-chroot.sh | 0
targets/livecd-stage1/livecd-stage1-chroot.sh | 0
targets/livecd-stage1/livecd-stage1-controller.sh | 0
targets/livecd-stage1/livecd-stage1-preclean-chroot.sh | 0
targets/livecd-stage2/livecd-stage2-controller.sh | 0
targets/netboot/netboot-chroot.sh | 0
targets/netboot/netboot-combine.sh | 0
targets/netboot/netboot-controller.sh | 0
targets/netboot/netboot-image.sh | 0
targets/netboot2/netboot2-controller.sh | 0
targets/netboot2/netboot2-copyfile.sh | 0
targets/netboot2/netboot2-pkg.sh | 0
targets/stage1/stage1-chroot.sh | 0
targets/stage1/stage1-controller.sh | 0
targets/stage1/stage1-preclean-chroot.sh | 0
targets/stage2/stage2-chroot.sh | 0
targets/stage2/stage2-controller.sh | 0
targets/stage2/stage2-preclean-chroot.sh | 0
targets/stage3/stage3-chroot.sh | 0
targets/stage3/stage3-controller.sh | 0
targets/stage3/stage3-preclean-chroot.sh | 0
targets/stage4/stage4-chroot.sh | 0
targets/stage4/stage4-controller.sh | 0
targets/stage4/stage4-preclean-chroot.sh | 0
targets/support/bootloader-setup.sh | 0
targets/support/chroot-functions.sh | 0
targets/support/create-iso.sh | 0
targets/support/filesystem-functions.sh | 0
targets/support/functions.sh | 0
targets/support/kill-chroot-pids.sh | 0
targets/support/kmerge.sh | 0
targets/support/livecdfs-update.sh | 0
targets/support/mips-arcload_conf.sh | 0
targets/support/netboot2-final.sh | 0
targets/support/post-kmerge.sh | 0
targets/support/pre-kmerge.sh | 0
targets/support/rc-update.sh | 0
targets/support/target_image_setup.sh | 0
targets/support/unmerge.sh | 0
targets/tinderbox/tinderbox-chroot.sh | 0
targets/tinderbox/tinderbox-controller.sh | 0
targets/tinderbox/tinderbox-preclean-chroot.sh | 0
49 files changed, 0 insertions(+), 0 deletions(-)
mode change 100644 => 100755 targets/embedded/embedded-chroot.sh
mode change 100644 => 100755 targets/embedded/embedded-controller.sh
mode change 100644 => 100755 targets/embedded/embedded-fs-runscript.sh
mode change 100644 => 100755 targets/embedded/embedded-preclean-chroot.sh
mode change 100644 => 100755 targets/embedded/unmerge.sh
mode change 100644 => 100755 targets/grp/grp-chroot.sh
mode change 100644 => 100755 targets/grp/grp-controller.sh
mode change 100644 => 100755 targets/grp/grp-preclean-chroot.sh
mode change 100644 => 100755 targets/livecd-stage1/livecd-stage1-chroot.sh
mode change 100644 => 100755 targets/livecd-stage1/livecd-stage1-controller.sh
mode change 100644 => 100755 targets/livecd-stage1/livecd-stage1-preclean-chroot.sh
mode change 100644 => 100755 targets/livecd-stage2/livecd-stage2-controller.sh
mode change 100644 => 100755 targets/netboot/netboot-chroot.sh
mode change 100644 => 100755 targets/netboot/netboot-combine.sh
mode change 100644 => 100755 targets/netboot/netboot-controller.sh
mode change 100644 => 100755 targets/netboot/netboot-image.sh
mode change 100644 => 100755 targets/netboot2/netboot2-controller.sh
mode change 100644 => 100755 targets/netboot2/netboot2-copyfile.sh
mode change 100644 => 100755 targets/netboot2/netboot2-pkg.sh
mode change 100644 => 100755 targets/stage1/stage1-chroot.sh
mode change 100644 => 100755 targets/stage1/stage1-controller.sh
mode change 100644 => 100755 targets/stage1/stage1-preclean-chroot.sh
mode change 100644 => 100755 targets/stage2/stage2-chroot.sh
mode change 100644 => 100755 targets/stage2/stage2-controller.sh
mode change 100644 => 100755 targets/stage2/stage2-preclean-chroot.sh
mode change 100644 => 100755 targets/stage3/stage3-chroot.sh
mode change 100644 => 100755 targets/stage3/stage3-controller.sh
mode change 100644 => 100755 targets/stage3/stage3-preclean-chroot.sh
mode change 100644 => 100755 targets/stage4/stage4-chroot.sh
mode change 100644 => 100755 targets/stage4/stage4-controller.sh
mode change 100644 => 100755 targets/stage4/stage4-preclean-chroot.sh
mode change 100644 => 100755 targets/support/bootloader-setup.sh
mode change 100644 => 100755 targets/support/chroot-functions.sh
mode change 100644 => 100755 targets/support/create-iso.sh
mode change 100644 => 100755 targets/support/filesystem-functions.sh
mode change 100644 => 100755 targets/support/functions.sh
mode change 100644 => 100755 targets/support/kill-chroot-pids.sh
mode change 100644 => 100755 targets/support/kmerge.sh
mode change 100644 => 100755 targets/support/livecdfs-update.sh
mode change 100644 => 100755 targets/support/mips-arcload_conf.sh
mode change 100644 => 100755 targets/support/netboot2-final.sh
mode change 100644 => 100755 targets/support/post-kmerge.sh
mode change 100644 => 100755 targets/support/pre-kmerge.sh
mode change 100644 => 100755 targets/support/rc-update.sh
mode change 100644 => 100755 targets/support/target_image_setup.sh
mode change 100644 => 100755 targets/support/unmerge.sh
mode change 100644 => 100755 targets/tinderbox/tinderbox-chroot.sh
mode change 100644 => 100755 targets/tinderbox/tinderbox-controller.sh
mode change 100644 => 100755 targets/tinderbox/tinderbox-preclean-chroot.sh
diff --git a/targets/embedded/embedded-chroot.sh b/targets/embedded/embedded-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-controller.sh b/targets/embedded/embedded-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-fs-runscript.sh b/targets/embedded/embedded-fs-runscript.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/embedded-preclean-chroot.sh b/targets/embedded/embedded-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/embedded/unmerge.sh b/targets/embedded/unmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-controller.sh b/targets/grp/grp-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/grp/grp-preclean-chroot.sh b/targets/grp/grp-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh b/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-chroot.sh b/targets/netboot/netboot-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-combine.sh b/targets/netboot/netboot-combine.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-controller.sh b/targets/netboot/netboot-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot/netboot-image.sh b/targets/netboot/netboot-image.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-controller.sh b/targets/netboot2/netboot2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-copyfile.sh b/targets/netboot2/netboot2-copyfile.sh
old mode 100644
new mode 100755
diff --git a/targets/netboot2/netboot2-pkg.sh b/targets/netboot2/netboot2-pkg.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-controller.sh b/targets/stage2/stage2-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage2/stage2-preclean-chroot.sh b/targets/stage2/stage2-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-controller.sh b/targets/stage3/stage3-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage3/stage3-preclean-chroot.sh b/targets/stage3/stage3-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-chroot.sh b/targets/stage4/stage4-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-controller.sh b/targets/stage4/stage4-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/stage4/stage4-preclean-chroot.sh b/targets/stage4/stage4-preclean-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
old mode 100644
new mode 100755
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
old mode 100644
new mode 100755
diff --git a/targets/support/filesystem-functions.sh b/targets/support/filesystem-functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
old mode 100644
new mode 100755
diff --git a/targets/support/kill-chroot-pids.sh b/targets/support/kill-chroot-pids.sh
old mode 100644
new mode 100755
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
old mode 100644
new mode 100755
diff --git a/targets/support/mips-arcload_conf.sh b/targets/support/mips-arcload_conf.sh
old mode 100644
new mode 100755
diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
old mode 100644
new mode 100755
diff --git a/targets/support/post-kmerge.sh b/targets/support/post-kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh
old mode 100644
new mode 100755
diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh
old mode 100644
new mode 100755
diff --git a/targets/support/unmerge.sh b/targets/support/unmerge.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-controller.sh b/targets/tinderbox/tinderbox-controller.sh
old mode 100644
new mode 100755
diff --git a/targets/tinderbox/tinderbox-preclean-chroot.sh b/targets/tinderbox/tinderbox-preclean-chroot.sh
old mode 100644
new mode 100755
--
1.8.5.3
^ permalink raw reply [flat|nested] 20+ messages in thread* [gentoo-catalyst] [PATCH 14/17] chmod +x targets/stage1/build.py
2014-03-22 17:02 [gentoo-catalyst] 2.X bugfixes Brian Dolbec
` (12 preceding siblings ...)
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 13/17] chmod +x all sh scripts so they can run from the git checkout Brian Dolbec
@ 2014-03-22 17:03 ` Brian Dolbec
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 15/17] Add more working files, directories to .gitignore Brian Dolbec
` (3 subsequent siblings)
17 siblings, 0 replies; 20+ messages in thread
From: Brian Dolbec @ 2014-03-22 17:03 UTC (permalink / raw
To: gentoo-catalyst
---
targets/stage1/build.py | 0
1 file changed, 0 insertions(+), 0 deletions(-)
mode change 100644 => 100755 targets/stage1/build.py
diff --git a/targets/stage1/build.py b/targets/stage1/build.py
old mode 100644
new mode 100755
--
1.8.5.3
^ permalink raw reply [flat|nested] 20+ messages in thread* [gentoo-catalyst] [PATCH 15/17] Add more working files, directories to .gitignore
2014-03-22 17:02 [gentoo-catalyst] 2.X bugfixes Brian Dolbec
` (13 preceding siblings ...)
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 14/17] chmod +x targets/stage1/build.py Brian Dolbec
@ 2014-03-22 17:03 ` Brian Dolbec
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 16/17] Fix undefined variable: RLIMIT_NOFILE Brian Dolbec
` (2 subsequent siblings)
17 siblings, 0 replies; 20+ messages in thread
From: Brian Dolbec @ 2014-03-22 17:03 UTC (permalink / raw
To: gentoo-catalyst
---
.gitignore | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.gitignore b/.gitignore
index 539da74..d52b297 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
*.py[co]
+dist
+build
+files
+MANIFEST
--
1.8.5.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-catalyst] [PATCH 16/17] Fix undefined variable: RLIMIT_NOFILE
2014-03-22 17:02 [gentoo-catalyst] 2.X bugfixes Brian Dolbec
` (14 preceding siblings ...)
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 15/17] Add more working files, directories to .gitignore Brian Dolbec
@ 2014-03-22 17:03 ` Brian Dolbec
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 17/17] Fix a relative path bug Brian Dolbec
2014-04-02 20:12 ` [gentoo-catalyst] 2.X bugfixes Brian Dolbec
17 siblings, 0 replies; 20+ messages in thread
From: Brian Dolbec @ 2014-03-22 17:03 UTC (permalink / raw
To: gentoo-catalyst
It was not imported from resource, it was also not used correctly.
---
modules/catalyst_support.py | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py
index 316dfa3..d493f88 100644
--- a/modules/catalyst_support.py
+++ b/modules/catalyst_support.py
@@ -6,14 +6,16 @@ selinux_capable = False
#fakeroot_capable = False
BASH_BINARY = "/bin/bash"
+# set it to 0 for the soft limit, 1 for the hard limit
+DESIRED_RLIMIT = 0
try:
- import resource
- max_fd_limit=resource.getrlimit(RLIMIT_NOFILE)
+ import resource
+ max_fd_limit=resource.getrlimit(resource.RLIMIT_NOFILE)[DESIRED_RLIMIT]
except SystemExit, e:
- raise
+ raise
except:
- # hokay, no resource module.
- max_fd_limit=256
+ # hokay, no resource module.
+ max_fd_limit=256
# pids this process knows of.
spawned_pids = []
--
1.8.5.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* [gentoo-catalyst] [PATCH 17/17] Fix a relative path bug
2014-03-22 17:02 [gentoo-catalyst] 2.X bugfixes Brian Dolbec
` (15 preceding siblings ...)
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 16/17] Fix undefined variable: RLIMIT_NOFILE Brian Dolbec
@ 2014-03-22 17:03 ` Brian Dolbec
2014-04-02 20:12 ` [gentoo-catalyst] 2.X bugfixes Brian Dolbec
17 siblings, 0 replies; 20+ messages in thread
From: Brian Dolbec @ 2014-03-22 17:03 UTC (permalink / raw
To: gentoo-catalyst
---
targets/support/functions.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index 311ed7b..fba855c 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -20,7 +20,7 @@ exec_in_chroot(){
# and executes it.
local file_name=$(basename ${1})
local subdir=${2}
- local destdir=".${subdir}/tmp"
+ local destdir="${subdir}/tmp"
echo "Copying ${file_name} to ${destdir}"
copy_to_chroot ${1} ${destdir}
@@ -33,7 +33,7 @@ exec_in_chroot(){
chmod +x ${chroot_path}/${destdir}/${file_name}
echo "Running ${file_name} in chroot ${chroot_path}"
- ${clst_CHROOT} ${chroot_path} ${destdir}/${file_name} || exit 1
+ ${clst_CHROOT} ${chroot_path} .${destdir}/${file_name} || exit 1
delete_from_chroot ${destdir}/${file_name}
delete_from_chroot ${destdir}/chroot-functions.sh
--
1.8.5.3
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [gentoo-catalyst] 2.X bugfixes
2014-03-22 17:02 [gentoo-catalyst] 2.X bugfixes Brian Dolbec
` (16 preceding siblings ...)
2014-03-22 17:03 ` [gentoo-catalyst] [PATCH 17/17] Fix a relative path bug Brian Dolbec
@ 2014-04-02 20:12 ` Brian Dolbec
2014-04-02 20:32 ` Rick "Zero_Chaos" Farina
17 siblings, 1 reply; 20+ messages in thread
From: Brian Dolbec @ 2014-04-02 20:12 UTC (permalink / raw
To: gentoo-catalyst
On Sat, 22 Mar 2014 10:02:58 -0700
Brian Dolbec <dolsen@gentoo.org> wrote:
> Due to the firmware bug fixed by the first patch in this series which
> needs to be released and used for production of install media. I took
> the opportunity To add all the other bug fixes from the pending and
> 3.0 branches. This includes a few convenience commits like the 2
> chmod ones. I would like to push these to the main repo and make a
> release.
>
> They are currently available for testing in my github account.
>
> git remote add dolsen-github git@github.com:dol-sen/catalyst.git
> git fetch dolsen-github
> git checkout dolsen-github/2.X
>
> [PATCH 01/17] livecdfs-update: No tmpfs on /lib/firmware
> [PATCH 02/17] update-modules doesn't exists anymore.
> [PATCH 03/17] depscan.sh doesn't exists anymore.
> [PATCH 04/17] /etc/conf.d/rc doesn't exists anymore.
> [PATCH 05/17] Fix merging kernel without kerncache enabled.
> [PATCH 06/17] Rename System.map in a way that it won't be matched if
> [PATCH 07/17] Allow kernelopts as a valid value for kernels.
> [PATCH 08/17] Make use of _kernelopts for hppa.
> [PATCH 09/17] Fix and improve kernel build when kerncache is enabled.
> [PATCH 10/17] Don't make cdtar mandatory.
> [PATCH 11/17] Use the system's iplboot to be sure it matches palo's
> [PATCH 12/17] Remove unused hppa cdtar.
> [PATCH 13/17] chmod +x all sh scripts so they can run from the git
> [PATCH 14/17] chmod +x targets/stage1/build.py
> [PATCH 15/17] Add more working files, directories to .gitignore
> [PATCH 16/17] Fix undefined variable: RLIMIT_NOFILE
> [PATCH 17/17] Fix a relative path bug
>
These have been pushed to the 2.X branch.
--
Brian Dolbec <dolsen>
^ permalink raw reply [flat|nested] 20+ messages in thread* Re: [gentoo-catalyst] 2.X bugfixes
2014-04-02 20:12 ` [gentoo-catalyst] 2.X bugfixes Brian Dolbec
@ 2014-04-02 20:32 ` Rick "Zero_Chaos" Farina
0 siblings, 0 replies; 20+ messages in thread
From: Rick "Zero_Chaos" Farina @ 2014-04-02 20:32 UTC (permalink / raw
To: gentoo-catalyst
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 04/02/2014 04:12 PM, Brian Dolbec wrote:
> On Sat, 22 Mar 2014 10:02:58 -0700
> Brian Dolbec <dolsen@gentoo.org> wrote:
>
>> Due to the firmware bug fixed by the first patch in this series which
>> needs to be released and used for production of install media. I took
>> the opportunity To add all the other bug fixes from the pending and
>> 3.0 branches. This includes a few convenience commits like the 2
>> chmod ones. I would like to push these to the main repo and make a
>> release.
>>
>> They are currently available for testing in my github account.
>>
>> git remote add dolsen-github git@github.com:dol-sen/catalyst.git
>> git fetch dolsen-github
>> git checkout dolsen-github/2.X
>>
>> [PATCH 01/17] livecdfs-update: No tmpfs on /lib/firmware
>> [PATCH 02/17] update-modules doesn't exists anymore.
>> [PATCH 03/17] depscan.sh doesn't exists anymore.
>> [PATCH 04/17] /etc/conf.d/rc doesn't exists anymore.
>> [PATCH 05/17] Fix merging kernel without kerncache enabled.
>> [PATCH 06/17] Rename System.map in a way that it won't be matched if
>> [PATCH 07/17] Allow kernelopts as a valid value for kernels.
>> [PATCH 08/17] Make use of _kernelopts for hppa.
>> [PATCH 09/17] Fix and improve kernel build when kerncache is enabled.
>> [PATCH 10/17] Don't make cdtar mandatory.
>> [PATCH 11/17] Use the system's iplboot to be sure it matches palo's
>> [PATCH 12/17] Remove unused hppa cdtar.
>> [PATCH 13/17] chmod +x all sh scripts so they can run from the git
>> [PATCH 14/17] chmod +x targets/stage1/build.py
>> [PATCH 15/17] Add more working files, directories to .gitignore
>> [PATCH 16/17] Fix undefined variable: RLIMIT_NOFILE
>> [PATCH 17/17] Fix a relative path bug
>>
>
> These have been pushed to the 2.X branch.
>
a little behind but ACK. Been testing this for a while now and seems fine.
- -Zero
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
iQIcBAEBAgAGBQJTPHP0AAoJEKXdFCfdEflKpB0QAJSmxB+/9k5R9HnTONRFKMaz
lON78A2KwgBBoQBon8sL1PBxW+ClerGLIFOhMrUgv5rwmcjTU0TmRZaq4Xm1BJiR
9haMag95vlHZImPyiw5IA+cue3/Y2X/0VjpBvuR5tsHHD3mVzGydTdvCqeY23Kmc
hbT8/0NUOFV2u6NWi3lU6gW4xqXVGb5gaVdaQHq6nfuUA7JdWfI5ZvnbWQJ7MOIT
53RTlnSwKWsbQMDbq2XqjBO96c3O8o/3Lxv3TuGwuMkgu2ZVGvFeWGqktwp5GBuO
cA6zejOtZkqArumMrHg0x4Fqvns+PyZ7vx7RRU6Coxr35W6GJS2BD1GHrzAUHHLI
pXUk6LA4XLBMg5NrOMGDvfRbLlZbxUxVzY2T0Puv+cB+m4rxdCSc81PlyKsRuPvM
R2Iu+nMp1wEF4SeOA6h9qeKLVMOVnq/9sOtCeYiilrWgjW4/2dQlm2/TJ2E9gjg/
W5b7NzkezaiAfTvZpEZbkID/6k0Qai5+DAn0gTg81qPKHq1DdWc4+Sa7nVzB80wP
IdRIwumzwsHFM48jRq8o7GCZLrfjwyhz0x+BFaBqDUEv/7eUxHR0TistQH6CAgc4
EIV1q5tUt0SAoFuhV3J00Wn32P7kELn+KLnpHxZEK6k2+AVvcsP+olQhxh8zCUUc
yY+NV1Ne75r3xcKR0Ihg
=z7kO
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 20+ messages in thread