From ad8f2cf9daa125d4d9a04c1bbd7444d80a3561cc Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Sun, 5 May 2019 16:52:57 +0100 Subject: flx/wdd: Version bump Package-Manager: Portage-2.3.62, Repoman-2.3.11 --- .../0.1.36-MEDIUM-Remove-strip-and-uclibc.patch | 149 +++++++++++++++++++++ .../0.1.36-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch | 56 ++++++++ .../9999-MEDIUM-Remove-strip-and-uclibc.patch | 76 +++++------ .../9999-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch | 10 +- flx/wdd/files/wdd.service | 11 ++ flx/wdd/wdd-0.1.35.ebuild | 4 +- flx/wdd/wdd-0.1.36.ebuild | 39 ++++++ flx/wdd/wdd-9999.ebuild | 4 +- 8 files changed, 302 insertions(+), 47 deletions(-) create mode 100644 flx/wdd/files/0.1.36-MEDIUM-Remove-strip-and-uclibc.patch create mode 100644 flx/wdd/files/0.1.36-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch create mode 100644 flx/wdd/files/wdd.service create mode 100644 flx/wdd/wdd-0.1.36.ebuild (limited to 'flx') diff --git a/flx/wdd/files/0.1.36-MEDIUM-Remove-strip-and-uclibc.patch b/flx/wdd/files/0.1.36-MEDIUM-Remove-strip-and-uclibc.patch new file mode 100644 index 00000000..ea26d746 --- /dev/null +++ b/flx/wdd/files/0.1.36-MEDIUM-Remove-strip-and-uclibc.patch @@ -0,0 +1,149 @@ +From 3574e1e2b83063c6108df1430e031f7f8026c0bc Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +Date: Mon, 27 May 2013 22:36:39 +0200 +Subject: [PATCH 1/2] MEDIUM: Remove strip and uclibc + +--- + flx/Makefile | 1 - + ifenslave/Makefile | 2 -- + include/rules.make | 24 +++--------------------- + lcd/Makefile | 2 -- + mii/Makefile | 2 -- + mktmp/Makefile | 2 -- + remount/Makefile | 2 -- + signfs/Makefile | 1 - + wd/Makefile | 2 -- + 9 files changed, 3 insertions(+), 35 deletions(-) + +diff --git a/flx/Makefile b/flx/Makefile +index 68ecb4ce6e2a..408c9b532490 100644 +--- a/flx/Makefile ++++ b/flx/Makefile +@@ -39,7 +39,6 @@ all: $(NAME) + + $(NAME): $(OBJ) + $(CC) -o $(NAME) $(OBJ) $(LDFLAGS) +-# strip -R .note -R .comment signfs + + clean: + @$(RM) -vf $(NAME) $(OBJ) $(LIBTOOLS:.c=.o) *~ core *.bak +diff --git a/ifenslave/Makefile b/ifenslave/Makefile +index a3a9102ae11c..14fd640a388a 100644 +--- a/ifenslave/Makefile ++++ b/ifenslave/Makefile +@@ -13,8 +13,6 @@ ifenslave: + + ifenslave%: ifenslave%.o + $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< +- $(STRIP) -x --strip-unneeded -R .comment -R .note $@ +- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true + + %.o: %.c + $(CC) $(CFLAGS) -c -o $@ $< +diff --git a/include/rules.make b/include/rules.make +index 153adc9224e4..f37e40fbfab5 100644 +--- a/include/rules.make ++++ b/include/rules.make +@@ -1,34 +1,16 @@ + CC ?= gcc +-STRIP ?= strip +-OBJDUMP ?= objdump +-UCLIBC ?= uclibc +- +-CC_ORIG := $(CC) +- +-ifeq ($(NOLIBC),) +-override CC := $(UCLIBC) $(CC) -Os +-else +-override CC := $(CC) -Os -nostdlib -include $(NOLIBC) +-endif + + CFLAGS=$(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL) -fno-exceptions -fno-asynchronous-unwind-tables -fno-unwind-tables -fno-ident + #-mpreferred-stack-boundary=2 -malign-jumps=0 -malign-loops=0 -malign-functions=0 -Os -march=i386 -mcpu=i386 +-LDFLAGS=-s -Wl,--gc-sections ++LDFLAGS=-Wl,--gc-sections + + all: $(OBJS) + + %: %.c +- $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< -lgcc +- $(STRIP) -x --strip-unneeded -R .comment -R .note -R .note.ABI-tag $@ +- $(STRIP) -R .eh_frame_hdr -R .eh_frame $@ +- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true +- $(OBJDUMP) -h $@ | grep -q '\.sbss[ ]*00000000' && $(STRIP) -R .sbss $@ || true ++ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< + + %-debug: %.c +- $(CC) $(LDFLAGS) $(CFLAGS) -DDEBUG -o $@ $< -lgcc +- $(STRIP) -x --strip-unneeded -R .comment -R .note -R .note.ABI-tag $@ +- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true +- $(OBJDUMP) -h $@ | grep -q '\.sbss[ ]*00000000' && $(STRIP) -R .sbss $@ || true ++ $(CC) $(LDFLAGS) $(CFLAGS) -DDEBUG -o $@ $< + + clean: + @rm -f *.[ao] *~ core +diff --git a/lcd/Makefile b/lcd/Makefile +index db9554fda90b..4de920ffff63 100644 +--- a/lcd/Makefile ++++ b/lcd/Makefile +@@ -4,5 +4,3 @@ CFLAGS+=-fomit-frame-pointer + + %: %.c + $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< +- $(STRIP) -x --strip-unneeded -R .comment -R .note $@ +- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true +diff --git a/mii/Makefile b/mii/Makefile +index 7d77fc89b196..21d64d38e15d 100644 +--- a/mii/Makefile ++++ b/mii/Makefile +@@ -7,8 +7,6 @@ all: $(OBJS) + + %-diag: %-diag.o libmii.o + $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ +- $(STRIP) -x --strip-unneeded -R .comment -R .note $@ +- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true + + %.o: %.c + $(CC) -DLIBMII $(CFLAGS) -c -o $@ $< +diff --git a/mktmp/Makefile b/mktmp/Makefile +index af9da6cdc547..ef4b0831851e 100644 +--- a/mktmp/Makefile ++++ b/mktmp/Makefile +@@ -4,5 +4,3 @@ include ../include/rules.make + + %: %.c + $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< +- $(STRIP) -x --strip-unneeded -R .comment -R .note $@ +- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true +diff --git a/remount/Makefile b/remount/Makefile +index b3357a7af175..54a79ad35d6d 100644 +--- a/remount/Makefile ++++ b/remount/Makefile +@@ -7,5 +7,3 @@ remountw : remountr + + %: %.c + $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< +- $(STRIP) -x --strip-unneeded -R .comment -R .note $@ +- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true +diff --git a/signfs/Makefile b/signfs/Makefile +index f50b30161c87..d4214c6a04b3 100644 +--- a/signfs/Makefile ++++ b/signfs/Makefile +@@ -35,7 +35,6 @@ LIBTOOLS=md5.c libtools.c others.c + + $(NAME): libtools.a $(OBJ) + $(CC) -o $(NAME) $(OBJ) $(LDFLAGS) +- #strip -R .note -R .comment signfs + + libtools.a: $(LIBTOOLS:.c=.o) + $(AR) -r libtools.a $(LIBTOOLS:.c=.o) +diff --git a/wd/Makefile b/wd/Makefile +index 9f8e8e03e17d..eaf857a24318 100644 +--- a/wd/Makefile ++++ b/wd/Makefile +@@ -4,5 +4,3 @@ CFLAGS+=-fomit-frame-pointer + + %: %.c + $(CC) $(LDFLAGS) $(CFLAGS) -W -Wall -U_FORTIFY_SOURCE -o $@ $< +- $(STRIP) -x --strip-unneeded -R .comment -R .note $@ +- $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true diff --git a/flx/wdd/files/0.1.36-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch b/flx/wdd/files/0.1.36-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch new file mode 100644 index 00000000..23791250 --- /dev/null +++ b/flx/wdd/files/0.1.36-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch @@ -0,0 +1,56 @@ +From c0497b4105c11b7d4c6239d3eebaedec79f06672 Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +Date: Mon, 27 May 2013 22:36:39 +0200 +Subject: [PATCH 2/2] MEDIUM: Respect CFLAGS and LDFLAGS + +--- + flx/Makefile | 4 ++-- + include/rules.make | 5 ++--- + signfs/Makefile | 4 ++-- + 3 files changed, 6 insertions(+), 7 deletions(-) + +diff --git a/flx/Makefile b/flx/Makefile +index 408c9b532490..09e25b47dba0 100644 +--- a/flx/Makefile ++++ b/flx/Makefile +@@ -32,8 +32,8 @@ SRC=main.c arg.c utils.c md5.c flx.c fct1.c check.c sign.c \ + output.c output_file.c + OBJ=$(SRC:.c=.o) + COPTS=-O2 -fno-strict-aliasing +-CFLAGS= -Wall $(COPTS) -DMEM_OPTIM -DPROGRAM_NAME=\"$(NAME)\" -DPROGRAM_VERSION=\"$(VERSION)\" -U_FORTIFY_SOURCE +-LDFLAGS=-L. -Wl,--gc-sections ++CFLAGS += -DMEM_OPTIM -DPROGRAM_NAME=\"$(NAME)\" -DPROGRAM_VERSION=\"$(VERSION)\" -U_FORTIFY_SOURCE ++LDFLAGS += -L. -Wl,--gc-sections + + all: $(NAME) + +diff --git a/include/rules.make b/include/rules.make +index f37e40fbfab5..02240e0266f8 100644 +--- a/include/rules.make ++++ b/include/rules.make +@@ -1,8 +1,7 @@ + CC ?= gcc + +-CFLAGS=$(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL) -fno-exceptions -fno-asynchronous-unwind-tables -fno-unwind-tables -fno-ident +-#-mpreferred-stack-boundary=2 -malign-jumps=0 -malign-loops=0 -malign-functions=0 -Os -march=i386 -mcpu=i386 +-LDFLAGS=-Wl,--gc-sections ++CFLAGS += $(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL) ++LDFLAGS += -Wl,--gc-sections + + all: $(OBJS) + +diff --git a/signfs/Makefile b/signfs/Makefile +index d4214c6a04b3..ab03992c80ef 100644 +--- a/signfs/Makefile ++++ b/signfs/Makefile +@@ -29,8 +29,8 @@ NAME=signfs + SRC=main.c signfs.c structure.c + OBJ=$(SRC:.c=.o) + COPTS=-Os -march=i386 +-CFLAGS=$(COPTS) -Wall +-LDFLAGS=-L. -ltools ++CFLAGS += -Wall ++LDFLAGS += -L. -ltools + LIBTOOLS=md5.c libtools.c others.c + + $(NAME): libtools.a $(OBJ) diff --git a/flx/wdd/files/9999-MEDIUM-Remove-strip-and-uclibc.patch b/flx/wdd/files/9999-MEDIUM-Remove-strip-and-uclibc.patch index 6ffe6b44..936f584d 100644 --- a/flx/wdd/files/9999-MEDIUM-Remove-strip-and-uclibc.patch +++ b/flx/wdd/files/9999-MEDIUM-Remove-strip-and-uclibc.patch @@ -1,22 +1,22 @@ -From caa62e8ba16c340aafd45375ec99f48261e62abf Mon Sep 17 00:00:00 2001 +From 51361a18c3ccd98ce9075d896430df13b30f6594 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Mon, 27 May 2013 22:36:39 +0200 Subject: [PATCH 1/2] MEDIUM: Remove strip and uclibc --- flx/Makefile | 1 - - ifenslave/Makefile | 3 --- - include/rules.make | 16 +--------------- - lcd/Makefile | 3 --- - mii/Makefile | 3 --- - mktmp/Makefile | 3 --- - remount/Makefile | 3 --- + ifenslave/Makefile | 2 -- + include/rules.make | 24 +++--------------------- + lcd/Makefile | 2 -- + mii/Makefile | 2 -- + mktmp/Makefile | 2 -- + remount/Makefile | 2 -- signfs/Makefile | 1 - - wd/Makefile | 3 --- - 9 files changed, 1 insertion(+), 35 deletions(-) + wd/Makefile | 2 -- + 9 files changed, 3 insertions(+), 35 deletions(-) diff --git a/flx/Makefile b/flx/Makefile -index 68ecb4c..408c9b5 100644 +index 68ecb4ce6e2a..408c9b532490 100644 --- a/flx/Makefile +++ b/flx/Makefile @@ -39,7 +39,6 @@ all: $(NAME) @@ -28,34 +28,37 @@ index 68ecb4c..408c9b5 100644 clean: @$(RM) -vf $(NAME) $(OBJ) $(LIBTOOLS:.c=.o) *~ core *.bak diff --git a/ifenslave/Makefile b/ifenslave/Makefile -index 7ba3dc7..14fd640 100644 +index a3a9102ae11c..14fd640a388a 100644 --- a/ifenslave/Makefile +++ b/ifenslave/Makefile -@@ -13,9 +13,6 @@ ifenslave: +@@ -13,8 +13,6 @@ ifenslave: ifenslave%: ifenslave%.o $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< - $(STRIP) -x --strip-unneeded -R .comment -R .note $@ - $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true -- # sstrip $@ %.o: %.c $(CC) $(CFLAGS) -c -o $@ $< diff --git a/include/rules.make b/include/rules.make -index 715db29..f373aad 100644 +index 153adc9224e4..f37e40fbfab5 100644 --- a/include/rules.make +++ b/include/rules.make -@@ -1,30 +1,16 @@ +@@ -1,34 +1,16 @@ CC ?= gcc -STRIP ?= strip -OBJDUMP ?= objdump --SSTRIP ?= sstrip -UCLIBC ?= uclibc - -CC_ORIG := $(CC) +- +-ifeq ($(NOLIBC),) -override CC := $(UCLIBC) $(CC) -Os +-else +-override CC := $(CC) -Os -nostdlib -include $(NOLIBC) +-endif - CFLAGS=$(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL) + CFLAGS=$(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL) -fno-exceptions -fno-asynchronous-unwind-tables -fno-unwind-tables -fno-ident #-mpreferred-stack-boundary=2 -malign-jumps=0 -malign-loops=0 -malign-functions=0 -Os -march=i386 -mcpu=i386 -LDFLAGS=-s -Wl,--gc-sections +LDFLAGS=-Wl,--gc-sections @@ -63,69 +66,67 @@ index 715db29..f373aad 100644 all: $(OBJS) %: %.c - $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< -- $(STRIP) -x --strip-unneeded -R .comment -R .note $@ +- $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< -lgcc +- $(STRIP) -x --strip-unneeded -R .comment -R .note -R .note.ABI-tag $@ +- $(STRIP) -R .eh_frame_hdr -R .eh_frame $@ - $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true - $(OBJDUMP) -h $@ | grep -q '\.sbss[ ]*00000000' && $(STRIP) -R .sbss $@ || true -- #-if [ -n "$(SSTRIP)" ]; then $(SSTRIP) $@ ; fi ++ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< %-debug: %.c - $(CC) $(LDFLAGS) $(CFLAGS) -DDEBUG -o $@ $< -- $(STRIP) -x --strip-unneeded -R .comment -R .note $@ +- $(CC) $(LDFLAGS) $(CFLAGS) -DDEBUG -o $@ $< -lgcc +- $(STRIP) -x --strip-unneeded -R .comment -R .note -R .note.ABI-tag $@ - $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true - $(OBJDUMP) -h $@ | grep -q '\.sbss[ ]*00000000' && $(STRIP) -R .sbss $@ || true ++ $(CC) $(LDFLAGS) $(CFLAGS) -DDEBUG -o $@ $< clean: @rm -f *.[ao] *~ core diff --git a/lcd/Makefile b/lcd/Makefile -index 71d861f..4de920f 100644 +index db9554fda90b..4de920ffff63 100644 --- a/lcd/Makefile +++ b/lcd/Makefile -@@ -4,6 +4,3 @@ CFLAGS+=-fomit-frame-pointer +@@ -4,5 +4,3 @@ CFLAGS+=-fomit-frame-pointer %: %.c $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< - $(STRIP) -x --strip-unneeded -R .comment -R .note $@ - $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true -- #$(SSTRIP) $@ diff --git a/mii/Makefile b/mii/Makefile -index 791f6b9..21d64d3 100644 +index 7d77fc89b196..21d64d38e15d 100644 --- a/mii/Makefile +++ b/mii/Makefile -@@ -7,9 +7,6 @@ all: $(OBJS) +@@ -7,8 +7,6 @@ all: $(OBJS) %-diag: %-diag.o libmii.o $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ - $(STRIP) -x --strip-unneeded -R .comment -R .note $@ - $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true -- #$(SSTRIP) $@ %.o: %.c $(CC) -DLIBMII $(CFLAGS) -c -o $@ $< diff --git a/mktmp/Makefile b/mktmp/Makefile -index 2188b91..ef4b083 100644 +index af9da6cdc547..ef4b0831851e 100644 --- a/mktmp/Makefile +++ b/mktmp/Makefile -@@ -4,6 +4,3 @@ include ../include/rules.make +@@ -4,5 +4,3 @@ include ../include/rules.make %: %.c $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< - $(STRIP) -x --strip-unneeded -R .comment -R .note $@ - $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true -- #$(SSTRIP) $@ diff --git a/remount/Makefile b/remount/Makefile -index 5aa2491..54a79ad 100644 +index b3357a7af175..54a79ad35d6d 100644 --- a/remount/Makefile +++ b/remount/Makefile -@@ -7,6 +7,3 @@ remountw : remountr +@@ -7,5 +7,3 @@ remountw : remountr %: %.c $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< - $(STRIP) -x --strip-unneeded -R .comment -R .note $@ - $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true -- -if [ -n "$(SSTRIP)" ]; then $(SSTRIP) $@ ; fi diff --git a/signfs/Makefile b/signfs/Makefile -index f50b301..d4214c6 100644 +index f50b30161c87..d4214c6a04b3 100644 --- a/signfs/Makefile +++ b/signfs/Makefile @@ -35,7 +35,6 @@ LIBTOOLS=md5.c libtools.c others.c @@ -137,13 +138,12 @@ index f50b301..d4214c6 100644 libtools.a: $(LIBTOOLS:.c=.o) $(AR) -r libtools.a $(LIBTOOLS:.c=.o) diff --git a/wd/Makefile b/wd/Makefile -index 6f1fa72..eaf857a 100644 +index 9f8e8e03e17d..eaf857a24318 100644 --- a/wd/Makefile +++ b/wd/Makefile -@@ -4,6 +4,3 @@ CFLAGS+=-fomit-frame-pointer +@@ -4,5 +4,3 @@ CFLAGS+=-fomit-frame-pointer %: %.c $(CC) $(LDFLAGS) $(CFLAGS) -W -Wall -U_FORTIFY_SOURCE -o $@ $< - $(STRIP) -x --strip-unneeded -R .comment -R .note $@ - $(OBJDUMP) -h $@ | grep -q '\.data[ ]*00000000' && $(STRIP) -R .data $@ || true -- -if [ -n "$(SSTRIP)" ]; then $(SSTRIP) $@ ; fi diff --git a/flx/wdd/files/9999-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch b/flx/wdd/files/9999-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch index dec2fc8d..2a15d389 100644 --- a/flx/wdd/files/9999-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch +++ b/flx/wdd/files/9999-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch @@ -1,4 +1,4 @@ -From 25a9b5d4cd1b57c81e697ff7e54bf9121e8bbfa4 Mon Sep 17 00:00:00 2001 +From 1d930e321e3ce81a790059ddc7c69d0f09f1bd9f Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Mon, 27 May 2013 22:36:39 +0200 Subject: [PATCH 2/2] MEDIUM: Respect CFLAGS and LDFLAGS @@ -10,7 +10,7 @@ Subject: [PATCH 2/2] MEDIUM: Respect CFLAGS and LDFLAGS 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/flx/Makefile b/flx/Makefile -index 408c9b5..09e25b4 100644 +index 408c9b532490..09e25b47dba0 100644 --- a/flx/Makefile +++ b/flx/Makefile @@ -32,8 +32,8 @@ SRC=main.c arg.c utils.c md5.c flx.c fct1.c check.c sign.c \ @@ -25,13 +25,13 @@ index 408c9b5..09e25b4 100644 all: $(NAME) diff --git a/include/rules.make b/include/rules.make -index f373aad..02240e0 100644 +index f37e40fbfab5..02240e0266f8 100644 --- a/include/rules.make +++ b/include/rules.make @@ -1,8 +1,7 @@ CC ?= gcc --CFLAGS=$(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL) +-CFLAGS=$(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL) -fno-exceptions -fno-asynchronous-unwind-tables -fno-unwind-tables -fno-ident -#-mpreferred-stack-boundary=2 -malign-jumps=0 -malign-loops=0 -malign-functions=0 -Os -march=i386 -mcpu=i386 -LDFLAGS=-Wl,--gc-sections +CFLAGS += $(GCC_ARCH_SMALL) $(GCC_CPU_SMALL) $(GCC_OPT_SMALL) @@ -40,7 +40,7 @@ index f373aad..02240e0 100644 all: $(OBJS) diff --git a/signfs/Makefile b/signfs/Makefile -index d4214c6..ab03992 100644 +index d4214c6a04b3..ab03992c80ef 100644 --- a/signfs/Makefile +++ b/signfs/Makefile @@ -29,8 +29,8 @@ NAME=signfs diff --git a/flx/wdd/files/wdd.service b/flx/wdd/files/wdd.service new file mode 100644 index 00000000..caaec123 --- /dev/null +++ b/flx/wdd/files/wdd.service @@ -0,0 +1,11 @@ +[Unit] +Description=Simple Watchdog Daemon +DefaultDependencies=no + +[Service] +Type=forking +ExecStart=/sbin/wdd / /dev/watchdog /proc/self/root /tmp/. +Restart=no + +[Install] +WantedBy=sysinit.target diff --git a/flx/wdd/wdd-0.1.35.ebuild b/flx/wdd/wdd-0.1.35.ebuild index 6801fc76..43471c06 100644 --- a/flx/wdd/wdd-0.1.35.ebuild +++ b/flx/wdd/wdd-0.1.35.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ EGIT_COMMIT="v${PV}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86 mips arm" +KEYWORDS="amd64 arm mips x86" IUSE="" src_prepare () { diff --git a/flx/wdd/wdd-0.1.36.ebuild b/flx/wdd/wdd-0.1.36.ebuild new file mode 100644 index 00000000..5004eb4d --- /dev/null +++ b/flx/wdd/wdd-0.1.36.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit git-r3 eutils systemd + +DESCRIPTION="Simple Watchdog Daemon" +HOMEPAGE="http://git.formilux.org/?p=dist/src/flxutils.git" +EGIT_REPO_URI="http://master.formilux.org/git/dist/src/flxutils.git" +EGIT_COMMIT="v${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" +IUSE="" + +src_prepare () { + default + + eapply "${FILESDIR}/${PV}-MEDIUM-Remove-strip-and-uclibc.patch" + eapply "${FILESDIR}/${PV}-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch" + + tc-export CC +} + +src_compile () { + emake -C wd +} + +src_install () { + into / + dosbin wd/wdd + doman wd/wdd.8 + + newinitd "${FILESDIR}/${PN}.initd" "${PN}" + newconfd "${FILESDIR}/${PN}.confd" "${PN}" + + systemd_dounit "${FILESDIR}/${PN}.service" +} diff --git a/flx/wdd/wdd-9999.ebuild b/flx/wdd/wdd-9999.ebuild index e4f9241b..4398fbb6 100644 --- a/flx/wdd/wdd-9999.ebuild +++ b/flx/wdd/wdd-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit git-r3 eutils -DESCRIPTION="Formilux Tools" +DESCRIPTION="Simple Watchdog Daemon" HOMEPAGE="http://git.formilux.org/?p=dist/src/flxutils.git" EGIT_REPO_URI="http://master.formilux.org/git/dist/src/flxutils.git" -- cgit v1.2.3