samples: move samples to specifi platform diretory

Move the platform apl-mrb samples to devicemodel samples directory.
Add the install target to the missing samples files and re-organize the
samples directory structure to have nuc and apl-mrb samples.

Suggested-by: Arzhan Kinzhalin <arzhan.i.kinzhalin@intel.com>
Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>

devicemodel/Makefile

@@ -114,7 +114,8 @@ DISTCLEAN_OBJS := $(shell find $(BASEDIR) -name '*.o')
 
 PROGRAM := acrn-dm
 
-SAMPLES := $(wildcard samples/*)
+SAMPLES_NUC := $(wildcard samples/nuc/*)
+SAMPLES_MRB := $(wildcard samples/apl-mrb/*)
 
 all: include/version.h $(PROGRAM)
 	@echo -n ""
@@ -157,9 +158,11 @@ $(DM_OBJDIR)/%.o: %.c $(HEADERS)
 	[ ! -e $@ ] && mkdir -p $(dir $@); \
 	$(CC) $(CFLAGS) -c $< -o $@
 
-install: $(DM_OBJDIR)/$(PROGRAM) install-samples
-	install -D $(DM_OBJDIR)/$(PROGRAM) $(DESTDIR)/usr/bin/$(PROGRAM)
+install: $(DM_OBJDIR)/$(PROGRAM) install-samples-nuc install-samples-mrb
+	install -D --mode=0755 $(DM_OBJDIR)/$(PROGRAM) $(DESTDIR)/usr/bin/$(PROGRAM)
 
-install-samples: $(SAMPLES)
-	install -d $(DESTDIR)/usr/share/acrn/demo
-	install -t $(DESTDIR)/usr/share/acrn/demo $^
+install-samples-nuc: $(SAMPLES_NUC)
+	install -D -t $(DESTDIR)/usr/share/acrn/samples/nuc $^
+
+install-samples-mrb: $(SAMPLES_MRB)
+	install -D -t $(DESTDIR)/usr/share/acrn/samples/apl-mrb $^

doc/getting_started/index.rst

@@ -176,7 +176,7 @@ partition. Follow these steps:
 
    .. code-block:: none
 
-      # cp /usr/share/acrn/demo/acrn.conf /mnt/loader/entries/
+      # cp /usr/share/acrn/samples/nuc/acrn.conf /mnt/loader/entries/
 
    You will need to edit this file to adjust the kernel version (``linux`` section)
    and also insert the ``PARTUUID`` of your ``/dev/sda3`` partition
@@ -232,12 +232,12 @@ folder) as shown here:
    :caption: devicemodel/samples/bridge.sh
    :language: bash
 
-By default, the script is located in the ``/usr/share/acrn/demo/``
+By default, the script is located in the ``/usr/share/acrn/samples/nuc/``
 directory. Run it to create a network bridge:
 
 .. code-block:: none
 
-   # cd /usr/share/acrn/demo/
+   # cd /usr/share/acrn/samples/nuc/
    # ./bridge.sh
    # cd
 
@@ -295,12 +295,12 @@ Set up Reference UOS
       name on the second line highlighted (check the exact name to be used using:
       ``ls /usr/lib/kernel/org.clearlinux*-standard*``).
 
-   By default, the script is located in the ``/usr/share/acrn/demo/``
+   By default, the script is located in the ``/usr/share/acrn/samples/nuc/``
    directory. You can edit it there, and then run it to launch the User OS:
 
    .. code-block:: none
 
-      # cd /usr/share/acrn/demo/
+      # cd /usr/share/acrn/samples/nuc/
       # ./launch_uos.sh
 
 #. At this point, you've successfully booted the ACRN hypervisor,

hypervisor/bsp/uefi/efi/Makefile

@@ -102,8 +102,7 @@ $(EFI_OBJDIR)/boot.so: $(ACRN_OBJS) $(FS)
 	$(LD) $(LDFLAGS) -o $@ $^  -lgnuefi -lefi $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 
 install-conf: $(CONF_FILE)
-	install -d $(DESTDIR)/usr/share/acrn/demo
-	install -t $(DESTDIR)/usr/share/acrn/demo -m 644 $^
+	install -D --mode=0644 $^ $(DESTDIR)/usr/share/acrn/samples/nuc/acrn.conf
 
 clean:
 	rm -f $(BOOT) $(HV_OBJDIR)/$(HV_FILE).efi $(EFI_OBJDIR)/boot.so $(ACRN_OBJS) $(FS)