Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Debian12 arm64 pcardona34 #452

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Core/os_files/dot_hidden
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@ bin
boot
dev
etc
home
lib
lib32
libx32
lib64
lost+found
media
mnt
opt
proc
Expand Down
3 changes: 3 additions & 0 deletions Packaging/Sources/0_build_libdispatch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ else
sudo yum -y install ${DEPS} || exit 1
fi

### To avoid cmake error at Build stage above ###
sudo ldconfig

#----------------------------------------
# Download
#----------------------------------------
Expand Down
18 changes: 14 additions & 4 deletions Packaging/Sources/3_build_core.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,20 @@ $CP_CMD -v ${CORE_SOURCES}/etc/ld.so.conf.d/nextspace.conf $DEST_DIR/etc/ld.so.c
sudo ldconfig

# X11
#if ! [ -d $DEST_DIR/etc/X11/xorg.conf.d ];then
# $MKDIR_CMD -v $DEST_DIR/etc/X11/xorg.conf.d
#fi
#$CP_CMD ${CORE_SOURCES}/etc/X11/xorg.conf.d/*.conf $DEST_DIR/etc/X11/xorg.conf.d/
if ! [ -d $DEST_DIR/etc/X11/xorg.conf.d ];then
$MKDIR_CMD -v $DEST_DIR/etc/X11/xorg.conf.d
fi

# Do not set X11 configuration on a raspberry pi SBC
# It is already set with kernel mod loading at boot
if [ ${MACHINE} = "aarch64" ];then
if [ -f $DEST_DIR/etc/X11/xorg.conf.d/99-v3d.conf ];then
${ECHO} "We do not set X11 on a pi machine. Already done.\n"
else
$CP_CMD ${CORE_SOURCES}/etc/X11/xorg.conf.d/*.conf $DEST_DIR/etc/X11/xorg.conf.d/
fi
fi

$CP_CMD ${CORE_SOURCES}/etc/X11/Xresources.nextspace $DEST_DIR/etc/X11

# PolKit & udev
Expand Down
29 changes: 28 additions & 1 deletion Packaging/Sources/4_build_libwraster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,33 @@ else
sudo yum -y install ${DEPS} || exit 1
fi

#---------------------------------------------------------
# Solving deprecated dependency
# with libjpeg8 and libtiff5
# in WRASTER_RUN_DEPS
# Instead, libjpeg62(-turbo) and libtiff6 were installed
#---------------------------------------------------------

if [ ${OS_ID} = "debian" ];then
# libjpeg8 --> libjpeg62
if [ -f "/usr/lib/${MACHINE}-linux-gnu/libjpeg.so.62" ];then
sudo ln -s "/usr/lib/${MACHINE}-linux-gnu/libjpeg.so.8" "/usr/lib/${MACHINE}-linux-gnu/libjpeg.so.62"
${ECHO} "Symbolic link added for libjpeg.so.8"
else
${ECHO} "You need to find 'libjpeg.so.62' path fisrt !"
${ECHO} "Aborting building..."
exit 1
fi
# Libtiff5 --> Libtiff6
if [ -f "/usr/lib/${MACHINE}-linux-gnu/libtiff.so.6" ];then
sudo ln -s "/usr/lib/${MACHINE}-linux-gnu/libtiff.so.5" "/usr/lib/${MACHINE}-linux-gnu/libtiff.so.6"
${ECHO} "Symbolic link added for libtiff.so.5"
else
${ECHO} "You need to find 'libtiff.so.6' path first !"
${ECHO} "Aborting building..."
exit 1
fi
fi

#----------------------------------------
# Download
Expand All @@ -43,4 +70,4 @@ $INSTALL_CMD || exit 1

if [ "$DEST_DIR" = "" ]; then
sudo ldconfig
fi
fi
23 changes: 22 additions & 1 deletion Packaging/Sources/5_build_libs-base.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# Install package dependecies
#----------------------------------------
${ECHO} ">>> Installing ${OS_ID} packages for GNUstep Base (Foundation) build"
if [ ${OS_ID} = "debian" ] || [ ${OS_ID} = "ubuntu" ]; then
if [ ${OS_ID} = "debian" ] || [ ${OS_ID} = "ubuntu" ];then
${ECHO} "Debian-based Linux distribution: calling 'apt-get install'."
sudo apt-get install -y ${GNUSTEP_BASE_DEPS} || exit 1
else
Expand All @@ -18,6 +18,27 @@ else
sudo yum -y install ${DEPS} || exit 1
fi

#----------------------------------------
# Solving the deprecated dependency
# to libicu70
# in GNUSTEP_BASE_RUN_DEPS
#----------------------------------------

if [ ${OS_ID} = "debian" ];then
for ICUSUFFIXE in "data" "i18n" "io" "test" "tu" "uc"
do
if [ -f /usr/lib/${MACHINE}-linux-gnu/libicu${ICUSUFFIXE}.so.72 ];then
${ECHO} "Symbolic link created for libicu${ICUSUFFIXE}.so.70"
sudo ln -s /usr/lib/${MACHINE}-linux-gnu/libicu${ICUSUFFIXE}.so.70 /usr/lib/${MACHINE}-linux-gnu/libicu${ICUSUFFIXE}.so.72
else
${ECHO} "You must find libicu${ICUSUFFIXE}.so.72 path first !"
${ECHO} "Aborting building."
exit 1
fi
done
fi


#----------------------------------------
# Download
#----------------------------------------
Expand Down
24 changes: 6 additions & 18 deletions Packaging/Sources/9_build_Applications.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
. ../environment.sh
. /etc/profile.d/nextspace.sh


#----------------------------------------
# Install package dependecies
#----------------------------------------
Expand Down Expand Up @@ -73,22 +74,9 @@ $INSTALL_CMD || exit
sudo ldconfig

#----------------------------------------
# Post install
# Post install : go to external script
#----------------------------------------
if [ "$DEST_DIR" = "" ] && [ "$GITHUB_ACTIONS" != "true" ]; then
# Login
${ECHO} "Setting up Login window service to run at system startup..."
sudo systemctl enable /usr/NextSpace/Apps/Login.app/Resources/loginwindow.service
sudo systemctl set-default graphical.target

# SELinux
if [ -f /etc/selinux/config ]; then
SELINUX_STATE=`grep "^SELINUX=.*" /etc/selinux/config | awk -F= '{print $2}'`
if [ "${SELINUX_STATE}" != "disabled" ]; then
${ECHO} -n "SELinux enabled - dissabling it..."
sudo sed -i -e ' s/SELINUX=.*/SELINUX=disabled/' /etc/selinux/config
${ECHO} "done"
${ECHO} "Please reboot to apply changes."
fi
fi
fi

### This section goes out to 11th stage
# Because We need to have .xinitrc set before lauchning graphical.target...

12 changes: 11 additions & 1 deletion Packaging/Sources/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ $ ./8_build_Frameworks.sh
$ ./9_build_Applications.sh
```

## Installing default profile and configuration
## Installing default profile and configuration and Post-Install

If you omit running `setup_user_home.sh` script at installation time, configartion files available at /etc/skel directory.

Expand All @@ -48,6 +48,16 @@ Before you can run NEXTSPACE, you need to make sure you install various scripts
$ sudo ./setup_user_home.sh
$ ./setup_user_home.sh
```

Before installing a display manager, you should test NeXTspace:

`startx`

If it is OK, logout the Workspace and install the Display Manager:
```
$ ./setup_display-manager.sh
```

Note that this is "minimal" startup configuration, which uses xinitrc script to start everything up (usually invoked as part of startx). If you want to use Login.app or start Workspace in any other way, you may have to create your own configuration.

User home directory profile consists of the following components:
Expand Down
21 changes: 6 additions & 15 deletions Packaging/Sources/debian-12.deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,19 @@ WRASTER_DEPS="
libxmu-dev
libxext-dev
libx11-dev
libgraphicsmagick1-dev
"
WRASTER_RUN_DEPS="
libgif7
libjpeg8
libtiff5
libjpeg62-turbo
libtiff6
libpng16-16
libwebp7
libxpm4
libxmu6
libxext6
libx11-6
libx11-6
libgraphicsmagick-q16-3
"
#--- gnustep-base
GNUSTEP_BASE_DEPS="
Expand Down Expand Up @@ -134,22 +136,11 @@ APPS_BUILD_DEPS="
libpam0g-dev
"
APPS_RUN_DEPS="
xorg
fontconfig
libfontconfig1
libxft2
libxinerama1
libxcomposite1
libxrender1
libxdamage1
libexif12
xserver-xorg-core
xserver-xorg-input-evdev
xserver-xorg-input-synaptics
xfonts-100dpi
xserver-xorg-video-vmware
xserver-xorg-video-intel
x11-xkb-utils
x11-xserver-utils
"
# libpam0g
#xserver-xorg-input-kbd
Expand Down
40 changes: 40 additions & 0 deletions Packaging/Sources/setup_display-manager.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#!/bin/sh

. ../environment.sh
. /etc/profile.d/nextspace.sh

#----------------------------------------
# Post install
#----------------------------------------

### Set at 11th stage because We need to have .xinitrc set before lauchning graphical.target...

if ! [ -f $HOME/.xinitrc ];then
${ECHO} "Please, execute 10th stage before this:\n'./10_setup_user_home.sh'\nwith and then without sudo.\n"
exit 1
fi

if [ "$DEST_DIR" = "" ] && [ "$GITHUB_ACTIONS" != "true" ];then
# Login with a display manager
if [ ${OS_ID} = "debian" ] && [ ${MACHINE} = "aarch64" ];then
### Need to install xdm Login Manager to avoid Login.app issue
sudo apt-get install -y xdm
# XDM needs .xsessionrc
cp $HOME/.xinitrc $HOME/.xsessionrc
else
${ECHO} "Setting up Login window service to run at system startup..."
sudo systemctl enable /usr/NextSpace/Apps/Login.app/Resources/loginwindow.service
fi
sudo systemctl set-default graphical.target

# SELinux
if [ -f /etc/selinux/config ]; then
SELINUX_STATE=`grep "^SELINUX=.*" /etc/selinux/config | awk -F= '{print $2}'`
if [ "${SELINUX_STATE}" != "disabled" ]; then
${ECHO} -n "SELinux enabled - dissabling it..."
sudo sed -i -e ' s/SELINUX=.*/SELINUX=disabled/' /etc/selinux/config
${ECHO} "done"
${ECHO} "Please reboot to apply changes."
fi
fi
fi
4 changes: 4 additions & 0 deletions Packaging/Sources/setup_user_home.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/sh

. ../environment.sh


echo "Copying initial settings from $PWD/home"
if [ -d "$HOME/Library" ];then
echo "$HOME/Library exists already, please make sure it is up to date"
Expand All @@ -14,3 +17,4 @@ if [ -f "$HOME/.xinitrc" ];then
else
cp ./extra/xinitrc $HOME/.xinitrc
fi

5 changes: 5 additions & 0 deletions Packaging/environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ fi
OS_NAME=$NAME
${ECHO} "OS:\t\t${OS_ID}-${OS_VERSION}"

#----------------------------------------
# Machine
#----------------------------------------
MACHINE=$(uname -m)

#----------------------------------------
# Paths
#----------------------------------------
Expand Down
35 changes: 0 additions & 35 deletions README.md

This file was deleted.