From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Marx To: development@lists.ipfire.org Subject: [PATCH] BUG112906: Fix flash-images to build on EFI systems Date: Thu, 02 Mar 2017 17:12:22 +0100 Message-ID: <1488471142-9677-1-git-send-email-alexander.marx@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1028858673574030997==" List-Id: --===============1028858673574030997== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Alexander Marx --- 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 = # @@ -193,7 +193,7 @@ endif -e "s/root=3D[A-Za-z0-9\/=3D-]*/root=3DUUID=3D$$(blkid -o value -s UUID $(= PART_ROOT))/g" =20 # Install GRUB - grub-install --force --recheck --no-floppy \ + grub-install --force --recheck --no-floppy --target=3Di386-pc \ --root-directory=3D$(MNThdd) $(DEVICE) endif =20 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 . = # -# = # -############################################################################= ### - -CC =3D gcc -CFLAGS ?=3D -O2 -Wall -LIBS =3D -lsmooth -lnewt - -PROGS =3D iowrap -SUID_PROGS =3D 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 =3D updxsetperms - -OBJS =3D $(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) --=20 2.7.4 --===============1028858673574030997==--