From d54c43a63e687b59b3e90cb1cd25c95ecf3ecccd Mon Sep 17 00:00:00 2001 From: Sapan Bhatia Date: Wed, 16 Feb 2011 00:48:04 -0500 Subject: [PATCH] Hack for sidestepping a nasty bug on the f8 build --- spec2make.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/spec2make.c b/spec2make.c index 712ce686..1d68503b 100644 --- a/spec2make.c +++ b/spec2make.c @@ -176,20 +176,25 @@ main(int argc, char *argv[]) arch=target; } } - /* skip empty packages */ - if (pkg->fileList) { - /* attach (add) rpm path to package */ - printf("%s.rpms += RPMS/%s/%s-%s-%s.%s.rpm\n", - package_name, arch, name, version, release, arch); - /* convenience */ - printf("%s.rpmnames += %s\n", - package_name, name); - /* attach path to rpm name */ - printf("%s.rpm-path := RPMS/%s/%s-%s-%s.%s.rpm\n", - name,arch, name, version, release, arch); - /* attach package to rpm name for backward resolution - should be unique */ - printf("%s.package := %s\n", - name,package_name); + /* skip empty packages + * + * Unfortunately, f8 + the RHEL kernel break this bit of cleverness. The following + * line returns false for the kernel-devel package even though it is not empty thereby breaking the build. + * Rather than unfolding the kernel package macros in the current specfile, this hack should work till f8 dies its natural death. */ + + if (pkg->fileList || !strncmp(name,"kernel",sizeof("kernel")-1)) { + /* attach (add) rpm path to package */ + printf("%s.rpms += RPMS/%s/%s-%s-%s.%s.rpm\n", + package_name, arch, name, version, release, arch); + /* convenience */ + printf("%s.rpmnames += %s\n", + package_name, name); + /* attach path to rpm name */ + printf("%s.rpm-path := RPMS/%s/%s-%s-%s.%s.rpm\n", + name,arch, name, version, release, arch); + /* attach package to rpm name for backward resolution - should be unique */ + printf("%s.package := %s\n", + name,package_name); } } } -- 2.43.0