diff options
| -rw-r--r-- | target/linux/x86/64/profiles/000-Generic.mk | 10 | ||||
| -rw-r--r-- | target/linux/x86/64/target.mk | 1 | ||||
| -rw-r--r-- | target/linux/x86/generic/profiles/000-Generic.mk | 10 | ||||
| -rw-r--r-- | target/linux/x86/geode/profiles/000-Generic.mk | 10 | ||||
| -rw-r--r-- | target/linux/x86/geode/profiles/100-Geos.mk | 24 | ||||
| -rw-r--r-- | target/linux/x86/image/Makefile | 160 | ||||
| -rw-r--r-- | target/linux/x86/legacy/profiles/000-Generic.mk | 10 |
7 files changed, 112 insertions, 113 deletions
diff --git a/target/linux/x86/64/profiles/000-Generic.mk b/target/linux/x86/64/profiles/000-Generic.mk index ccd125afa2..253ffd8a92 100644 --- a/target/linux/x86/64/profiles/000-Generic.mk +++ b/target/linux/x86/64/profiles/000-Generic.mk @@ -5,11 +5,11 @@ # See /LICENSE for more information. # -define Profile/Generic - NAME:=Generic +define Profile/Default + NAME:=Default endef -define Profile/Generic/Description - Generic Profile +define Profile/Default/Description + Default profile endef -$(eval $(call Profile,Generic)) +$(eval $(call Profile,Default)) diff --git a/target/linux/x86/64/target.mk b/target/linux/x86/64/target.mk index 5dd0015a03..fbd379df9c 100644 --- a/target/linux/x86/64/target.mk +++ b/target/linux/x86/64/target.mk @@ -1,5 +1,6 @@ ARCH:=x86_64 BOARDNAME:=x86_64 +SUBTARGET:=64 DEFAULT_PACKAGES += kmod-button-hotplug kmod-e1000e kmod-e1000 kmod-r8169 kmod-igb kmod-bnx2 define Target/Description diff --git a/target/linux/x86/generic/profiles/000-Generic.mk b/target/linux/x86/generic/profiles/000-Generic.mk index 4760767eee..2b4ec3e7a1 100644 --- a/target/linux/x86/generic/profiles/000-Generic.mk +++ b/target/linux/x86/generic/profiles/000-Generic.mk @@ -5,15 +5,15 @@ # See /LICENSE for more information. # -define Profile/Generic - NAME:=Generic +define Profile/Default + NAME:=Default PACKAGES:=kmod-e1000e kmod-igb kmod-bnx2 \ kmod-3c59x kmod-e100 kmod-e1000 kmod-natsemi kmod-ne2k-pci \ kmod-pcnet32 kmod-8139too kmod-r8169 kmod-sis900 kmod-tg3 \ kmod-via-rhine kmod-via-velocity endef -define Profile/Generic/Description - Generic Profile +define Profile/Default/Description + Default Profile endef -$(eval $(call Profile,Generic)) +$(eval $(call Profile,Default)) diff --git a/target/linux/x86/geode/profiles/000-Generic.mk b/target/linux/x86/geode/profiles/000-Generic.mk index 58dc3c641c..17ca8ad4c8 100644 --- a/target/linux/x86/geode/profiles/000-Generic.mk +++ b/target/linux/x86/geode/profiles/000-Generic.mk @@ -5,8 +5,8 @@ # See /LICENSE for more information. # -define Profile/Generic - NAME:=Generic +define Profile/Default + NAME:=Default PACKAGES:= \ soloscli linux-atm br2684ctl ppp-mod-pppoa pppdump pppstats \ hwclock flashrom tc kmod-pppoa kmod-8139cp kmod-mppe \ @@ -14,7 +14,7 @@ define Profile/Generic kmod-via-rhine endef -define Profile/Generic/Description - Generic Profile for all Geode boards. +define Profile/Default/Description + Default Profile for all Geode boards. endef -$(eval $(call Profile,Generic)) +$(eval $(call Profile,Default)) diff --git a/target/linux/x86/geode/profiles/100-Geos.mk b/target/linux/x86/geode/profiles/100-Geos.mk index 94e501edf4..cb33b600d2 100644 --- a/target/linux/x86/geode/profiles/100-Geos.mk +++ b/target/linux/x86/geode/profiles/100-Geos.mk @@ -5,15 +5,15 @@ # See /LICENSE for more information. # -define Profile/Geos - NAME:=Geos - PACKAGES:= \ - soloscli linux-atm br2684ctl ppp-mod-pppoa pppdump pppstats \ - hwclock flashrom tc kmod-pppoa kmod-8139cp kmod-mppe \ - kmod-usb-ohci-pci kmod-hwmon-lm90 -endef - -define Profile/Geos/Description - Traverse Technologies Geos ADSL router -endef -$(eval $(call Profile,Geos)) +#define Profile/Geos +# NAME:=Geos +# PACKAGES:= \ +# soloscli linux-atm br2684ctl ppp-mod-pppoa pppdump pppstats \ +# hwclock flashrom tc kmod-pppoa kmod-8139cp kmod-mppe \ +# kmod-usb-ohci-pci kmod-hwmon-lm90 +#endef +# +#define Profile/Geos/Description +# Traverse Technologies Geos ADSL router +#endef +#$(eval $(call Profile,Geos)) diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index 24825f2ba2..83b8140b7a 100644 --- a/target/linux/x86/image/Makefile +++ b/target/linux/x86/image/Makefile @@ -1,5 +1,6 @@ # # Copyright (C) 2006-2012 OpenWrt.org +# Copyright (C) 2019 Alexander Couzens <lynxis@fe80.eu> # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -47,130 +48,127 @@ ROOTPART:=$(if $(ROOTPART),$(ROOTPART),PARTUUID=$(SIGNATURE)-02) GRUB_TIMEOUT:=$(call qstrip,$(CONFIG_GRUB_TIMEOUT)) GRUB_TITLE:=$(call qstrip,$(CONFIG_GRUB_TITLE)) -ifneq ($(CONFIG_GRUB_IMAGES),) - - BOOTOPTS:=$(call qstrip,$(CONFIG_GRUB_BOOTOPTS)) - - define Image/cmdline/ext4 - root=$(ROOTPART) rootfstype=ext4 rootwait - endef - - define Image/cmdline/squashfs - root=$(ROOTPART) rootfstype=squashfs rootwait - endef +# Convert a raw image into a $1 type image. +# E.g. | qemu-image vdi +define Build/qemu-image + qemu-img convert -f raw -O $1 \ + $@ \ + $@.new + mv $@.new $@ +endef - define Image/Build/grub2 - # left here because the image builder doesnt need these - $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2 - $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz +define Build/grubpc + -rm -rf "$@.grubpc" "$@.root.grub" + $(INSTALL_DIR) $@.root.grub/boot/grub $@.grubpc + $(CP) $(IMAGE_KERNEL) $@.root.grub/boot/vmlinuz grub-mkimage \ -p /boot/grub \ -d $(STAGING_DIR_HOST)/lib/grub/i386-pc \ - -o $(KDIR)/grub2/core.img \ + -o $@.grubpc/core.img \ -O i386-pc \ -c ./grub-early.cfg \ $(GRUB2_MODULES) - $(CP) $(STAGING_DIR_HOST)/lib/grub/i386-pc/*.img $(KDIR)/grub2/ - echo '(hd0) $(BIN_DIR)/$(IMG_COMBINED)-$(1).img' > $(KDIR)/grub2/device.map + $(CP) $(STAGING_DIR_HOST)/lib/grub/i386-pc/*.img $@.grubpc/ + echo '(hd0) $@' > $@.grubpc/device.map sed \ -e 's#@SERIAL_CONFIG@#$(strip $(GRUB_SERIAL_CONFIG))#g' \ -e 's#@TERMINAL_CONFIG@#$(strip $(GRUB_TERMINAL_CONFIG))#g' \ - -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \ + -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(FILESYSTEM)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \ -e 's#@TIMEOUT@#$(GRUB_TIMEOUT)#g' \ -e 's#@TITLE@#$(GRUB_TITLE)#g' \ - ./grub.cfg > $(KDIR)/root.grub/boot/grub/grub.cfg - -$(CP) $(STAGING_DIR_ROOT)/boot/. $(KDIR)/root.grub/boot/ + ./grub.cfg > $@.root.grub/boot/grub/grub.cfg + -$(CP) $(STAGING_DIR_ROOT)/boot/. $@.root.grub/boot/ PADDING="1" SIGNATURE="$(SIGNATURE)" PATH="$(TARGET_PATH)" $(SCRIPT_DIR)/gen_image_generic.sh \ - $(BIN_DIR)/$(IMG_COMBINED)-$(1).img \ - $(CONFIG_TARGET_KERNEL_PARTSIZE) $(KDIR)/root.grub \ - $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1) \ + $@ \ + $(CONFIG_TARGET_KERNEL_PARTSIZE) $@.root.grub \ + $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(IMAGE_ROOTFS) \ 256 grub-bios-setup \ - --device-map="$(KDIR)/grub2/device.map" \ - -d "$(KDIR)/grub2" \ + --device-map="$@.grubpc/device.map" \ + -d "$@.grubpc" \ -r "hd0,msdos1" \ - "$(BIN_DIR)/$(IMG_COMBINED)-$(1).img" + "$@" + rm -rf "$@.grubpc" "$@.root.grub" +endef + +ifneq ($(CONFIG_GRUB_IMAGES),) + BOOTOPTS:=$(call qstrip,$(CONFIG_GRUB_BOOTOPTS)) + + define Image/cmdline/ext4 + root=$(ROOTPART) rootfstype=ext4 rootwait + endef + + define Image/cmdline/squashfs + root=$(ROOTPART) rootfstype=squashfs rootwait endef endif -define Image/Build/iso - $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2 - $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz +define Build/grubiso + -rm -rf "$@.root.grub/boot/grub" "$@.grubiso" + $(INSTALL_DIR) $@.root.grub/boot/grub $@.grubiso + $(CP) $(IMAGE_KERNEL) $@.root.grub/boot/vmlinuz grub-mkimage \ -p /boot/grub \ -d $(STAGING_DIR_HOST)/lib/grub/i386-pc \ - -o $(KDIR)/grub2/eltorito.img \ + -o $@.grub2/eltorito.img \ -O i386-pc \ -c ./grub-early.cfg \ $(GRUB2_MODULES_ISO) cat \ $(STAGING_DIR_HOST)/lib/grub/i386-pc/cdboot.img \ - $(KDIR)/grub2/eltorito.img \ - > $(KDIR)/root.grub/boot/grub/eltorito.img + $@.grub2/eltorito.img \ + > $@.root.grub/boot/grub/eltorito.img sed \ -e 's#@SERIAL_CONFIG@#$(strip $(GRUB_SERIAL_CONFIG))#g' \ -e 's#@TERMINAL_CONFIG@#$(strip $(GRUB_TERMINAL_CONFIG))#g' \ - -e 's#@CMDLINE@#root=/dev/sr0 rootfstype=iso9660 rootwait $(strip $(call Image/cmdline/$(1)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \ + -e 's#@CMDLINE@#root=/dev/sr0 rootfstype=iso9660 rootwait $(strip $(call Image/cmdline/$(FILESYSTEM)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \ -e 's#@TIMEOUT@#$(GRUB_TIMEOUT)#g' \ -e 's#@TITLE@#$(GRUB_TITLE)#g' \ - ./grub-iso.cfg > $(KDIR)/root.grub/boot/grub/grub.cfg - -$(CP) $(STAGING_DIR_ROOT)/boot/. $(KDIR)/root.grub/boot/ + ./grub-iso.cfg > $@.root.grub/boot/grub/grub.cfg + -$(CP) $(STAGING_DIR_ROOT)/boot/. $@.root.grub/boot/ mkisofs -R -b boot/grub/eltorito.img -no-emul-boot -boot-info-table \ - -o $(KDIR)/root.iso $(KDIR)/root.grub $(TARGET_DIR) + -o $@ $@.root.grub $(TARGET_DIR) + rm -rf "$@.root.grub/boot/grub" "$@.grubiso" endef -ifneq ($(CONFIG_VDI_IMAGES),) - define Image/Build/vdi - rm $(BIN_DIR)/$(IMG_COMBINED)-$(1).vdi || true - qemu-img convert -f raw -O vdi \ - $(BIN_DIR)/$(IMG_COMBINED)-$(1).img \ - $(BIN_DIR)/$(IMG_COMBINED)-$(1).vdi - endef -endif - -ifneq ($(CONFIG_VMDK_IMAGES),) - define Image/Build/vmdk - rm $(BIN_DIR)/$(IMG_COMBINED)-$(1).vmdk || true - qemu-img convert -f raw -O vmdk \ - $(BIN_DIR)/$(IMG_COMBINED)-$(1).img \ - $(BIN_DIR)/$(IMG_COMBINED)-$(1).vmdk - endef -endif - -define Image/Build/gzip - gzip -f9n $(BIN_DIR)/$(IMG_COMBINED)-$(1).img - gzip -f9n $(BIN_DIR)/$(IMG_ROOTFS)-$(1).img +define Device/generic + PROFILES := Default + DEVICE_TITLE := Generic (ext4/squashfs) + KERNEL := kernel-bin + IMAGES := vdi.gz vmdk.gz raw.img.gz + IMAGE/vdi.gz := grubpc | qemu-image vdi | gzip + IMAGE/vmdk.gz := grubpc | qemu-image vmdk | gzip + IMAGE/raw.img.gz := grubpc | gzip + FILESYSTEMS := squashfs ext4 endef -$(eval $(call Image/gzip-ext4-padded-squashfs)) +TARGET_DEVICES += generic -define Image/BuildKernel - $(CP) $(KDIR)/bzImage $(BIN_DIR)/$(IMG_PREFIX)-vmlinuz +define Device/generic-iso + PROFILES := Default + DEVICE_TITLE := Generic (iso) + KERNEL := kernel-bin + IMAGES := iso.gz + IMAGE/iso.gz := grubiso | append-metadata | gzip + FILESYSTEMS := iso endef -define Image/Prepare - $(call Image/Prepare/grub2) -endef +TARGET_DEVICES += generic-iso -define Image/Build/Initramfs - $(CP) $(KDIR)/bzImage-initramfs $(BIN_DIR)/$(IMG_PREFIX)-ramfs.bzImage +ifeq ($(SUBTARGET),geode) + +define Device/geos + DEVICE_TITLE := Geos + KERNEL := kernel-bin + IMAGES := iso.gz + IMAGE/iso.gz := grubiso | append-metadata | gzip + FILESYSTEMS := iso + DEVICE_PACKAGES := soloscli linux-atm br2684ctl ppp-mod-pppoa pppdump pppstats \ + hwclock flashrom tc kmod-pppoa kmod-8139cp kmod-mppe \ + kmod-usb-ohci-pci kmod-hwmon-lm90 endef +TARGET_DEVICES += geos -define Image/Build - $(call Image/Build/$(1)) - ifneq ($(1),iso) - $(call Image/Build/grub2,$(1)) - $(call Image/Build/vdi,$(1)) - $(call Image/Build/vmdk,$(1)) - $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_ROOTFS)-$(1).img - else - $(CP) $(KDIR)/root.iso $(BIN_DIR)/$(IMG_PREFIX).iso - endif - $(CP) $(KDIR)/bzImage $(BIN_DIR)/$(IMG_PREFIX)-vmlinuz - $(call Image/Build/gzip/$(1)) -ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) - $(call Image/Build/Initramfs) endif -endef $(eval $(call BuildImage)) diff --git a/target/linux/x86/legacy/profiles/000-Generic.mk b/target/linux/x86/legacy/profiles/000-Generic.mk index 90f989a91d..4a00371bab 100644 --- a/target/linux/x86/legacy/profiles/000-Generic.mk +++ b/target/linux/x86/legacy/profiles/000-Generic.mk @@ -5,14 +5,14 @@ # See /LICENSE for more information. # -define Profile/Generic - NAME:=Generic +define Profile/Default + NAME:=Default PACKAGES:=kmod-3c59x kmod-e100 kmod-e1000 kmod-natsemi kmod-ne2k-pci \ kmod-pcnet32 kmod-8139too kmod-r8169 kmod-sis900 kmod-tg3 \ kmod-via-rhine kmod-via-velocity endef -define Profile/Generic/Description - Generic Profile +define Profile/Default/Description + Default Profile endef -$(eval $(call Profile,Generic)) +$(eval $(call Profile,Default)) |