Commit 51ff514deb63c7308aa7a610b3567caf6d2823a4

Authored by Silvan Calarco
1 parent f41f89b1ee
Exists in master

diskimg, rootfs-base: fixes

Showing 3 changed files with 10 additions and 3 deletions Inline Diff

platforms/diskimg/Makefile
1 $(MAKEDIST_TARGET)-diskimg: openmamba-install-scripts 1 $(MAKEDIST_TARGET)-diskimg: openmamba-install-scripts
2 $(MAKEDIST_TARGET)-diskimg-en: 2 $(MAKEDIST_TARGET)-diskimg-en:
3 $(MAKEDIST_TARGET)-diskimg-it: 3 $(MAKEDIST_TARGET)-diskimg-it:
4 $(MAKEDIST_TARGET)-diskimg-baytrail:
5 $(MAKEDIST_TARGET)-diskimg-bananapi:
6 $(MAKEDIST_TARGET)-diskimg-cubox:
7 $(MAKEDIST_TARGET)-diskimg-livecd:
8 $(MAKEDIST_TARGET)-diskimg-raspberrypi:
4 9
platforms/diskimg/pre.inc.sh
1 case $VARIANT in 1 case $VARIANT in
2 baytrail) MODE=rootfsinstall; ROOTFSINSTALL_ADD="-baytrail"; DEVICEARCH=x86_64; MEDIA_SIZE=5120 ;; 2 baytrail) MODE=rootfsinstall; ROOTFSINSTALL_ADD="-baytrail"; DEVICEARCH=x86_64; MEDIA_SIZE=5120 ;;
3 bananapi) MODE=rootfsinstall; ROOTFSINSTALL_ADD="-bpi"; DEVICEARCH=arm; MEDIA_SIZE=2584 ;; 3 bananapi) MODE=rootfsinstall; ROOTFSINSTALL_ADD="-bpi"; DEVICEARCH=arm; MEDIA_SIZE=3584 ;;
4 raspberrypi) MODE=rootfsinstall; ROOTFSINSTALL_ADD="-rpi"; DEVICEARCH=arm; MEDIA_SIZE=2584 ;; 4 raspberrypi) MODE=rootfsinstall; ROOTFSINSTALL_ADD="-rpi"; DEVICEARCH=arm; MEDIA_SIZE=3584 ;;
5 cubox) MODE=rootfsinstall; ROOTFSINSTALL_ADD="-cubox" DEVICEARCH=arm; MEDIA_SIZE=2584 ;; 5 cubox) MODE=rootfsinstall; ROOTFSINSTALL_ADD="-cubox" DEVICEARCH=arm; MEDIA_SIZE=3584 ;;
6 livecd) MODE=usbinstall; ROOTFSINSTALL_ADD= ;; 6 livecd) MODE=usbinstall; ROOTFSINSTALL_ADD= ;;
7 *) MODE=rootfsinstall; ROOTFSINSTALL_ADD= ; DEVICEARCH=$ARCH ;; 7 *) MODE=rootfsinstall; ROOTFSINSTALL_ADD= ; DEVICEARCH=$ARCH ;;
8 esac 8 esac
9 9
platforms/rootfs-base/Makefile
1 $(MAKEDIST_TARGET)-$(PLATFORM)-arm: 1 $(MAKEDIST_TARGET)-$(PLATFORM)-arm:
2 2
3 $(MAKEDIST_TARGET)-$(PLATFORM)-i586: 3 $(MAKEDIST_TARGET)-$(PLATFORM)-i586:
4 4
5 $(MAKEDIST_TARGET)-$(PLATFORM)-x86_64: 5 $(MAKEDIST_TARGET)-$(PLATFORM)-x86_64:
6 6
7 $(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \ 7 $(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \
8 bash rpm smart 8 bash rpm smart
9 9
10 # Localization targets 10 # Localization targets
11 $(MAKEDIST_TARGET)-$(PLATFORM)-en: 11 $(MAKEDIST_TARGET)-$(PLATFORM)-en:
12 12
13 $(MAKEDIST_TARGET)-$(PLATFORM)-es: 13 $(MAKEDIST_TARGET)-$(PLATFORM)-es:
14 14
15 $(MAKEDIST_TARGET)-$(PLATFORM)-it: 15 $(MAKEDIST_TARGET)-$(PLATFORM)-it:
16
17 $(MAKEDIST_TARGET)-$(PLATFORM)-baytrail:
16 18