Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=c8896380b175a7b24d314c9101815175c701bf54
commit c8896380b175a7b24d314c9101815175c701bf54 Author: James Buren <[email protected]> Date: Fri Sep 16 06:19:30 2011 -0500 frugalwareutils-0.9.5-3-x86_64 * add patch for grub initrd support * release bump diff --git a/source/base/frugalwareutils/FrugalBuild b/source/base/frugalwareutils/FrugalBuild index 26853d9..4a04a17 100644 --- a/source/base/frugalwareutils/FrugalBuild +++ b/source/base/frugalwareutils/FrugalBuild @@ -9,7 +9,7 @@ USE_APIDOCS=${USE_APIDOCS:-"y"} pkgname=frugalwareutils pkgver=0.9.5 Fuse $USE_DEVEL && pkgver=0.8.7.6.g3d85830 -pkgrel=2 +pkgrel=3 pkgdesc="Frugalware configuration utilities." url="http://ftp.frugalware.org/pub/other/frugalwareutils"; depends=('glib2>=2.16.4-2' 'ncurses>=5.6-4' 'parted>=2.3' \ @@ -23,8 +23,8 @@ replaces=('kxgenerator') archs=('i686' 'x86_64' 'ppc' 'arm') up2date="lynx -dump $url|Flasttar" if ! Fuse $USE_DEVEL; then - source=($url/$pkgname-$pkgver.tar.gz) - signatures=(${source[0]}.asc) + source=($url/$pkgname-$pkgver.tar.gz $pkgname-grubconfig-initrd.patch) + signatures=(${source[0]}.asc '') else _F_scm_type="git" _F_scm_url="git://git.frugalware.org/pub/other/frugalwareutils/frugalwareutils" diff --git a/source/base/frugalwareutils/frugalwareutils-grubconfig-initrd.patch b/source/base/frugalwareutils/frugalwareutils-grubconfig-initrd.patch new file mode 100644 index 0000000..5308b37 --- /dev/null +++ b/source/base/frugalwareutils/frugalwareutils-grubconfig-initrd.patch @@ -0,0 +1,72 @@ +diff --git a/libfwgrubconfig/libfwgrubconfig.c b/libfwgrubconfig/libfwgrubconfig.c +index e80a3bb..2263ae6 100644 +--- a/libfwgrubconfig/libfwgrubconfig.c ++++ b/libfwgrubconfig/libfwgrubconfig.c +@@ -50,6 +50,7 @@ typedef struct mdu_version_s { + struct fwgrub_entry_t { + FILE *fp; + char *title; ++ char *initrd; + char *grubbootdev; + char *bootstr; + char *kernel; +@@ -462,18 +463,22 @@ static int write_entry(struct fwgrub_entry_t *entry) + if(entry->opts) + { + if(entry->rootdev && strlen(entry->rootdev)) +- fprintf(entry->fp, "\tkernel %s%s%s root=%s %s\n\n", ++ fprintf(entry->fp, "\tkernel %s%s%s root=%s %s\n", + entry->grubbootdev, entry->bootstr, entry->kernel, entry->rootdev, entry->opts); + else + // probably rootdev is already included in ->opts +- fprintf(entry->fp, "\tkernel %s%s%s %s\n\n", ++ fprintf(entry->fp, "\tkernel %s%s%s %s\n", + entry->grubbootdev, entry->bootstr, entry->kernel, entry->opts); + } + else + { +- fprintf(entry->fp, "\tkernel %s%s%s\n\n", ++ fprintf(entry->fp, "\tkernel %s%s%s\n", + entry->grubbootdev, entry->bootstr, entry->kernel); + } ++ if(entry->initrd) ++ fprintf(entry->fp,"\tinitrd %s%s%s\n", ++ entry->grubbootdev, entry->bootstr, entry->initrd); ++ putc('\n',entry->fp); + } + else if(!strcmp(entry->type, "chain")) + { +@@ -513,6 +518,8 @@ static void entry_free(struct fwgrub_entry_t *entry) + free(entry->bootstr); + if(entry->kernel) + free(entry->kernel); ++ if(entry->initrd) ++ free(entry->initrd); + if(entry->rootdev) + free(entry->rootdev); + if(entry->opts) +@@ -617,6 +624,7 @@ static int os_prober(FILE *fp) + break; + *ptr='\0'; + // initrd, maybe useful later ++ entry->initrd = NULL; + while(*++ptr) + if(*ptr==':') + break; +@@ -688,6 +696,7 @@ void fwgrub_create_menu(FILE *fp) + if(!stat(path, &buf)) + fprintf(fp, "gfxmenu %s%s/grub/message\n\n", entry.grubbootdev, entry.bootstr); + entry.kernel = strdup("/vmlinuz"); ++ entry.initrd = strdup("/initrd.img.xz"); + swapdev = get_swap_dev(); + if (swapdev) + entry.opts = g_strdup_printf("ro quiet splash resume=%s", swapdev); +@@ -705,6 +714,8 @@ void fwgrub_create_menu(FILE *fp) + entry.rootdev=NULL; + free(entry.opts); + entry.opts=NULL; ++ free(entry.initrd); ++ entry.initrd=NULL; + write_entry(&entry); + } + entry_free(&entry); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
