From ed400fd40cab128336c2956746c117e34b8cb715 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Thu, 21 Aug 2014 19:38:08 +0200 Subject: [PATCH] rootfs: x86_64 support rootfs, rootfs-light: install openmamba-devel only if in devel --- platforms/rootfs-light/Makefile | 4 ++-- platforms/rootfs/Makefile | 4 ++-- platforms/rootfs/settings.inc | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/platforms/rootfs-light/Makefile b/platforms/rootfs-light/Makefile index 2047f17..784186d 100644 --- a/platforms/rootfs-light/Makefile +++ b/platforms/rootfs-light/Makefile @@ -10,12 +10,12 @@ $(MAKEDIST_TARGET)-$(PLATFORM)-i586: \ kernel-mamba kernel-mamba-sound kernel-mamba-wireless chromium \ kernel-mamba-64GB kernel-mamba-64GB-sound kernel-mamba-64GB-wireless -$(MAKEDIST_TARGET)-$(PLATFORM): \ +$(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \ lxde openssh-server usbutils wireless_tools screen i2c-tools \ parted iputils file rootfiles ppp minicom chrony locales mc \ man-db curl zip unzip iptables iproute wpa_supplicant mtd-utils nfs-utils \ openssh-clients binutils telnet ftp debianutils diffutils bluez traceroute \ - openmamba-devel timezone sudo kmod \ + timezone sudo kmod \ liblame expect prelink NetworkManager ModemManager NetworkManager-openvpn \ procps xorg-server x11vnc xkeyboard-config \ xorg-drv-input-tslib xcursor-transparent-theme rpm smart xdg-utils \ diff --git a/platforms/rootfs/Makefile b/platforms/rootfs/Makefile index 098399e..f46b301 100644 --- a/platforms/rootfs/Makefile +++ b/platforms/rootfs/Makefile @@ -14,12 +14,12 @@ $(MAKEDIST_TARGET)-$(PLATFORM)-i586: \ kernel-mamba-64GB kernel-mamba-64GB-sound kernel-mamba-64GB-wireless \ chromium -$(MAKEDIST_TARGET)-$(PLATFORM): \ +$(MAKEDIST_TARGET)-$(PLATFORM): $(MAKEDIST_TARGET)-devel \ $(MAKEDIST_TARGET)-$(PLATFORM)-kde4 openssh-server usbutils wireless_tools i2c-tools \ parted iputils file rootfiles ppp minicom chrony locales mc \ man-db curl zip unzip iptables iproute wpa_supplicant mtd-utils nfs-utils \ openssh-clients binutils telnet ftp debianutils diffutils bluez traceroute \ - openmamba-devel timezone sudo kmod \ + timezone sudo kmod \ liblame expect prelink NetworkManager ModemManager procps \ xorg-server x11vnc xkeyboard-config screen \ xorg-drv-input-tslib xcursor-transparent-theme rpm smart xdg-utils \ diff --git a/platforms/rootfs/settings.inc b/platforms/rootfs/settings.inc index a63e64a..32a1131 100644 --- a/platforms/rootfs/settings.inc +++ b/platforms/rootfs/settings.inc @@ -9,6 +9,11 @@ elif [ "$ARCH" = "i586" ]; then KERNEL_PLATFORM="" #KERNEL_ADDITIONAL="extramodules sound" KERNEL_MORE_EXTRAVER=mamba-64GB +elif [ "$ARCH" = "x86_64" ]; then + KERNEL_EXTRAVER=mamba-x86_64 + KERNEL_PLATFORM="" + #KERNEL_ADDITIONAL="extramodules sound" + KERNEL_MORE_EXTRAVER= fi APPLICATION_TARGET="" MEDIA=archive_xz