A new patch for the rebranding use-case:
Use the product string ($PRODUCTSTR in buildinstall) to determine which
-logos and -release package to use in upd-instroot.
Please note:
Caveat #1: If the brand package doesn't exist, buildinstall will fail
Caveat #2: If the brand package has uppercase characters in it's name,
it needs to provide ${brand}-{release,logos} in lowercase or
yum thinks the package doesn't exist and buildinstall will
fail
An additional patch may be necessary to:
1) check for ${brand}-{release,logos}
2) if those do not exist, fall back by setting the brand to "generic"
This will need to happen *after* the YUM configuration file has been
written, but before upd-instroot is executed.
Kind regards,
Jeroen van Meeuwen
-kanarip
>From bd787750ad2306226085ebae3df1fee4c6be5cbe Mon Sep 17 00:00:00 2001
From: Jeroen van Meeuwen (Fedora Unity) <kanarip@xxxxxxxxxxxxxxx>
Date: Tue, 17 Feb 2009 15:16:58 +0100
Subject: [PATCH] Let's use the product string for a brandpackage name.
Caveat #1: If the brand package doesn't exist, buildinstall will fail
Caveat #2: If the brand package has uppercase characters in it's name,
it needs to provide ${brand}-{release,logos} in lowercase or
yum thinks the package doesn't exist and buildinstall will fail
An additional patch may be necessary to:
1) check for ${brand}-{release,logos}
2) if those do not exist, fall back by setting the brand to "generic"
This will need to happen *after* the YUM configuration file has been
written, but before upd-instroot is executed.
---
scripts/buildinstall | 4 ++++
scripts/upd-instroot | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/scripts/buildinstall b/scripts/buildinstall
index 818959d..3c59a31 100755
--- a/scripts/buildinstall
+++ b/scripts/buildinstall
@@ -124,6 +124,10 @@ if [ ! -d "$OUTPUT" ]; then
mkdir -p $OUTPUT
fi
+# The first -release and -logos package we are going to look for is the lowercase
+# equivalent of the PRODUCTSTR
+export brandpkgname="`echo $PRODUCTSTR | tr '[:upper:]' '[:lower:]'`"
+
BUILDINSTDIR=$(mktemp -d ${TMPDIR:-/tmp}/buildinstall.tree.XXXXXX)
TREEDIR=$(mktemp -d ${TMPDIR:-/tmp}/treedir.XXXXXX)
CACHEDIR=$(mktemp -d ${TMPDIR:-/tmp}/yumcache.XXXXXX)
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 9c8e370..1ec1b4f 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -172,7 +172,7 @@ PACKAGES="GConf2 NetworkManager ORBit2 PolicyKit VLGothic-fonts acl anaconda
python-urlgrabber pyxf86config raidtools readline redhat-artwork
reiserfs-utils rhpl rpm rpm-libs rpm-python sed selinux-policy-targeted
setup slang smc-fonts-meera specspo sqlite synaptics system-config-date
- system-config-keyboard system-logos system-release taipeifonts tcp_wrappers
+ system-config-keyboard ${brandpkgname}-logos ${brandpkgname}-release taipeifonts tcp_wrappers
tzdata udev un-core-fonts-dotum urw-fonts util-linux-ng vnc-libs vnc-server
wpa_supplicant xkeyboard-config xfsdump xfsprogs xorg-x11 xorg-x11-auth
xorg-x11-base xorg-x11-drivers xorg-x11-font-utils xorg-x11-fonts-ethiopic
--
1.6.0.6
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
