Development March 2017

development@lists.ipfire.org

7 participants
42 discussions

[PATCH v2] BUG11296: Fix flash-images to build on EFI systems
by Alexander Marx 02 Mar '17

02 Mar '17

Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> --- lfs/flash-images | 4 ++-- src/misc-progs/Makefile | 57 ------------------------------------------------- 2 files changed, 2 insertions(+), 59 deletions(-) delete mode 100644 src/misc-progs/Makefile diff --git a/lfs/flash-images b/lfs/flash-images index d10fc9b..73129f3 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -1,4 +1,4 @@ -############################################################################### +cd############################################################################### # # # IPFire.org - A linux based firewall # # Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # @@ -193,7 +193,7 @@ endif -e "s/root=[A-Za-z0-9\/=-]*/root=UUID=$$(blkid -o value -s UUID $(PART_ROOT))/g" # Install GRUB - grub-install --force --recheck --no-floppy \ + grub-install --force --recheck --no-floppy --target=i386-pc \ --root-directory=$(MNThdd) $(DEVICE) endif diff --git a/src/misc-progs/Makefile b/src/misc-progs/Makefile deleted file mode 100644 index 08a4e37..0000000 --- a/src/misc-progs/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -CC = gcc -CFLAGS ?= -O2 -Wall -LIBS = -lsmooth -lnewt - -PROGS = iowrap -SUID_PROGS = squidctrl sshctrl ipfirereboot \ - ipsecctrl timectrl dhcpctrl snortctrl \ - applejuicectrl rebuildhosts backupctrl collectdctrl \ - logwatch openvpnctrl firewallctrl \ - wirelessctrl getipstat qosctrl launch-ether-wake \ - redctrl syslogdctrl extrahdctrl sambactrl upnpctrl \ - smartctrl clamavctrl addonctrl pakfire mpfirectrl wlanapctrl \ - setaliases urlfilterctrl updxlratorctrl fireinfoctrl rebuildroutes \ - getconntracktable wirelessclient torctrl ddnsctrl unboundctrl -SUID_UPDX = updxsetperms - -OBJS = $(patsubst %,%.o,$(PROGS) $(SUID_PROGS)) - -install: all - install -m 755 $(PROGS) /usr/local/bin - install -m 4750 -g nobody $(SUID_PROGS) /usr/local/bin - -all: $(PROGS) $(SUID_PROGS) - -clean: - -rm -f $(PROGS) $(SUID_PROGS) *.o core - -###### - -%.o: %.c - $(CC) $(CFLAGS) -c $< -o $@ - -setuid.o: setuid.c setuid.h - $(CC) $(CFLAGS) -c $< -o $@ - -$(PROGS) $(SUID_PROGS): setuid.o | $(OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.o $< $(LIBS) -- 2.7.4

1 0

[PATCH] BUG112906: Fix flash-images to build on EFI systems
by Alexander Marx 02 Mar '17

02 Mar '17

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development March 2017