Fix issues with missing base packages, add more packages to Papyros

channels/gnome/channel.conf

@@ -1,6 +1,6 @@
 OSNAME="gnome"
 
-PKGS="linux ostree-git glib2 xdg-app-git
+PKGS="ostree-git glib2 xdg-app-git
         qml-extras-git qml-material-git
         gnome gdm gnome-session
         xf86-video-vesa xorg-server sudo pacman"

channels/papyros/channel.conf

@@ -3,9 +3,9 @@ OSNAME="papyros"
 # TODO: Also include the following packages (and maybe more):
 #
 
-PKGS="linux ostree-git linux ostree-git glib2 xdg-app-git
-        qml-extras qml-material papyros-shell
-        qt5-base-git qt5-declarative-git  qt5-wayland-dev-git
-        gdm wayland"
+PKGS="ostree-git linux ostree-git glib2 xdg-app-git
+        qml-extras qml-material papyros-shell gdm
+        qt5-base-git qt5-declarative-git qt5-wayland-dev-git
+        xf86-video-vesa xorg-server xorg-server wayland sudo pacman"
 
 ORIGIN_URL="http://papyros.io/ostree/desktop"

pacman.conf

@@ -64,7 +64,7 @@ LocalFileSigLevel = Optional
 # uncommented to enable the repo.
 #
 
-[@OS_NAME@]
+[papyros]
 SigLevel = Never
 Server = file:///@REPO_PATH@
 

powerpack/powerpack-commit

@@ -48,7 +48,6 @@ cp -f "$base_dir"/pacman.conf "$build_dir"
 
 # Add the local repository to the pacman config
 
-replace @OS_NAME@ $OSNAME $build_dir/pacman.conf
 replace @REPO_PATH@ $repo_dir $build_dir/pacman.conf
 
 sed -i "s:^#CacheDir.*:CacheDir = $cache_dir:" "$build_dir"/pacman.conf
@@ -59,7 +58,7 @@ do
 done
 
 # Install all the requested packages
-pacstrap -dcC "$build_dir"/pacman.conf "$os_dir" $PKGS
+pacstrap -dcC "$build_dir"/pacman.conf "$os_dir" base base-devel $PKGS
 
 # Set up the os-release file
 cp "$channels_dir"/$channel_name/os-release "$os_dir"/etc/os-release