Changes to 'refs/tags/livecd-tools-14.5'
by Brian C. Lane
Tag 'livecd-tools-14.5' created by Brian C. Lane <bcl(a)redhat.com> at 2011-09-29 18:08 +0000
Tag as livecd-tools-14.5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQEVAwUAToS0DBF+jBaO/jp/AQK0OAf9F3Mq5/Eg6ZZYvh2801S3MiGftoI9zTqA
C5WH7TtPhBsT4VdfgNbdgy8cP1s5suYDO8NogYzLyzVU6+WSjOrG+fo2Am8E9wYG
K6x25Lx5Ex96wN2uVwGMqrbh8j5n6OHeLq2fHgJdhbpnjGhyiOdhWkLemFX0WXVg
F+mdXyDVY0poCYZW9kjwXL5wSLvsTgHbjF1pqkV2IxeHc6NtdFXliN/cSvj0iWLs
Do/6Ow9i9fcaNNy/VUEcwYIjzOdAvMILxTWwNnxAyHbpV9Z6oi/zbA30RG22vNUj
uj3XIxfHuC9jm4e5v0RcOLOjw5vKjpsE48uabJ1nx5PCTNM0fZ266Q==
=mkAC
-----END PGP SIGNATURE-----
Changes since livecd-tools-14.4:
Brian C. Lane (5):
Add EFI support to netboot (#688258)
Add repo to DVD EFI install config file (#688258)
Add extracting BOOTX64.efi from iso (#688258)
Images go into $SYSLINUXPATH
Version 14.5
---
Makefile | 2 +-
tools/livecd-iso-to-disk.sh | 44 ++++++++++++++++++++++++++++++++++++++++----
2 files changed, 41 insertions(+), 5 deletions(-)
---
12 years
Branch 'f14-branch' - 5 commits - Makefile tools/livecd-iso-to-disk.sh
by Brian C. Lane
Makefile | 2 +-
tools/livecd-iso-to-disk.sh | 44 ++++++++++++++++++++++++++++++++++++++++----
2 files changed, 41 insertions(+), 5 deletions(-)
New commits:
commit b0279fe749e120404c1925723e4f0e6b516abbcd
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Thu Sep 29 11:08:01 2011 -0700
Version 14.5
diff --git a/Makefile b/Makefile
index b98b6eb..bd23bf8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-VERSION = 14.4
+VERSION = 14.5
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL}
commit 1628d668c610a0106a6cab242c6400fd92468b5a
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Wed Mar 23 14:06:25 2011 -0700
Images go into $SYSLINUXPATH
Now that syslinux version check is fixed they end up in the correct
place.
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 4e6eaad..e093759 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -799,8 +799,8 @@ if [ "$isotype" = "installer" ]; then
sed -i -e "s;initrd=initrd.img;initrd=initrd.img ${LANG:+LANG=$LANG} repo=hd:$USBLABEL:/;g" $BOOTCONFIG
sed -i -e "s;stage2=\S*;;g" $BOOTCONFIG
if [ -n "$efi" ]; then
- # Images are in / now
- sed -i -e "s;images/pxeboot/;;g" -e "s;vmlinuz;vmlinuz ${LANG:+LANG=$LANG} repo=hd:$USBLABEL:/;g" $BOOTCONFIG_EFI
+ # Images are in $SYSLINUXPATH now
+ sed -i -e "s;/images/pxeboot/;/$SYSLINUXPATH/;g" -e "s;vmlinuz;vmlinuz ${LANG:+LANG=$LANG} repo=hd:$USBLABEL:/;g" $BOOTCONFIG_EFI
fi
fi
@@ -811,11 +811,10 @@ if [ "$isotype" = "netinst" ]; then
else
# The initrd has everything, so no stage2
sed -i -e "s;stage2=\S*;;g" $BOOTCONFIG
-
- if [ -n "$efi" ]; then
- # Images are in / now
- sed -ie "s;images/pxeboot/;;g" $BOOTCONFIG_EFI
- fi
+ fi
+ if [ -n "$efi" ]; then
+ # Images are in $SYSLINUXPATH now
+ sed -ie "s;/images/pxeboot/;/$SYSLINUXPATH/;g" $BOOTCONFIG_EFI
fi
fi
commit 4d35c3c55a959f2ed593d89bbd238276c02b2014
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Thu Mar 17 14:11:43 2011 -0700
Add extracting BOOTX64.efi from iso (#688258)
Some iso's (RHEL6) don't have the BOOTX64.efi binary in /EFI/BOOT,
but it is in the eltorito image, so if it is missing from the iso
extract it from the eltorito using the dumpet utility.
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 8901b36..4e6eaad 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -755,6 +755,34 @@ if [ -n "$efi" ];then
# this is a little ugly, but it gets the "interesting" named config file
BOOTCONFIG_EFI=$USBMNT$EFI_BOOT/+(BOOT|boot)?*.conf
rm -f $USBMNT$EFI_BOOT/grub.conf
+
+ # On some images (RHEL) the BOOT*.efi file isn't in $EFI_BOOT, but is in
+ # the eltorito image, so try to extract it if it is missing
+
+ # test for presence of *.efi grub binary
+ if [ ! -f $USBMNT$EFI_BOOT/+(BOOT|boot)?*.efi ]; then
+ if [ ! -x /usr/bin/dumpet ]; then
+ echo "No /usr/bin/dumpet tool found. EFI image will not boot."
+ echo "Source media is missing grub binary in /EFI/BOOT/*efi"
+ exitclean
+ else
+ # dump the eltorito image with dumpet, output is $ISO.1
+ dumpet -i $ISO -d
+ EFIMNT=$(mktemp -d /media/srctmp.XXXXXX)
+ mount -o loop $ISO.1 $EFIMNT
+
+ if [ -f $EFIMNT$EFI_BOOT/+(BOOT|boot)?*.efi ]; then
+ cp $EFIMNT$EFI_BOOT/+(BOOT|boot)?*.efi $USBMNT$EFI_BOOT
+ else
+ echo "No BOOT*.efi found in eltorito image. EFI will not boot"
+ umount $EFIMNT
+ rm $ISO.1
+ exitclean
+ fi
+ umount $EFIMNT
+ rm $ISO.1
+ fi
+ fi
fi
echo "Updating boot config file"
commit 4b40c726fdffdb02c9fa5494f8b2b7c9c3318188
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Thu Mar 17 10:22:41 2011 -0700
Add repo to DVD EFI install config file (#688258)
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index f50c6d3..8901b36 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -770,6 +770,10 @@ if [ "$LIVEOS" != "LiveOS" ]; then sed -i -e "s;liveimg;liveimg live_dir=$LIVEOS
if [ "$isotype" = "installer" ]; then
sed -i -e "s;initrd=initrd.img;initrd=initrd.img ${LANG:+LANG=$LANG} repo=hd:$USBLABEL:/;g" $BOOTCONFIG
sed -i -e "s;stage2=\S*;;g" $BOOTCONFIG
+ if [ -n "$efi" ]; then
+ # Images are in / now
+ sed -i -e "s;images/pxeboot/;;g" -e "s;vmlinuz;vmlinuz ${LANG:+LANG=$LANG} repo=hd:$USBLABEL:/;g" $BOOTCONFIG_EFI
+ fi
fi
# DVD Installer for netinst
commit 6bb43719fa8a1a717782b0232421e56cf9dace0a
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Wed Mar 16 17:22:30 2011 -0700
Add EFI support to netboot (#688258)
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 9a311d6..f50c6d3 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -768,17 +768,22 @@ if [ "$LIVEOS" != "LiveOS" ]; then sed -i -e "s;liveimg;liveimg live_dir=$LIVEOS
# DVD Installer
if [ "$isotype" = "installer" ]; then
- sed -i -e "s;initrd=initrd.img;initrd=initrd.img ${LANG:+LANG=$LANG} repo=hd:$USBLABEL:/;g" $BOOTCONFIG $BOOTCONFIG_EFI
- sed -i -e "s;stage2=\S*;;g" $BOOTCONFIG $BOOTCONFIG_EFI
+ sed -i -e "s;initrd=initrd.img;initrd=initrd.img ${LANG:+LANG=$LANG} repo=hd:$USBLABEL:/;g" $BOOTCONFIG
+ sed -i -e "s;stage2=\S*;;g" $BOOTCONFIG
fi
# DVD Installer for netinst
if [ "$isotype" = "netinst" ]; then
if [ "$imgtype" = "install" ]; then
- sed -i -e "s;stage2=\S*;stage2=hd:$USBLABEL:/images/install.img;g" $BOOTCONFIG $BOOTCONFIG_EFI
+ sed -i -e "s;stage2=\S*;stage2=hd:$USBLABEL:/images/install.img;g" $BOOTCONFIG
else
# The initrd has everything, so no stage2
- sed -i -e "s;stage2=\S*;;g" $BOOTCONFIG $BOOTCONFIG_EFI
+ sed -i -e "s;stage2=\S*;;g" $BOOTCONFIG
+
+ if [ -n "$efi" ]; then
+ # Images are in / now
+ sed -ie "s;images/pxeboot/;;g" $BOOTCONFIG_EFI
+ fi
fi
fi
12 years
Changes to 'refs/tags/livecd-tools-15.10'
by Brian C. Lane
Tag 'livecd-tools-15.10' created by Brian C. Lane <bcl(a)redhat.com> at 2011-09-29 17:38 +0000
Tag as livecd-tools-15.10
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQEVAwUAToStGxF+jBaO/jp/AQL8AAf9HtTS9lSiH0lfnupiPWgUgKg+Zh77ayP3
eXhLqTJvergcYl6JfNwdIRow74NClShYBsqSSk6Ul4D8yUrQaiRzVfylaFWVhtfz
2YYeGCvKRC9AEwupwQBo3lH4V/LSk4oSyOLrXltNTH9lmSG/N35vgEcrcZqCG7WR
DlV8uLNbccSe8spZCj1VxvhEmSGB/GLudD7dZGwhlfucrjZTmB8ZJEhvLx3ulmZi
JA863UrmNMKzTdcA99s8Ou+lurWK4utN6SJlJR5D6ek84lNIVp5TOzcfiikluNNM
B06HSt2L62pq5+ItXpOpJanb1WEcNf4c8s6nMkeZNbANxCmaw14KEQ==
=brOu
-----END PGP SIGNATURE-----
Changes since livecd-tools-15.9:
Brian C. Lane (5):
Add EFI support to netboot (#688258)
Add repo to DVD EFI install config file (#688258)
Add extracting BOOTX64.efi from iso (#688258)
Images go into $SYSLINUXPATH
Version 15.10
---
Makefile | 2 +-
tools/livecd-iso-to-disk.sh | 44 ++++++++++++++++++++++++++++++++++++++++----
2 files changed, 41 insertions(+), 5 deletions(-)
---
12 years
Branch 'f15-branch' - 5 commits - Makefile tools/livecd-iso-to-disk.sh
by Brian C. Lane
Makefile | 2 +-
tools/livecd-iso-to-disk.sh | 44 ++++++++++++++++++++++++++++++++++++++++----
2 files changed, 41 insertions(+), 5 deletions(-)
New commits:
commit 64ddb70bda131b008b60df0135c20cd7769decc5
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Thu Sep 29 10:38:19 2011 -0700
Version 15.10
diff --git a/Makefile b/Makefile
index 02382e4..bfff6b5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-VERSION = 15.9
+VERSION = 15.10
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL}
commit 73a37a61bc514f75e0e438f378dad4beaeb46d25
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Wed Mar 23 14:06:25 2011 -0700
Images go into $SYSLINUXPATH
Now that syslinux version check is fixed they end up in the correct
place.
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index f3578dd..539efb5 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -1111,8 +1111,8 @@ if [ "$srctype" = "installer" ]; then
sed -i -e "s;initrd=initrd.img;initrd=initrd.img ${LANG:+LANG=$LANG} repo=hd:$TGTLABEL:/;g" $BOOTCONFIG
sed -i -e "s;stage2=\S*;;g" $BOOTCONFIG
if [ -n "$efi" ]; then
- # Images are in / now
- sed -i -e "s;images/pxeboot/;;g" -e "s;vmlinuz;vmlinuz ${LANG:+LANG=$LANG} repo=hd:$TGTLABEL:/;g" $BOOTCONFIG_EFI
+ # Images are in $SYSLINUXPATH now
+ sed -i -e "s;/images/pxeboot/;/$SYSLINUXPATH/;g" -e "s;vmlinuz;vmlinuz ${LANG:+LANG=$LANG} repo=hd:$TGTLABEL:/;g" $BOOTCONFIG_EFI
fi
fi
@@ -1123,11 +1123,10 @@ if [ "$srctype" = "netinst" ]; then
else
# The initrd has everything, so no stage2
sed -i -e "s;stage2=\S*;;g" $BOOTCONFIG
-
- if [ -n "$efi" ]; then
- # Images are in / now
- sed -ie "s;images/pxeboot/;;g" $BOOTCONFIG_EFI
- fi
+ fi
+ if [ -n "$efi" ]; then
+ # Images are in $SYSLINUXPATH now
+ sed -ie "s;/images/pxeboot/;/$SYSLINUXPATH/;g" $BOOTCONFIG_EFI
fi
fi
commit 9eb159ef8898620059c63927d7e384a7cb7f21b6
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Thu Mar 17 14:11:43 2011 -0700
Add extracting BOOTX64.efi from iso (#688258)
Some iso's (RHEL6) don't have the BOOTX64.efi binary in /EFI/BOOT,
but it is in the eltorito image, so if it is missing from the iso
extract it from the eltorito using the dumpet utility.
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 6a84b9d..f3578dd 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -1048,6 +1048,34 @@ if [ -n "$efi" ]; then
# this is a little ugly, but it gets the "interesting" named config file
BOOTCONFIG_EFI=$TGTMNT$EFI_BOOT/+(BOOT|boot)?*.conf
rm -f $TGTMNT$EFI_BOOT/grub.conf
+
+ # On some images (RHEL) the BOOT*.efi file isn't in $EFI_BOOT, but is in
+ # the eltorito image, so try to extract it if it is missing
+
+ # test for presence of *.efi grub binary
+ if [ ! -f $TGTMNT$EFI_BOOT/+(BOOT|boot)?*.efi ]; then
+ if [ ! -x /usr/bin/dumpet ]; then
+ echo "No /usr/bin/dumpet tool found. EFI image will not boot."
+ echo "Source media is missing grub binary in /EFI/BOOT/*efi"
+ exitclean
+ else
+ # dump the eltorito image with dumpet, output is $SRC.1
+ dumpet -i $SRC -d
+ EFIMNT=$(mktemp -d /media/srctmp.XXXXXX)
+ mount -o loop $SRC.1 $EFIMNT
+
+ if [ -f $EFIMNT$EFI_BOOT/+(BOOT|boot)?*.efi ]; then
+ cp $EFIMNT$EFI_BOOT/+(BOOT|boot)?*.efi $TGTMNT$EFI_BOOT
+ else
+ echo "No BOOT*.efi found in eltorito image. EFI will not boot"
+ umount $EFIMNT
+ rm $SRC.1
+ exitclean
+ fi
+ umount $EFIMNT
+ rm $SRC.1
+ fi
+ fi
fi
if [[ live == $srctype ]]; then
commit 9292c0215f3b2f9cd149cf63b5169784d30eea27
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Thu Mar 17 10:22:41 2011 -0700
Add repo to DVD EFI install config file (#688258)
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index e085e6f..6a84b9d 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -1082,6 +1082,10 @@ fi
if [ "$srctype" = "installer" ]; then
sed -i -e "s;initrd=initrd.img;initrd=initrd.img ${LANG:+LANG=$LANG} repo=hd:$TGTLABEL:/;g" $BOOTCONFIG
sed -i -e "s;stage2=\S*;;g" $BOOTCONFIG
+ if [ -n "$efi" ]; then
+ # Images are in / now
+ sed -i -e "s;images/pxeboot/;;g" -e "s;vmlinuz;vmlinuz ${LANG:+LANG=$LANG} repo=hd:$TGTLABEL:/;g" $BOOTCONFIG_EFI
+ fi
fi
# DVD Installer for netinst
commit 8b3d835964c3764318e469dfe47bc31a0f5a44f6
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Wed Mar 16 17:22:30 2011 -0700
Add EFI support to netboot (#688258)
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 580473d..e085e6f 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -1080,17 +1080,22 @@ fi
# DVD Installer
if [ "$srctype" = "installer" ]; then
- sed -i -e "s;initrd=initrd.img;initrd=initrd.img ${LANG:+LANG=$LANG} repo=hd:$TGTLABEL:/;g" $BOOTCONFIG $BOOTCONFIG_EFI
- sed -i -e "s;stage2=\S*;;g" $BOOTCONFIG $BOOTCONFIG_EFI
+ sed -i -e "s;initrd=initrd.img;initrd=initrd.img ${LANG:+LANG=$LANG} repo=hd:$TGTLABEL:/;g" $BOOTCONFIG
+ sed -i -e "s;stage2=\S*;;g" $BOOTCONFIG
fi
# DVD Installer for netinst
if [ "$srctype" = "netinst" ]; then
if [ "$imgtype" = "install" ]; then
- sed -i -e "s;stage2=\S*;stage2=hd:$TGTLABEL:/images/install.img;g" $BOOTCONFIG $BOOTCONFIG_EFI
+ sed -i -e "s;stage2=\S*;stage2=hd:$TGTLABEL:/images/install.img;g" $BOOTCONFIG
else
# The initrd has everything, so no stage2
- sed -i -e "s;stage2=\S*;;g" $BOOTCONFIG $BOOTCONFIG_EFI
+ sed -i -e "s;stage2=\S*;;g" $BOOTCONFIG
+
+ if [ -n "$efi" ]; then
+ # Images are in / now
+ sed -ie "s;images/pxeboot/;;g" $BOOTCONFIG_EFI
+ fi
fi
fi
12 years
Error creating Live CD : Failed to build transaction : openspeedshop-2.0.1-3.x86_64 requires libopenss-cli.so.0()(64bit)
by Jim Galarowicz
Hi all,
I'm back for my yearly attempt at making an OpenSpeedShop liveCD to
distribute at the SuperComputing conference.
I'm having trouble with a dso that is built in my own tool
(OpenSpeedShop, www.openspeedshop.org), but rpm installs flag the "so.0"
variant to be not provided.
I believe the automake option in the makefile is creating
libopenss-cli.so which is linked to libopenss-cli.so.0.0.0 and
libopenss-cli.so.0 which is also linked to libopenss-cli.so.0.0.0.
libopenss-framework.so variants also appear to be similar but I don't
have a problem with those dsos and rpm installation.
[root@localhost kickstart-files]# ls -lastr /opt/OSS/lib64/libopenss-cli.*
23056 -rw-r--r--. 1 root root 23608899 Sep 27 21:34
/opt/OSS/lib64/libopenss-cli.so.0.0.0
4 -rwxr-xr-x. 1 root root 1541 Sep 27 21:34
/opt/OSS/lib64/libopenss-cli.la
0 lrwxrwxrwx. 1 root root 22 Sep 28 07:27
/opt/OSS/lib64/libopenss-cli.so.0 -> libopenss-cli.so.0.0.0
0 lrwxrwxrwx. 1 root root 22 Sep 28 07:27
/opt/OSS/lib64/libopenss-cli.so -> libopenss-cli.so.0.0.0
[root@localhost kickstart-files]# ls -lastr
/opt/OSS/lib64/libopenss-framework.*
8276 -rwxr-xr-x. 1 root root 8470629 Sep 27 21:34
/opt/OSS/lib64/libopenss-framework.so.1.0.0
4 -rwxr-xr-x. 1 root root 1053 Sep 27 21:34
/opt/OSS/lib64/libopenss-framework.la
0 lrwxrwxrwx. 1 root root 28 Sep 28 07:27
/opt/OSS/lib64/libopenss-framework.so.1 -> libopenss-framework.so.1.0.0
0 lrwxrwxrwx. 1 root root 28 Sep 28 07:27
/opt/OSS/lib64/libopenss-framework.so -> libopenss-framework.so.1.0.0
Here is the error I'm seeing:
Error creating Live CD : Failed to build transaction :
openspeedshop-2.0.1-3.x86_64 requires libopenss-cli.so.0()(64bit)
I forced an install of OpenSpeedShop and the components on my laptop and
now I can use some of the rpm options to query the installed rpm.
I had to do rpm --install --nodeps in order to get around the error message:
openspeedshop-2.0.1-3.x86_64 requires libopenss-cli.so.0()(64bit)
I'm seeing the libopenss-cli.so.0.0.0 does not follow the pattern of the
other OpenSpeedShop dsos when I do this query:
rpm --query --fileprovide openspeedshop-2.0.1-3.x86_64
...
...
/opt/OSS/lib64/libopenss-CustomExperimentPanel.so.0.0.0
libopenss-CustomExperimentPanel.so.0()(64bit)
/opt/OSS/lib64/libopenss-ExprInfo.so.0.0.0
libopenss-ExprInfo.so.0()(64bit)
/opt/OSS/lib64/libopenss-framework-binutils.so.1.0.0
libopenss-framework-binutils.so.1()(64bit)
/opt/OSS/lib64/libopenss-gui.so.0.0.0 libopenss-gui.so.0()(64bit)
...
/opt/OSS/lib64/libopenss-cli.so.0.0.0 ##### Nothing here - no
libopenss-cli.so.0 like the other dsos
I think that is the key, but the Makefile.am for libopenss-cli has the
same "-export-dynamic -version-info 0:0:0" clause that
the other dsos that show provides output that I'd like to see for
libopenss-cli: "/opt/OSS/lib64/libopenss-gui.so.0.0.0
libopenss-gui.so.0()(64bit)"
libopenss_cli_la_LDFLAGS = \
-L$(top_srcdir)/libopenss-message \
-L$(top_srcdir)/libopenss-framework \
-L$(top_srcdir)/libopenss-queries \
@PYTHON_LDFLAGS@ \
@OPENMP_LDFLAGS@ \
-export-dynamic -version-info 0:0:0
Does anyone have any experience with this kind of issue?
I'm not really sure what list this should be sent to, as it seems it
could be an autotools usage or rpm spec file issue, but I'm starting
here because it seems liveCD issues usually touch many of the autotools,
rpm mechanisms. And the people on this list have been so helpful in
the past.
Thanks,
Jim G
12 years
Changes to 'refs/tags/livecd-tools-15.9'
by Brian C. Lane
Tag 'livecd-tools-15.9' created by Brian C. Lane <bcl(a)redhat.com> at 2011-09-27 21:06 +0000
Tag as livecd-tools-15.9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQEVAwUAToI65xF+jBaO/jp/AQJEZQf/a6xUQwhU0LeNQlCrpUYEWq8NSRjdkNkR
FMu68T9Z0U2g4MJuZX4xTu1K9BhnrB8EjtG6OdWZwyuGCPvYOL8ozTAW5VwteNBh
3noTV8RCMGZDoaebc03RMv0jyU48z0f21lq/AmYnT+zpHpe/JzYvZZGyooZRTKud
hKm3ejfh537iF6Zi+huNpRAS1ewm/pjcKjFpK/5WbZ5vC189zWD0cSBM0og/Zl5M
ITaeyEWhulz8rThNmYNrRq3pxCtFlzuurI4tuRESM8fT0mxAwz+hGKVKhStXtdRJ
6D+Ysdh/J82ZJ4kywvqXbmCVXU+M9maHGR9Tzbsy5bQjpmaQZDClTw==
=xTdc
-----END PGP SIGNATURE-----
Changes since livecd-tools-15.8:
Brian C. Lane (2):
Support /EFI/BOOT or /EFI/boot (#688258)
Version 15.9
---
Makefile | 2 +-
tools/livecd-iso-to-disk.sh | 35 ++++++++++++++++++++++++-----------
2 files changed, 25 insertions(+), 12 deletions(-)
---
12 years
Branch 'f15-branch' - 2 commits - Makefile tools/livecd-iso-to-disk.sh
by Brian C. Lane
Makefile | 2 +-
tools/livecd-iso-to-disk.sh | 35 ++++++++++++++++++++++++-----------
2 files changed, 25 insertions(+), 12 deletions(-)
New commits:
commit 4c690327ea2a03633f86e443f32b0743e08d054a
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Tue Sep 27 14:06:06 2011 -0700
Version 15.9
diff --git a/Makefile b/Makefile
index 83d9127..02382e4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-VERSION = 15.8
+VERSION = 15.9
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL}
commit d0960325daa0c76370f9f8ac141540b7adeab74c
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Wed Mar 16 10:42:42 2011 -0700
Support /EFI/BOOT or /EFI/boot (#688258)
Some iso's use lower case. Upper case is correct, but both work.
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 6b71a09..580473d 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -640,6 +640,8 @@ copyFile() {
cp "$1" "$2"
}
+shopt -s extglob
+
cryptedhome=1
keephome=1
homesizemb=0
@@ -853,9 +855,15 @@ if [ -f "$TGTMNT/$LIVEOS/$HOMEFILE" -a -n "$keephome" -a "$homesizemb" -gt 0 ];
exitclean
fi
-if [ -n "$efi" -a ! -d $SRCMNT/EFI/boot ]; then
- echo "ERROR: This live image does not support EFI booting"
- exitclean
+if [ -n "$efi" ]; then
+ if [ -d $SRCMNT/EFI/BOOT ]; then
+ EFI_BOOT="/EFI/BOOT"
+ elif [ -d $SRCMNT/EFI/boot ]; then
+ EFI_BOOT="/EFI/boot"
+ else
+ echo "ERROR: This live image does not support EFI booting"
+ exitclean
+ fi
fi
# let's try to make sure there's enough room on the target device
@@ -871,7 +879,7 @@ fi
if [[ live == $srctype ]]; then
targets="$TGTMNT/$SYSLINUXPATH"
- [[ -n $efi ]] && targets+=" $TGTMNT/EFI/boot"
+ [[ -n $efi ]] && targets+=" $TGTMNT$EFI_BOOT"
[[ -n $xo ]] && targets+=" $TGTMNT/boot/olpc.fth"
duTable=($(du -c -B 1M $targets 2> /dev/null))
((tbd += ${duTable[*]: -2:1}))
@@ -894,7 +902,8 @@ if [[ live == $srctype ]]; then
sources="$SRCMNT/LiveOS/ext3fs.img $SRCMNT/LiveOS/osmin.img"
[[ -z $skipcompress ]] && sources+=" $SRCMNT/LiveOS/squashfs.img"
sources+=" $SRCMNT/isolinux $SRCMNT/syslinux"
- [[ -n $efi ]] && sources+=" $SRCMNT/EFI/boot"
+ [[ -n $efi ]] && sources+=" $SRCMNT$EFI_BOOT"
+ [[ -n $xo ]] && sources+=" $SRCMNT/boot/olpc.fth"
duTable=($(du -c -B 1M "$thisScriptpath" $sources 2> /dev/null))
((livesize += ${duTable[*]: -2:1}))
fi
@@ -976,7 +985,7 @@ fi
# Bootloader is always reconfigured, so keep these out of the if skipcopy stuff.
[ ! -d $TGTMNT/$SYSLINUXPATH ] && mkdir -p $TGTMNT/$SYSLINUXPATH
-[ -n "$efi" -a ! -d $TGTMNT/EFI/boot ] && mkdir -p $TGTMNT/EFI/boot
+[ -n "$efi" -a ! -d $TGTMNT$EFI_BOOT ] && mkdir -p $TGTMNT$EFI_BOOT
# Live image copy
set -o pipefail
@@ -1030,11 +1039,15 @@ BOOTCONFIG=$TGTMNT/$SYSLINUXPATH/isolinux.cfg
# Set this to nothing so sed doesn't care
BOOTCONFIG_EFI=
if [ -n "$efi" ]; then
- cp $SRCMNT/EFI/boot/* $TGTMNT/EFI/boot
+ cp $SRCMNT$EFI_BOOT/* $TGTMNT$EFI_BOOT
+
+ # FIXME
+ # There is a problem here. On older LiveCD's the files are boot?*.conf
+ # They really should be renamed to BOOT?*.conf
# this is a little ugly, but it gets the "interesting" named config file
- BOOTCONFIG_EFI=$TGTMNT/EFI/boot/boot?*.conf
- rm -f $TGTMNT/EFI/boot/grub.conf
+ BOOTCONFIG_EFI=$TGTMNT$EFI_BOOT/+(BOOT|boot)?*.conf
+ rm -f $TGTMNT$EFI_BOOT/grub.conf
fi
if [[ live == $srctype ]]; then
@@ -1213,8 +1226,8 @@ if [ -z "$multi" ]; then
echo "Installing boot loader"
if [ -n "$efi" ]; then
# replace the ia32 hack
- if [ -f "$TGTMNT/EFI/boot/boot.conf" ]; then
- cp -f $TGTMNT/EFI/boot/bootia32.conf $TGTMNT/EFI/boot/boot.conf
+ if [ -f "$TGTMNT$EFI_BOOT/boot.conf" ]; then
+ cp -f $TGTMNT$EFI_BOOT/BOOTia32.conf $TGTMNT$EFI_BOOT/BOOT.conf
fi
fi
12 years
Tips to add persistent partition to LiveCD ?
by Ed Sutton
I need to add persistence for application configuration files and /etc/sysconfig/network configuration. I need to create a "write once or twice" partition made on CF and I assume create symbolic links on the read-only partition to the "write once or twice" partition. The remainder will be read-only for a CentOS 5.2 LiveCD for embedded applications that boots and runs off a Compact Flash (CF). Can someone please point me to an example of persisyence?
Not sure if UninFS is a viable direction but I found references to UnionFS but am still seeking examples.
Thanks in advance for any direction,
-Ed
CentOS: 5.2
livecd-tools-014-8
squashfs-tools-3.4-1
12 years
Changes to 'refs/tags/livecd-tools-14.4'
by Brian C. Lane
Tag 'livecd-tools-14.4' created by Brian C. Lane <bcl(a)redhat.com> at 2011-09-27 20:47 +0000
Tag as livecd-tools-14.4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQEVAwUAToI2XxF+jBaO/jp/AQJw0AgAltEljuT1DKEVBQqedxY+S6wWSckBuEta
E/gZ6ArYfemLGbURhq54v8Nlmc/loYx9cVcDkBI6yDwc7VycAYf3eJukqZWnaDw9
3+6t+97fARpOh8mORrEC453L+pleDdWQxb2jlL8octJp+nR0bVlpYbcKb15E0TVT
/zkI+dj65oVISn2hiv75Aq0/F9I7D9BKotuXmY/WAtsL39NaLi/fiSjdHgBHiane
MbI3IcKLNIolDfWh0WFo8mNuSLDEamkFMEfAfROc2zQ3Q441qAdBF590kpvd23aN
YJvaUT9CTPU/I+/yF8/BeoFdo/3LlP5NSESrsufy0OXeRhaqZqwTnQ==
=xKg3
-----END PGP SIGNATURE-----
Changes since livecd-tools-14.3:
Brian C. Lane (2):
Support /EFI/BOOT or /EFI/boot (#688258)
Version 14.4
---
Makefile | 2 +-
tools/livecd-iso-to-disk.sh | 26 ++++++++++++++++++--------
2 files changed, 19 insertions(+), 9 deletions(-)
---
12 years
Branch 'f14-branch' - 2 commits - Makefile tools/livecd-iso-to-disk.sh
by Brian C. Lane
Makefile | 2 +-
tools/livecd-iso-to-disk.sh | 26 ++++++++++++++++++--------
2 files changed, 19 insertions(+), 9 deletions(-)
New commits:
commit 15fc1fd3f0996167e8b4ef1d34a444efe405133c
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Tue Sep 27 13:47:02 2011 -0700
Version 14.4
diff --git a/Makefile b/Makefile
index e6f67eb..b98b6eb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-VERSION = 14.3
+VERSION = 14.4
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL}
commit cb54e793d7558157dd2d8b824a866dda794ce106
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Wed Mar 16 10:42:42 2011 -0700
Support /EFI/BOOT or /EFI/boot (#688258)
Some iso's use lower case. Upper case is correct, but both work.
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 16302c1..9a311d6 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -397,6 +397,8 @@ copyFile() {
cp "$1" "$2"
}
+shopt -s extglob
+
cryptedhome=1
keephome=1
homesizemb=0
@@ -599,9 +601,15 @@ if [ -f "$USBMNT/$LIVEOS/$HOMEFILE" -a -n "$keephome" -a "$homesizemb" -gt 0 ];
exitclean
fi
-if [ -n "$efi" -a ! -d $CDMNT/EFI/boot ]; then
- echo "ERROR: This live image does not support EFI booting"
- exitclean
+if [ -n "$efi" ]; then
+ if [ -d $CDMNT/EFI/BOOT ]; then
+ EFI_BOOT="/EFI/BOOT"
+ elif [ -d $CDMNT/EFI/boot ]; then
+ EFI_BOOT="/EFI/boot"
+ else
+ echo "ERROR: This live image does not support EFI booting"
+ exitclean
+ fi
fi
# let's try to make sure there's enough room on the stick
@@ -700,7 +708,7 @@ fi
# Bootloader is always reconfigured, so keep these out of the if skipcopy stuff.
[ ! -d $USBMNT/$SYSLINUXPATH ] && mkdir -p $USBMNT/$SYSLINUXPATH
-[ -n "$efi" -a ! -d $USBMNT/EFI/boot ] && mkdir -p $USBMNT/EFI/boot
+[ -n "$efi" -a ! -d $USBMNT$EFI_BOOT ] && mkdir -p $USBMNT$EFI_BOOT
# Live image copy
set -o pipefail
@@ -742,11 +750,11 @@ BOOTCONFIG=$USBMNT/$SYSLINUXPATH/isolinux.cfg
# Set this to nothing so sed doesn't care
BOOTCONFIG_EFI=
if [ -n "$efi" ];then
- cp $CDMNT/EFI/boot/* $USBMNT/EFI/boot
+ cp $CDMNT$EFI_BOOT/* $USBMNT$EFI_BOOT
# this is a little ugly, but it gets the "interesting" named config file
- BOOTCONFIG_EFI=$USBMNT/EFI/boot/boot?*.conf
- rm -f $USBMNT/EFI/boot/grub.conf
+ BOOTCONFIG_EFI=$USBMNT$EFI_BOOT/+(BOOT|boot)?*.conf
+ rm -f $USBMNT$EFI_BOOT/grub.conf
fi
echo "Updating boot config file"
@@ -904,7 +912,9 @@ if [ -z "$multi" ]; then
echo "Installing boot loader"
if [ -n "$efi" ]; then
# replace the ia32 hack
- if [ -f "$USBMNT/EFI/boot/boot.conf" ]; then cp -f $USBMNT/EFI/boot/bootia32.conf $USBMNT/EFI/boot/boot.conf ; fi
+ if [ -f "$USBMNT$EFI_BOOT/boot.conf" ]; then
+ cp -f $USBMNT$EFI_BOOT/bootia32.conf $USBMNT$EFI_BOOT/boot.conf
+ fi
fi
# this is a bit of a kludge, but syslinux doesn't guarantee the API for its com32 modules :/
12 years
