Commit aed334a6 authored by mara's avatar mara
Browse files

image: changing base image to server

parent 0d7cb7bb
......@@ -204,7 +204,7 @@ for image_type in ${DISTR_IMAGES[@]}; do
get_name_rootfs ${image_type}
clean_rootfs ${image_type}
if [[ ${image_type} == base ]]; then
if [[ ${image_type} == server ]]; then
prepare_rootfs
create_bootloader_pack
download_pkg $DISTR_URL "${image_type}"
......@@ -229,7 +229,7 @@ for image_type in ${DISTR_IMAGES[@]}; do
[[ $IMAGE_COMPRESSION == yes ]] && image_compression "$ROOTFS"
fi
if [[ ${image_type} != base ]]; then
if [[ ${image_type} != server ]]; then
message "" "create" "$ROOTFS_DESKTOP"
rsync -ar --del $SOURCE/$ROOTFS/ $SOURCE/$ROOTFS_DESKTOP >> $LOG 2>&1 || (message "err" "details" && exit 1) || exit 1
......
......@@ -11,7 +11,7 @@ get_name_rootfs() {
image_type="$1"
kernel_version KERNEL_VERSION
if [[ $image_type == base ]]; then
if [[ $image_type == server ]]; then
ROOTFS="${ROOTFS_NAME}-${ARCH}-${image_type}-$BOARD_NAME-$KERNEL_VERSION-build-${ROOTFS_VERSION}"
else
ROOTFS_DESKTOP="${ROOTFS_NAME}-${ARCH}-${image_type}-$BOARD_NAME-$KERNEL_VERSION-build-${ROOTFS_VERSION}"
......@@ -22,12 +22,12 @@ get_name_rootfs() {
clean_rootfs() {
image_type="$1"
if [[ $image_type == base ]] && [[ ! -z $ROOTFS ]] && [[ -d $SOURCE/$ROOTFS ]]; then
if [[ $image_type == server ]] && [[ ! -z $ROOTFS ]] && [[ -d $SOURCE/$ROOTFS ]]; then
message "" "clean" "$ROOTFS"
rm -rf $SOURCE/$ROOTFS >> $LOG 2>&1 || (message "err" "details" && exit 1) || exit 1
fi
if [[ $image_type != base ]] && [[ ! -z $ROOTFS_DESKTOP ]] && [[ -d $SOURCE/$ROOTFS_DESKTOP ]] ;then
if [[ $image_type != server ]] && [[ ! -z $ROOTFS_DESKTOP ]] && [[ -d $SOURCE/$ROOTFS_DESKTOP ]] ;then
message "" "clean" "$ROOTFS_DESKTOP"
rm -rf $SOURCE/$ROOTFS_DESKTOP >> $LOG 2>&1 || (message "err" "details" && exit 1) || exit 1
fi
......@@ -175,7 +175,7 @@ download_pkg() {
install_pkg(){
if [[ $1 == base ]]; then
if [[ $1 == server ]]; then
local ROOTFS="$ROOTFS"
else
local ROOTFS="$ROOTFS_DESKTOP"
......
a/acpid
a/elogind
a/ndctl
a/openssl-solibs
a/patch
......@@ -8,7 +7,6 @@ a/udisks
a/udisks2
a/volume_key
a/upower
a/usbutils
ap/alsa-utils
ap/flac
......@@ -17,16 +15,13 @@ ap/htop
ap/lm_sensors
ap/mpg123
ap/pamixer
ap/sqlite
d/binutils
d/gcc
d/git
d/guile
d/llvm
d/make
d/python2
d/python3
d/sassc
d/vala
......@@ -37,8 +32,6 @@ l/a52dec
l/alsa-lib
l/alsa-oss
l/alsa-plugins
l/apr
l/apr-util
l/aspell
l/aspell-en
l/at-spi2-atk
......@@ -47,7 +40,6 @@ l/atk
l/atkmm
l/audiofile
l/boost
l/brotli
l/cairo
l/cairomm
l/dbus-glib
......@@ -100,10 +92,8 @@ l/gvfs
l/harfbuzz
l/hicolor-icon-theme
l/icon-naming-utils
l/icu4c
l/isl
l/iso-codes
l/jansson
l/jasper
l/keybinder3
l/keyutils
......@@ -118,7 +108,6 @@ l/libatasmart
l/libbluray
l/libcaca
l/libcanberra
l/libcap-ng
l/libcdio
l/libcdio-paranoia
l/libdbusmenu
......@@ -170,7 +159,6 @@ l/libssh
l/libtasn1
l/libtiff
l/libtheora
l/libunwind
l/libusbmuxd
l/libvorbis
l/libvpx
......@@ -214,8 +202,6 @@ l/shared-desktop-ontologies
l/shared-mime-info
l/sound-theme-freedesktop
l/startup-notification
l/talloc
l/tevent
l/v4l-utils
l/vte
l/wavpack
......@@ -224,23 +210,8 @@ l/zstd
n/bluez
n/bluez-firmware
n/c-ares
n/conntrack-tools
n/curl
n/cyrus-sasl
n/gnupg2
n/gnutls
n/iptables
n/krb5
n/libassuan
n/libgcrypt
n/libgpg-error
n/nettle
n/nghttp2
n/npth
n/openssl
n/p11-kit
n/samba
x/anthy
x/appres
......
......@@ -58,7 +58,6 @@ a/nvi
a/pam
a/pkgtools
a/procps-ng
a/reiserfsprogs
a/sed
a/shadow
a/sysfsutils
......@@ -80,26 +79,41 @@ ap/diffutils
ap/groff
ap/man-db
ap/man-pages
ap/mariadb
ap/mc
ap/nano
ap/screen
ap/sqlite
ap/slackpkg
ap/sudo
ap/vim
d/git
d/perl
d/python-pip
d/python-setuptools
d/python3
d/ruby
l/apr
l/apr-util
l/brotli
l/db48
l/glib2
l/icu4c
l/jansson
l/json-c
l/libcap
l/libcap-ng
l/libedit
l/libidn
l/libnl3
l/libnsl
l/libpcap
l/libpsl
l/libsodium
l/libunistring
l/libunwind
l/libusb
l/libusb-compat
l/libuv
......@@ -113,36 +127,70 @@ l/newt
l/pcre
l/pcre2
l/slang
l/talloc
l/tevent
l/xxHash
n/ModemManager
n/NetworkManager
n/bind
n/c-ares
n/ca-certificates
n/cifs-utils
n/crda
n/curl
n/cyrus-sasl
n/dhcp
n/dhcpcd
n/dnsmasq
n/gnupg
n/gnupg2
n/gnutls
n/gpgme
n/httpd
n/iproute2
n/iptables
n/iptraf-ng
n/iputils
n/iw
n/krb5
n/lftp
n/libassuan
n/libgcrypt
n/libgpg-error
n/libmbim
n/libmnl
n/libndp
n/libnetfilter_conntrack
n/libnfnetlink
n/libqmi
n/libtirpc
n/nc
n/net-tools
n/nettle
n/network-scripts
n/nfs-utils
n/nghttp2
n/ntp
n/openssh
n/openssl
n/openvpn
n/p11-kit
n/php
n/postfix
n/ppp
n/rp-pppoe
n/rpcbind
n/rsync
n/s-nail
n/samba
n/sshfs
n/tcp_wrappers
n/tcpdump
n/telnet
n/traceroute
n/vlan
n/vsftpd
n/wget
n/wireguard-tools
n/wireless_tools
......
......@@ -33,7 +33,7 @@ DISTR_VERSION=${DISTR_VERSION:-"current"} # or 15.0
#---------------------------------------------
# configuration build images and desktop environment
#---------------------------------------------
DISTR_IMAGES+=("base")
DISTR_IMAGES+=("server")
if [[ $DESKTOP_SELECTED == yes ]]; then
if [[ -z $DE ]]; then
DISTR_IMAGES+=("xfce")
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment