Hello community,
here is the log from the commit of package yast2-product-creator
checked in at Mon Nov 3 14:37:51 CET 2008.
--------
--- yast2-product-creator/yast2-product-creator.changes 2008-10-15 10:43:47.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-product-creator/yast2-product-creator.changes 2008-10-31 21:01:22.934432000 +0100
@@ -1,0 +2,23 @@
+Fri Oct 31 20:04:05 CET 2008 - jsuchome@suse.cz
+
+- image-creator template: install pattern packages by default
+ (bnc#404022)
+- 2.17.11
+
+-------------------------------------------------------------------
+Fri Oct 31 16:20:05 CET 2008 - lslezak@suse.cz
+
+- read and set the product name (bnc#440609)
+
+-------------------------------------------------------------------
+Fri Oct 24 13:12:05 CEST 2008 - lslezak@suse.cz
+
+- File "/PS3/otheros/otheros.bld" is optional when creating a PPC
+ product (bnc#438210)
+
+-------------------------------------------------------------------
+Thu Oct 23 16:19:49 CEST 2008 - lslezak@suse.cz
+
+- added a help text describing linuxrc option insecure=1
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-product-creator-2.17.10.tar.bz2
New:
----
yast2-product-creator-2.17.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-product-creator.spec ++++++
--- /var/tmp/diff_new_pack.hg3016/_old 2008-11-03 14:37:13.000000000 +0100
+++ /var/tmp/diff_new_pack.hg3016/_new 2008-11-03 14:37:13.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-product-creator (Version 2.17.10)
+# spec file for package yast2-product-creator (Version 2.17.11)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-product-creator
-Version: 2.17.10
+Version: 2.17.11
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-product-creator-2.17.10.tar.bz2
+Source0: yast2-product-creator-2.17.11.tar.bz2
Prefix: /usr
BuildRequires: autoyast2-installation perl-XML-Writer update-desktop-files yast2 yast2-add-on-creator yast2-devtools yast2-packager yast2-security yast2-testsuite
PreReq: %fillup_prereq
@@ -49,7 +49,7 @@
%prep
-%setup -n yast2-product-creator-2.17.10
+%setup -n yast2-product-creator-2.17.11
%build
%{prefix}/bin/y2tool y2autoconf
@@ -95,6 +95,17 @@
/usr/share/YaST2/scrconf/*.scr
/var/adm/fillup-templates/sysconfig.product-creator
%changelog
+* Fri Oct 31 2008 jsuchome@suse.cz
+- image-creator template: install pattern packages by default
+ (bnc#404022)
+- 2.17.11
+* Fri Oct 31 2008 lslezak@suse.cz
+- read and set the product name (bnc#440609)
+* Fri Oct 24 2008 lslezak@suse.cz
+- File "/PS3/otheros/otheros.bld" is optional when creating a PPC
+ product (bnc#438210)
+* Thu Oct 23 2008 lslezak@suse.cz
+- added a help text describing linuxrc option insecure=1
* Wed Oct 15 2008 jsuchome@suse.cz
- Image Creator: added widgets for locale, timezone and keytable
(bnc#435208)
++++++ yast2-product-creator-2.17.10.tar.bz2 -> yast2-product-creator-2.17.11.tar.bz2 ++++++
++++ 3780 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-product-creator-2.17.10/configure.in new/yast2-product-creator-2.17.11/configure.in
--- old/yast2-product-creator-2.17.10/configure.in 2008-06-16 14:20:23.000000000 +0200
+++ new/yast2-product-creator-2.17.11/configure.in 2008-10-31 13:28:15.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-product-creator
dnl
-dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-product-creator, 2.17.0, http://bugs.opensuse.org/, yast2-product-creator)
+AC_INIT(yast2-product-creator, 2.17.10, http://bugs.opensuse.org/, yast2-product-creator)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.0"
+VERSION="2.17.10"
RPMNAME="yast2-product-creator"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-product-creator-2.17.10/src/complex.ycp new/yast2-product-creator-2.17.11/src/complex.ycp
--- old/yast2-product-creator-2.17.10/src/complex.ycp 2008-10-14 15:27:46.000000000 +0200
+++ new/yast2-product-creator-2.17.11/src/complex.ycp 2008-10-31 20:03:36.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Anas Nashif
*
- * $Id: complex.ycp 52175 2008-10-14 12:21:00Z lslezak $
+ * $Id: complex.ycp 52793 2008-10-31 13:07:48Z lslezak $
*/
{
@@ -319,7 +319,14 @@
// redirect the download callbacks
ProductCreator::RedirectCallbacks();
- if (!ProductCreator::CreateSkeleton())
+ map boot_info = ProductCreator::GetBootInfo();
+ y2milestone("Boot info: %1", boot_info);
+
+ boolean bootable = boot_info["bootable"]:false;
+ string boot_arch = boot_info["boot_architecture"]:"";
+ integer base_source = boot_info["base_source"]:-1;
+
+ if (!ProductCreator::CreateSkeleton(base_source, bootable, boot_arch))
{
Report::Error(_("Error while creating skeleton."));
ProductCreator::ResetCallbacks();
@@ -335,17 +342,15 @@
Progress::NextStage();
if (ProductCreator::Config["pkgtype"]:"" == "autoyast")
{
- ProductCreator::CopyMiscFiles();
+ ProductCreator::CopyMiscFiles(boot_arch);
}
- else
+ else
{
if (ProductCreator::Config["bootconfig"]:"" != "")
{
y2debug("bootconfig available");
-
- string fname = (ProductCreator::Config["code10"]:false)
- ? sformat("%1/boot/%2/loader/isolinux.cfg", ProductCreator::skel_root, ProductCreator::GetArch())
- : sformat("%1/boot/loader/isolinux.cfg", ProductCreator::skel_root);
+ string fname = sformat("%1/boot/%2/loader/isolinux.cfg", ProductCreator::skel_root, boot_arch);
+ y2milestone("Writing bootconfig to %1", fname);
SCR::Write(.target.string, fname, ProductCreator::Config["bootconfig"]:"" );
}
@@ -401,10 +406,8 @@
{
Popup::ShowFeedback(_("Creating CD Image..."), _("This may take a while"));
}
- string arch = ProductCreator::GetArch();
- if (arch == "s390_64") arch = "s390x";
- string command = sformat("/usr/lib/YaST2/bin/y2mkiso '%1' '%2' '%3'", String::Quote(isodir), String::Quote(isofile), String::Quote((ProductCreator::Config["code10"]:false) ? arch : ""));
+ string command = sformat("/usr/lib/YaST2/bin/y2mkiso '%1' '%2' '%3'", String::Quote(isodir), String::Quote(isofile), String::Quote(boot_arch));
y2milestone("command: %1", command);
SCR::Execute (.target.bash, command, $["CD_PUBLISHER": pub, "CD_PREPARER": prep ]);
@@ -581,10 +584,12 @@
symbol CheckBootableSrc()
{
- integer base_src = ProductCreator::checkProductDependency();
- if (!ProductCreator::isBootSource(base_src))
+ map boot_info = ProductCreator::GetBootInfo();
+ boolean bootable = boot_info["bootable"]:false;
+
+ if (!bootable)
{
- y2milestone("Base source %1 is not bootable, skipping isolinux.cfg configuration", base_src);
+ y2milestone("Base source %1 is not bootable, skipping isolinux.cfg configuration", boot_info["base_source"]:-1);
return `skip_isolinux;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-product-creator-2.17.10/src/data/kiwi_templates/iso/config.xml new/yast2-product-creator-2.17.11/src/data/kiwi_templates/iso/config.xml
--- old/yast2-product-creator-2.17.10/src/data/kiwi_templates/iso/config.xml 2008-10-13 11:08:24.000000000 +0200
+++ new/yast2-product-creator-2.17.11/src/data/kiwi_templates/iso/config.xml 2008-10-31 14:03:04.000000000 +0100
@@ -22,7 +22,7 @@
<user name="linux" pwd="" home="/home/linux" realname="Live-CD User"/>
<user name="root" pwd="" home="/root"/>
</users>
- <packages type="image" patternPackageType="onlyRequired">
+ <packages type="image" patternType="plusRecommended" patternPackageType="plusRecommended">
<package name="yast2-live-installer"/>
<package name="pam"/>
<package name="pam-config"/>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-product-creator-2.17.10/src/dialogs.ycp new/yast2-product-creator-2.17.11/src/dialogs.ycp
--- old/yast2-product-creator-2.17.10/src/dialogs.ycp 2008-10-14 15:51:09.000000000 +0200
+++ new/yast2-product-creator-2.17.11/src/dialogs.ycp 2008-10-31 20:03:36.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Anas Nashif
*
- * $Id: dialogs.ycp 52122 2008-10-13 11:27:39Z lslezak $
+ * $Id: dialogs.ycp 52803 2008-10-31 15:22:26Z lslezak $
*/
{
@@ -862,6 +862,24 @@
return (symbol)ret;
}
+ string ProductFromRepo(integer repo_id)
+ {
+ map read_content = ProductCreator::ReadContentFile(repo_id);
+ string prod_name = read_content["LABEL"]:"";
+
+ y2milestone("Product name: %1", prod_name);
+ return prod_name;
+ }
+
+ string ProductFromURL(string url)
+ {
+ integer src_id = ProductCreator::UrlToId([url])[0]:-1;
+ y2milestone("Reading product name from src %1", src_id);
+ string prod_name = ProductFromRepo(src_id);
+
+ return prod_name;
+ }
+
define symbol baseProductSelectionDialog()
{
if (size(ProductCreator::Config["sources"]:[]) == 1)
@@ -872,7 +890,14 @@
// remove the option if it exists
if (haskey (ProductCreator::Config, "base_repo"))
ProductCreator::Config = remove(ProductCreator::Config, "base_repo");
- return going_back ? `back : `next;
+ symbol ret = going_back ? `back : `next;
+
+ if (ret == `next)
+ {
+ ProductCreator::Config["product"] = ProductFromURL((ProductCreator::Config["sources"]:[])[0]:"");
+ }
+
+ return ret;
}
/* dialog caption */
@@ -919,9 +944,11 @@
y2internal("Selected base product: %1", base);
integer base_src_id = ProductCreator::UrlToId([base])[0]:-1;
+ map boot_info = ProductCreator::GetBootInfoRepo(base_src_id);
+ boolean bootable = boot_info["bootable"]:false;
// is the base source bootable?
- if (!ProductCreator::isBootSource(base_src_id))
+ if (!bootable)
{
y2warning("Selected base product is not bootable");
@@ -942,6 +969,7 @@
if (ret == `next)
{
ProductCreator::Config["base_repo"] = base;
+ ProductCreator::Config["product"] = ProductFromURL(base);
}
return ret;
@@ -1029,9 +1057,6 @@
SCR::Execute(.target.mkdir, tmp + "/tmproot");
Pkg::TargetInit( tmp + "/tmproot" , true);
- // add code10 flag if the new source type is detected
- ProductCreator::CheckCode10Source();
-
boolean success = ProductCreator::EnableSource();
// Pkg::SourceStartManager(true);
@@ -1462,6 +1487,7 @@
// do not return patterns selected by dependencies
foreach (map pat, Pkg::ResolvableProperties ("", `pattern, ""),
{
+ y2debug("Processing pattern: %1", pat);
if (pat["status"]:`none == `selected)
{
y2milestone ("pat %1 selected by %2" , pat["name"]:"",
@@ -1505,9 +1531,6 @@
// selections or patterns are used in the product
ret_map["type"] = using_patterns ? `patterns : `selections;
- // add code10 flag if the new source type is detected
- ret_map["code10"] = ProductCreator::isCode10Source();
-
ret_map["ui"] = ret;
Wizard::CloseDialog();
@@ -1537,7 +1560,6 @@
ProductCreator::Config["addons"] = result["addons"]:[];
ProductCreator::Config["packages"] = result["packages"]:[];
ProductCreator::Config["taboo"] = result["taboo"]:[];
- ProductCreator::Config["code10"] = result["code10"]:true;
ProductCreator::Config["type"] = result["type"]:`patterns;
}
while(result["ui"]:`next == `cancel && !ProductCreator::ReallyAbort());
@@ -1618,6 +1640,9 @@
"help" : _("<p><big><b>Sign</b></big><br>
To make it possible for users to verify your product, sign it with a GPG key.
This key is checked when the product is added as a repository.</p>")
+ // part of the help text (signing dialog), the URL can be modified to the translated language
+ // (if the page exists in that language, you have to check that!)
+ + _("<P>If the product is not signed Yast automatically adds option 'Insecure: 1' to the linuxrc configuration file, otherwise linuxrc would deny loading unsigned installation system at boot. See http://en.opensuse.org/Linuxrc for more information.</P>")
]
];
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-product-creator-2.17.10/src/kiwi_dialogs.ycp new/yast2-product-creator-2.17.11/src/kiwi_dialogs.ycp
--- old/yast2-product-creator-2.17.10/src/kiwi_dialogs.ycp 2008-10-14 15:57:14.000000000 +0200
+++ new/yast2-product-creator-2.17.11/src/kiwi_dialogs.ycp 2008-10-31 14:27:41.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Dialogs for kiwi configuration
* Authors: Jiri Suchomel
*
- * $Id: kiwi_dialogs.ycp 50872 2008-09-09 09:23:15Z jsuchome $
+ * $Id: kiwi_dialogs.ycp 52213 2008-10-15 08:43:57Z jsuchome $
*/
{
textdomain "product-creator";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-product-creator-2.17.10/src/ProductCreator.ycp new/yast2-product-creator-2.17.11/src/ProductCreator.ycp
--- old/yast2-product-creator-2.17.10/src/ProductCreator.ycp 2008-10-14 15:51:09.000000000 +0200
+++ new/yast2-product-creator-2.17.11/src/ProductCreator.ycp 2008-10-31 20:03:36.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Data for configuration of product-creator, input and output functions.
* Authors: Anas Nashif
*
- * $Id: ProductCreator.ycp 52175 2008-10-14 12:21:00Z lslezak $
+ * $Id: ProductCreator.ycp 52793 2008-10-31 13:07:48Z lslezak $
*
* Representation of the configuration of product-creator.
* Input and output routines.
@@ -279,42 +279,6 @@
}
}
-global boolean isCode10Source()
-{
- boolean code10 = false;
- string arch = GetArch();
- if (arch == "s390_64") arch = "s390x";
- foreach (string url , ProductCreator::Config["sources"]:[],
- {
- integer i = SourceManager::getSourceId(url);
-
- y2milestone("Downloading %1/boot/directory.yast...", url);
- string local_directory_yast = Pkg::SourceProvideOptionalFile(i, 1, "/boot/directory.yast");
-
- if (local_directory_yast != nil && local_directory_yast != "")
- {
- // read directory.yast file
- string dir_listing = (string)SCR::Read(.target.string, local_directory_yast);
-
- if (dir_listing != nil && dir_listing != "")
- {
- list<string> items = splitstring(dir_listing, "\n");
-
- code10 = code10 || contains(items, arch + "/");
- }
- }
- });
-
- y2milestone("CODE10 source: %1", code10);
-
- return code10;
-}
-
-global void CheckCode10Source()
-{
- // add code10 flag - /boot directory layout
- ProductCreator::Config["code10"] = isCode10Source();
-}
symbol autoyastPackages ()
{
@@ -332,9 +296,6 @@
SCR::Execute(.target.mkdir, tmp + "/tmproot");
Pkg::TargetInit( tmp + "/tmproot" , true);
- // add code10 flag if the new source type is detected
- CheckCode10Source();
-
boolean success = ProductCreator::EnableSource();
// Pkg::SourceStartManager(true);
@@ -1088,7 +1049,7 @@
{
y2milestone("Directory listing may be missing, copying /ppc/bootinfo.txt");
Exec(sformat("/bin/mkdir -p '%1/PS3/otheros'", String::Quote(target)));
- CopyFile(srcid, 1, "/PS3/otheros/otheros.bld", target + "/PS3/otheros");
+ CopyOptionalFile(srcid, 1, "/PS3/otheros/otheros.bld", target + "/PS3/otheros");
}
ret = ret && r;
@@ -1350,18 +1311,29 @@
}
-global boolean isBootSource(integer srcid)
+global list<string> BootFiles(integer srcid)
{
- boolean bootable = false;
y2milestone("Downloading boot/directory.yast from src %1...", srcid);
string local_directory_yast = Pkg::SourceProvideOptionalFile(srcid, 1, "/boot/directory.yast");
- bootable = local_directory_yast != nil;
- y2milestone("Source %1 bootable: %2, directory.yast: %3", srcid, bootable, local_directory_yast);
+ y2milestone("directory.yast from src %1: %2", srcid, local_directory_yast);
+
+ list<string> ret = [];
- return bootable;
+ if (local_directory_yast != nil)
+ {
+ string listing = (string)SCR::Read(.target.string, local_directory_yast);
+
+ ret = splitstring(listing, "\n");
+ ret = filter(string f, ret, {return f != "";});
+ }
+
+ y2milestone("Content of boot/directory.yast: %1", ret);
+
+ return ret;
}
+
/**
* Write the modified file with pattern definitions
* @param file_path path to pattern file
@@ -1431,12 +1403,46 @@
return ret;
}
+global map GetBootInfoRepo(integer repo)
+{
+ list<string> boot_files = ProductCreator::BootFiles(repo);
+ boolean bootable_product = size(boot_files) > 0;
+
+ string arch = ProductCreator::GetArch();
+ // ppc64 has /boot/ppc
+ string boot_architecture = contains(boot_files, arch + "/") ? arch : "";
+
+ // TODO FIXME: add ppc 64 hack
+ // if (arch)== "ppc64") ? "ppc" : arch;
+
+ map ret = $[ "bootable" : bootable_product, "boot_architecture" : boot_architecture ];
+
+ y2milestone("Bootinfo: %1", ret);
+
+ return ret;
+}
+
+global map GetBootInfo()
+{
+ string base_url = Config["base_repo"]:"";
+
+ y2milestone("Configured base repository: %1", base_url);
+
+ // detect the base source
+ integer base_source = (base_url != "") ? (UrlToId([base_url])[0]:-1) : checkProductDependency();
+
+ map ret = GetBootInfoRepo(base_source);
+ ret = add(ret, "base_source", base_source);
+
+ return ret;
+}
+
/**
* Create Skeleton
* @return boolean true on success
*/
-global define boolean CreateSkeleton () ``{
-
+global define boolean CreateSkeleton(integer base_source, boolean bootable_product, string boot_architecture)
+{
integer ret = 0;
boolean success = true;
boolean savespace = Config["savespace"]:false;
@@ -1445,7 +1451,6 @@
integer sles_src = 0;
string descr_dir = "";
string arch = GetArch();
- if (arch == "s390_64") arch = "s390x";
y2milestone("Config: %1", Config);
@@ -1453,17 +1458,7 @@
skel_root = sformat("%1/%2", Config["iso-directory"]:"", Config["name"]:"");
SCR::Execute(.target.mkdir, skel_root);
- string base_url = Config["base_repo"]:"";
- y2milestone("Configured base repository: %1", base_url);
-
- // detect the base source
- integer base_source = (base_url != "") ? (UrlToId([base_url])[0]:-1) : checkProductDependency();
- boolean bootable_product = isBootSource(base_source);
-
- // ppc64 has /boot/ppc
- string boot_architecture = (arch == "ppc64") ? "ppc" : arch;
-
- if (bootable_product && Config["code10"]:false)
+ if (bootable_product)
{
Exec(sformat("/bin/mkdir -p '%1/boot/%2'", String::Quote(skel_root), String::Quote(boot_architecture)));
}
@@ -1480,17 +1475,11 @@
{
if (_arch == "i386" || _arch == "x86_64")
{
- if (Config["code10"]:false)
- {
- Exec(sformat("/bin/mkdir -p '%1/boot/%2/loader'", String::Quote(skel_root), String::Quote(arch)));
- }
- else
- {
- Exec(sformat("/bin/mkdir -p '%1/boot/loader'", String::Quote(skel_root)));
- }
+ Exec(sformat("/bin/mkdir -p '%1/boot/%2/loader'", String::Quote(skel_root), String::Quote(boot_architecture)));
}
else if (_arch == "ppc" || _arch == "ppc64")
{
+ // FIXME PS3 is optional
Exec(sformat("/bin/mkdir -p '%1/PS3'", String::Quote(skel_root)));
Exec(sformat("/bin/mkdir -p '%1/ppc'", String::Quote(skel_root)));
Exec(sformat("/bin/mkdir -p '%1/suseboot'", String::Quote(skel_root)));
@@ -1550,32 +1539,17 @@
if (savespace)
{
// Installation, rescue images
- if (Config["code10"]:false)
- {
- CopyFile(id, 1, sformat("boot/%1/rescue", arch),
- sformat("%1/boot/%2", skel_root, arch));
- }
- else
- {
- // use the old directory
- CopyFile(id, 1, "boot/rescue", sformat("%1/boot", skel_root));
- }
+ CopyFile(id, 1, sformat("boot/%1/rescue", boot_architecture),
+ sformat("%1/boot/%2", skel_root, boot_architecture));
+
// Loader, x86 specific
if (_arch == "i386" || _arch == "x86_64")
{
- if (Config["code10"]:false)
- {
- // recursive copy of /boot/$arch/loader/*
- CopyDirectoryRec(id, 1, sformat("boot/%1/loader", arch), sformat("%1/boot/%2", skel_root, arch));
+ // recursive copy of /boot/$arch/loader/*
+ CopyDirectoryRec(id, 1, sformat("boot/%1/loader", boot_architecture), sformat("%1/boot/%2", skel_root, boot_architecture));
- // nonrecursive copy of /boot/$arch/*
- CopyDirectoryNonRec(id, 1, sformat("boot/%1", arch), sformat("%1/boot", skel_root));
- }
- else
- {
- // recursive copy of /boot/loader/*
- CopyDirectoryRec(id, 1, "boot/loader", sformat("%1/boot", skel_root));
- }
+ // nonrecursive copy of /boot/$arch/*
+ CopyDirectoryNonRec(id, 1, sformat("boot/%1", boot_architecture), sformat("%1/boot", skel_root));
}
else if (_arch == "ppc" || _arch == "ppc64")
{
@@ -1631,18 +1605,9 @@
{
if (bootable_product)
{
- // Installation, rescue images
- if (Config["code10"]:false)
- {
- CopyFile(id, 1, sformat("boot/%1/rescue", arch), sformat("%1/boot/%2", skel_root, arch));
- CopyFile(id, 1, sformat("boot/%1/root", arch), sformat("%1/boot/%2", skel_root, arch));
- CopyOptionalFile(id, 1, sformat("boot/%1/root.fonts", arch), sformat("%1/boot/%2", skel_root, arch));
- }
- else
- {
- CopyFile(id, 1, "boot/rescue", sformat("%1/boot", skel_root));
- CopyFile(id, 1, "boot/root", sformat("%1/boot", skel_root));
- }
+ CopyFile(id, 1, sformat("boot/%1/rescue", boot_architecture), sformat("%1/boot/%2", skel_root, boot_architecture));
+ CopyFile(id, 1, sformat("boot/%1/root", boot_architecture), sformat("%1/boot/%2", skel_root, boot_architecture));
+ CopyOptionalFile(id, 1, sformat("boot/%1/root.fonts", boot_architecture), sformat("%1/boot/%2", skel_root, boot_architecture));
}
// copy content* files
@@ -1654,15 +1619,8 @@
{
if (bootable_product)
{
- if (Config["code10"]:false)
- {
- CopyFile(id, 1, sformat("boot/%1/root", arch), sformat("%1/boot/%2", skel_root, arch));
- CopyOptionalFile(id, 1, sformat("boot/%1/root.fonts", arch), sformat("%1/boot/%2", skel_root, arch));
- }
- else
- {
- CopyFile(id, 1, "boot/root", sformat("%1/boot", skel_root));
- }
+ CopyFile(id, 1, sformat("boot/%1/root", boot_architecture), sformat("%1/boot/%2", skel_root, boot_architecture));
+ CopyOptionalFile(id, 1, sformat("boot/%1/root.fonts", boot_architecture), sformat("%1/boot/%2", skel_root, boot_architecture));
}
// copy base files, skip all directories
@@ -1717,35 +1675,18 @@
{
if (savespace)
{
- // Installation, rescue images
- if (Config["code10"]:false)
- {
- CopyFile(base_source, 1, sformat("boot/%1/rescue", arch), sformat("%1/boot/%2", skel_root, arch));
- CopyFile(base_source, 1, sformat("boot/%1/root", arch), sformat("%1/boot/%2", skel_root, arch));
- CopyFile(base_source, 1, sformat("boot/%1/root.fonts", arch), sformat("%1/boot/%2", skel_root, arch));
- }
- else
- {
- CopyFile(base_source, 1, "boot/rescue", sformat("%1/boot", skel_root));
- CopyFile(base_source, 1, "boot/root", sformat("%1/boot", skel_root));
- }
+ CopyFile(base_source, 1, sformat("boot/%1/rescue", boot_architecture), sformat("%1/boot/%2", skel_root, boot_architecture));
+ CopyFile(base_source, 1, sformat("boot/%1/root", boot_architecture), sformat("%1/boot/%2", skel_root, boot_architecture));
+ CopyFile(base_source, 1, sformat("boot/%1/root.fonts", boot_architecture), sformat("%1/boot/%2", skel_root, boot_architecture));
// Loader, x86 specific
if (_arch == "i386" || _arch == "x86_64")
{
- if (Config["code10"]:false)
- {
- // recursive copy of /boot/$arch/loader/*
- CopyDirectoryRec(base_source, 1, sformat("boot/%1/loader", arch), sformat("%1/boot/%2", skel_root, arch));
+ // recursive copy of /boot/$boot_architecture/loader/*
+ CopyDirectoryRec(base_source, 1, sformat("boot/%1/loader", boot_architecture), sformat("%1/boot/%2", skel_root, boot_architecture));
- // nonrecursive copy of /boot/$arch/*
- CopyDirectoryNonRec(base_source, 1, sformat("boot/%1", arch), sformat("%1/boot", skel_root));
- }
- else
- {
- // recursive copy of /boot/loader/*
- CopyDirectoryRec(base_source, 1, "boot/loader", sformat("%1/boot", skel_root));
- }
+ // nonrecursive copy of /boot/$boot_architecture/*
+ CopyDirectoryNonRec(base_source, 1, sformat("boot/%1", boot_architecture), sformat("%1/boot", skel_root));
}
else if (_arch == "ppc" || _arch == "ppc64")
{
@@ -1912,7 +1853,7 @@
Exec(sformat("/bin/echo %1 >> '%2/media.1/media'", count, String::Quote(skel_root)));
// make the source digitally unsigned (because signed descr/packages file has been modified)
- if (Config["code10"]:false)
+ if (boot_architecture != "")
{
// remove the key and the checksum
Exec(sformat("/bin/rm '%1/content.asc' '%1/content.key'", String::Quote(skel_root)));
@@ -2394,32 +2335,34 @@
* Copy other files to directory tree
* @return boolean true on success
*/
-global define boolean CopyMiscFiles() ``{
-
+global define boolean CopyMiscFiles(string boot_arch)
+{
string cpCmd = "";
+
string arch = GetArch();
if (arch == "s390_64") arch = "s390x";
+
y2debug("isolinux.cfg: %1", Config["bootconfig"]:"" );
- if (Config["bootconfig"]:"" != "")
+
+ if (Config["bootconfig"]:"" != "")
{
y2debug("custom config available");
- string fname = (Config["code10"]:false)
- ? sformat("%1/boot/%2/loader/isolinux.cfg", skel_root, arch)
- : sformat("%1/boot/loader/isolinux.cfg", skel_root);
+ string fname = sformat("%1/boot/%2/loader/isolinux.cfg", skel_root, boot_arch);
+ y2milestone("Writing isolinux.cfg to %1", fname);
SCR::Write(.target.string, fname, Config["bootconfig"]:"" );
}
- cpCmd = (Config["code10"]:false)
- ? sformat("cp -- '%1/product-creator/message' '%2/boot/%3/loader'", String::Quote(Directory::datadir), String::Quote(skel_root), arch)
- : sformat("cp -- '%1/product-creator/message' '%2/boot/loader'", String::Quote(Directory::datadir), String::Quote(skel_root));
- SCR::Execute (.target.bash, cpCmd);
-
- cpCmd = (Config["code10"]:false)
- ? sformat("cp -- '%1/product-creator/options.msg' '%2/boot/%3/loader'", String::Quote(Directory::datadir), String::Quote(skel_root), arch)
- : sformat("cp -- '%1/product-creator/options.msg' '%2/boot/loader'", String::Quote(Directory::datadir), String::Quote(skel_root));
- SCR::Execute (.target.bash, cpCmd);
+ cpCmd = sformat("cp -- '%1/product-creator/message' '%2/boot/%3/loader'",
+ String::Quote(Directory::datadir), String::Quote(skel_root), boot_arch);
+
+ Exec(cpCmd);
+
+ cpCmd = sformat("cp -- '%1/product-creator/options.msg' '%2/boot/%3/loader'",
+ String::Quote(Directory::datadir), String::Quote(skel_root), boot_arch);
+
+ Exec(cpCmd);
return true;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-product-creator-2.17.10/VERSION new/yast2-product-creator-2.17.11/VERSION
--- old/yast2-product-creator-2.17.10/VERSION 2008-10-15 10:34:59.000000000 +0200
+++ new/yast2-product-creator-2.17.11/VERSION 2008-10-31 20:03:33.000000000 +0100
@@ -1 +1 @@
-2.17.10
+2.17.11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org