db07609875
segfaults from bnc#710486 due to unchecked usage of return value of open_ctree() [fixed compilation warnings] - pull upstream, replace existing patches, spec update - update 'restore' utility - lzo support - tools may now take earlies superblock when opening the fs - other fixes - pull integration-20111030 branch - mkfs: force mkfs if desired - other fixes - add btrfs-dump-super to mkinitrd - other fixes - skip non-existent devices or without media - documentation updates - scrubbing single device - graceful error handling when opening fs fails - updated mkinitrd script to scan devices before mount (bnc#727383) OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=115
54 lines
1.7 KiB
Diff
54 lines
1.7 KiB
Diff
From e2d4509137cb8713b02a030e6116b041ae82588d Mon Sep 17 00:00:00 2001
|
|
From: Goffredo Baroncelli <kreijack@inwind.it>
|
|
Date: Sat, 16 Jul 2011 12:11:52 +0200
|
|
Subject: [PATCH 13/35] Update the makefile for generating the help messages.
|
|
|
|
Update the makefile for generating the help messages.
|
|
---
|
|
Makefile | 17 ++++++++++++++++-
|
|
1 files changed, 16 insertions(+), 1 deletions(-)
|
|
|
|
Index: btrfs-progs-v0.19-118-gfdb6c04/Makefile
|
|
===================================================================
|
|
--- btrfs-progs-v0.19-118-gfdb6c04.orig/Makefile
|
|
+++ btrfs-progs-v0.19-118-gfdb6c04/Makefile
|
|
@@ -38,8 +38,9 @@ all: version $(progs) manpages
|
|
version:
|
|
bash version.sh
|
|
|
|
-btrfs: $(objects) btrfs.o btrfs_cmds.o scrub.o
|
|
+btrfs: $(objects) btrfs.o btrfs_cmds.o scrub.o helpmsg.o
|
|
$(CC) $(CFLAGS) -o btrfs btrfs.o btrfs_cmds.o scrub.o \
|
|
+ helpmsg.o \
|
|
$(objects) $(LDFLAGS) $(LIBS) -lpthread
|
|
|
|
calc-size: $(objects) calc-size.o
|
|
@@ -108,6 +109,19 @@ man/btrfs.8.in: helpextract $(btrfs_man_
|
|
manpages: man/btrfs.8.in
|
|
cd man; make
|
|
|
|
+helpmsg.c: helpextract $(btrfs_man_page_source)
|
|
+ echo >$@ "/*"
|
|
+ echo >>$@ " * this file contains the help messages. It is "
|
|
+ echo >>$@ " * automatically generated. do not edit ! "
|
|
+ echo >>$@ " */"
|
|
+ echo >>$@
|
|
+ echo >>$@ "#define NULL 0"
|
|
+ echo >>$@
|
|
+
|
|
+ echo -n "char * help_messages[] = " >>$@
|
|
+ ./helpextract --c-array $(btrfs_man_page_source) >>$@
|
|
+ echo >>$@ ";"
|
|
+
|
|
install-man:
|
|
cd man; make install
|
|
|
|
@@ -115,6 +129,7 @@ clean :
|
|
rm -f man/btrfs.8.in
|
|
rm -f $(progs) cscope.out *.o .*.d btrfs-convert btrfs-image btrfs-select-super \
|
|
btrfs-zero-log btrfstune dir-test ioctl-test quick-test version.h
|
|
+ rm -f helpmsg.c
|
|
cd man; make clean
|
|
|
|
install: $(progs) install-man
|