Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fvbe.git;a=commitdiff;h=7eb8d9c825c8004134daa5920f31a9b69d7e3eb9
commit 7eb8d9c825c8004134daa5920f31a9b69d7e3eb9 Author: crazy <[email protected]> Date: Thu Jun 8 18:38:07 2017 +0200 FVBE_ARCH -> x86_64 , just 64bit left diff --git a/Makefile b/Makefile index 77ed6c9..66bb80c 100644 --- a/Makefile +++ b/Makefile @@ -1,26 +1,11 @@ include fvbe.conf -ARCH := $(subst ",,$(FVBE_ARCH)) +ARCH := x86_64 RELEASE := $(subst ",,$(FVBE_ISO_RELEASE)) TYPE := $(subst ",,$(FVBE_ISO_TYPE)) -BRANCH := $(subst ",,$(FVBE_ROOTFS_REPOSITORY)) -UI := $(subst ",,$(FVBE_SETUP_UI)) ISO := fvbe-$(RELEASE)-$(TYPE)-$(ARCH).iso -CFLAGS ?= -O2 -CFLAGS += -std=gnu99 - -ifeq ($(BRANCH),stable) -CFLAGS += -DRELEASE_STABLE -LDFLAGS += -s -FDB := frugalware.fdb -else ifeq ($(BRANCH),current) -CFLAGS += -Wall -Wextra -Winline -DRELEASE_CURRENT -ggdb3 -FDB := frugalware-current.fdb -endif - - rootfs: bin/create-rootfs bin/create-rootfs touch rootfs diff --git a/bin/create-iso b/bin/create-iso index e0566a8..da4b89c 100755 --- a/bin/create-iso +++ b/bin/create-iso @@ -32,7 +32,7 @@ do_layouts() } # First, clean up. -rm -rf $FVBE_ROOT fvbe-$FVBE_ISO_RELEASE-$FVBE_ISO_TYPE-$FVBE_ARCH.iso tmp local local.lastupdate sums var +rm -rf $FVBE_ROOT fvbe-$FVBE_ISO_RELEASE-$FVBE_ISO_TYPE-x86_64.iso tmp local local.lastupdate sums var # Create the skeleton directory. mkdir -p $FVBE_ROOT/{boot/grub/fonts,LiveOS} @@ -87,7 +87,7 @@ configfile /boot/grub/menu.cfg EOF # Create the ISO. -grub-mkrescue -o fvbe-$FVBE_ISO_RELEASE-$FVBE_ISO_TYPE-$FVBE_ARCH.iso $FVBE_ROOT -- -boot_image any partition_offset=16 -volid FVBE +grub-mkrescue -o fvbe-$FVBE_ISO_RELEASE-$FVBE_ISO_TYPE-x86_64.iso $FVBE_ROOT -- -boot_image any partition_offset=16 -volid FVBE # Delete the root directory. rm -rf $FVBE_ROOT tmp local local.lastupdate sums var diff --git a/bin/create-rootfs b/bin/create-rootfs index 99044fd..fc63624 100755 --- a/bin/create-rootfs +++ b/bin/create-rootfs @@ -53,7 +53,7 @@ cleanup_mounts() { FDB=frugalware-current.fdb -MIRROR="http://ftp.frugalware.org/pub/frugalware/frugalware-current/frugalware-$FVBE_ARCH"; +MIRROR="http://ftp.frugalware.org/pub/frugalware/frugalware-current/frugalware-x86_64"; REPO=$(basename $FDB .fdb) FVBE_ROOTFS_PACKAGES+=${FVBE_ROOTFS_PACKAGES["basic"]} diff --git a/fvbe-skel.conf b/fvbe-skel.conf index f8c1961..5c2e9b2 100644 --- a/fvbe-skel.conf +++ b/fvbe-skel.conf @@ -10,9 +10,6 @@ FVBE_LAYOUT="us" # the console font to use at runtime FVBE_FONT="ter-v16b" -# the architecture to generate for -FVBE_ARCH="x86_64" - # the initial size (in gibibytes) FVBE_ROOTFS_SIZE="4" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
