summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rwxr-xr-xsource/a/sysklogd/sysklogd.SlackBuild17
-rwxr-xr-xsource/d/python-pip/python-pip.SlackBuild2
-rwxr-xr-xsource/d/python-setuptools/python-setuptools.SlackBuild9
-rw-r--r--source/installer/ChangeLog.txt8
-rwxr-xr-xsource/installer/build_installer.sh6
-rw-r--r--source/installer/module-blacklist102
-rw-r--r--source/installer/sources/initrd/etc/profile7
-rwxr-xr-xsource/n/links/links.SlackBuild12
-rw-r--r--source/x/x11/build/xinput_calibrator1
-rw-r--r--source/x/x11/configure/xinput_calibrator18
-rw-r--r--source/x/x11/make/xinput_calibrator5
-rw-r--r--source/x/x11/modularize1
-rw-r--r--source/x/x11/post-install/xinput_calibrator.post-install5
-rw-r--r--source/x/x11/slack-desc/xinput_calibrator19
14 files changed, 81 insertions, 131 deletions
diff --git a/source/a/sysklogd/sysklogd.SlackBuild b/source/a/sysklogd/sysklogd.SlackBuild
index 2bca33919..3e635d236 100755
--- a/source/a/sysklogd/sysklogd.SlackBuild
+++ b/source/a/sysklogd/sysklogd.SlackBuild
@@ -29,7 +29,7 @@ BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$(uname -m)" in
- i?86) ARCH=i586 ;;
+ i?86) ARCH=i686 ;;
arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
# Unless $ARCH is already set, use uname -m for all other archs:
*) ARCH=$(uname -m) ;;
@@ -47,21 +47,12 @@ fi
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
- SLKCFLAGS="-O2"
+if [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=pentium4 -mtune=generic"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
+ SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC"
LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
- SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
- LIBDIRSUFFIX=""
else
SLKCFLAGS="-O2"
LIBDIRSUFFIX=""
diff --git a/source/d/python-pip/python-pip.SlackBuild b/source/d/python-pip/python-pip.SlackBuild
index 54797f37b..d75f006af 100755
--- a/source/d/python-pip/python-pip.SlackBuild
+++ b/source/d/python-pip/python-pip.SlackBuild
@@ -31,7 +31,7 @@ SRCNAM=pip
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i586 ;;
+ i?86) ARCH=i686 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
diff --git a/source/d/python-setuptools/python-setuptools.SlackBuild b/source/d/python-setuptools/python-setuptools.SlackBuild
index 080f9dc64..19e378dc4 100755
--- a/source/d/python-setuptools/python-setuptools.SlackBuild
+++ b/source/d/python-setuptools/python-setuptools.SlackBuild
@@ -37,21 +37,14 @@ if [ -z "$ARCH" ]; then
esac
fi
-if [ "$ARCH" = "i586" ]; then
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
+if [ "$ARCH" = "i686" ]; then
LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
- LIBDIRSUFFIX=""
else
LIBDIRSUFFIX=""
fi
-
# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
# the name of the created package would be, and then exit. This information
# could be useful to other scripts.
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index 58bebf0c8..4a775bb4e 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,11 @@
+Sun Jul 28 20:52:21 UTC 2024
+ /etc/profile: export MANPAGER="less -r" to display pages correctly.
+ Also export LESSQUIET=true.
+ Use real "less".
+ Thanks to Brent Earl.
+ module-blacklist: don't blacklist modules that wouldn't be installed anyway.
+ compress dropbear.8 so that it's converted properly to catman format.
++--------------------------+
Thu Jul 25 20:06:25 UTC 2024
Updated compiler flags for i686 and x86_64.
+--------------------------+
diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh
index 4eede4949..b217c48c8 100755
--- a/source/installer/build_installer.sh
+++ b/source/installer/build_installer.sh
@@ -751,6 +751,9 @@ make $SILENTMAKE $NUMJOBS PROGRAMS="$PROGS" MULTI="1" SCPPROGRESS="1" || exit 1
# Install into installer's filesystem:
make $SILENTMAKE DESTDIR=$PKG/$ARCH-installer-filesystem/ MULTI="1" install || exit 1
+# Compress manpage:
+gzip -9 $PKG/$ARCH-installer-filesystem/usr/man/man8/dropbear.8
+
# Link binaries to dropbearmulti since the 'make install' does not do that
# if we build a multicall binary
( cd $PKG/$ARCH-installer-filesystem/bin
@@ -966,6 +969,7 @@ a/inih \
a/jfsutils \
a/kbd \
a/kmod \
+a/less \
a/lvm2 \
a/lzip \
a/lzlib \
@@ -1091,6 +1095,7 @@ cp --remove-destination -fa${VERBOSE1} ${EXTRA_PKGS_USRBIN} \
bash \
ddrescue \
ldd \
+ less \
loadkeys \
lzip \
neofetch \
@@ -2281,6 +2286,7 @@ if [ -d usr/man ]; then
for manpage in \
man8/bcachefs.8.bz2 \
man8/cfdisk.8.bz2 \
+ man8/dropbear.8.bz2 \
man8/fdisk.8.bz2 \
man8/gdisk.8.bz2 \
man8/partprobe.8.bz2 \
diff --git a/source/installer/module-blacklist b/source/installer/module-blacklist
index 9b866fefe..0d1b5423b 100644
--- a/source/installer/module-blacklist
+++ b/source/installer/module-blacklist
@@ -1,41 +1,7 @@
-svcrdma.ko
-xprtrdma.ko
-3w-9xxx.ko
-3w-xxxx.ko
-BusLogic.ko
-DAC960.ko
-a100u2w.ko
-aacraid.ko
-advansys.ko
-aha152x.ko
-aha1542.ko
-aic79xx.ko
-aic7xxx.ko
-aic7xxx_old.ko
-arcmsr.ko
-atp870u.ko
c67x00.ko
-cciss.ko
-configfs.ko
-cpqarray.ko
-crc-itu-t.ko
-crc16.ko
-dc395x.ko
-dmx3191d.ko
-dtc.ko
-eata.ko
-ext2.ko
-ext3.ko
-ext4.ko
-fat.ko
-fdomain.ko
-gdth.ko
-gfs2.ko
hid-a4tech.ko
hid-chicony.ko
hid-cypress.ko
-hid-dell.ko
-hid-dummy.ko
hid-gyration.ko
hid-monterey.ko
hid-petalynx.ko
@@ -43,75 +9,7 @@ hid-pl.ko
hid-samsung.ko
hid-sony.ko
hid-sunplus.ko
-hptiop.ko
i2c-dev.ko
-i2o_block.ko
-i2o_bus.ko
-i2o_core.ko
-i2o_proc.ko
-i2o_scsi.ko
-ide-gd_mod.ko
-in2000.ko
-initio.ko
-ipr.ko
-ips.ko
-isofs.ko
isp116x-hcd.ko
isp1760.ko
-jbd.ko
-jbd2.ko
-jfs.ko
-libsas.ko
-libsrp.ko
-lpfc.ko
-mbcache.ko
-megaraid.ko
-megaraid_mbox.ko
-megaraid_mm.ko
-megaraid_sas.ko
-mptbase.ko
-mptfc.ko
-mptsas.ko
-mptscsih.ko
-mptspi.ko
-msdos.ko
-mvsas.ko
-nls_cp437.ko
-nls_iso8859-1.ko
-nls_utf8.ko
-nsp32.ko
-ohci1394.ko
-dv1394.ko
-video1394.ko
-pata_marvell.ko
-pcilynx.ko
-qla1280.ko
-qla2xxx.ko
-qla4xxx.ko
-qlogicfas.ko
-qlogicfas408.ko
-raid_class.ko
-reiserfs.ko
-scsi_dh.ko
-scsi_dh_alua.ko
-scsi_dh_emc.ko
-scsi_dh_hp_sw.ko
-scsi_dh_rdac.ko
-scsi_transport_fc.ko
-scsi_transport_iscsi.ko
-scsi_transport_sas.ko
-scsi_transport_spi.ko
-scsi_transport_srp.ko
sl811-hcd.ko
-st.ko
-stex.ko
-sx8.ko
-sym53c416.ko
-sym53c8xx.ko
-t128.ko
-tmscsim.ko
-udf.ko
-ultrastor.ko
-vfat.ko
-wd7000.ko
-xfs.ko
diff --git a/source/installer/sources/initrd/etc/profile b/source/installer/sources/initrd/etc/profile
index c728b165b..e5baad18a 100644
--- a/source/installer/sources/initrd/etc/profile
+++ b/source/installer/sources/initrd/etc/profile
@@ -21,6 +21,13 @@ LESS=-MM
PS1='\u@\h:\w# '
PS2='> '
+# Display manpages correctly:
+export MANPAGER="less -r"
+
+# Suppress the "informal messages" in the first line of the lesspipe output.
+# If you like these, comment this line out.
+export LESSQUIET=true
+
ignoreeof=10
export HOME PATH DISPLAY LESS TERM PS1 PS2 ignoreeof
umask 022
diff --git a/source/n/links/links.SlackBuild b/source/n/links/links.SlackBuild
index a1c31724e..62eba31b7 100755
--- a/source/n/links/links.SlackBuild
+++ b/source/n/links/links.SlackBuild
@@ -24,12 +24,12 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=links
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) export ARCH=i586 ;;
+ i?86) export ARCH=i686 ;;
arm*) export ARCH=arm ;;
# Unless $ARCH is already set, use uname -m for all other archs:
*) export ARCH=$( uname -m ) ;;
@@ -49,12 +49,10 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
TMP=${TMP:-/tmp}
PKG=$TMP/package-links
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-elif [ "$ARCH" = "s390" ]; then
- SLKCFLAGS="-O2"
+if [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=pentium4 -mtune=generic"
elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
+ SLKCFLAGS="-O2 -march=x86-64 -mtune=generic -fPIC"
else
SLKCFLAGS="-O2"
fi
diff --git a/source/x/x11/build/xinput_calibrator b/source/x/x11/build/xinput_calibrator
new file mode 100644
index 000000000..d00491fd7
--- /dev/null
+++ b/source/x/x11/build/xinput_calibrator
@@ -0,0 +1 @@
+1
diff --git a/source/x/x11/configure/xinput_calibrator b/source/x/x11/configure/xinput_calibrator
new file mode 100644
index 000000000..fa0206e0a
--- /dev/null
+++ b/source/x/x11/configure/xinput_calibrator
@@ -0,0 +1,18 @@
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir build
+cd build
+meson setup \
+ --prefix=/usr \
+ --libdir=lib${LIBDIRSUFFIX} \
+ --libexecdir /usr/libexec \
+ --bindir /usr/bin \
+ --sbindir /usr/sbin \
+ --includedir /usr/include \
+ --datadir /usr/share \
+ --mandir /usr/man \
+ --sysconfdir /etc \
+ --localstatedir /var \
+ --buildtype=release \
+ -Dgui=x11 \
+ .. || exit 1
diff --git a/source/x/x11/make/xinput_calibrator b/source/x/x11/make/xinput_calibrator
new file mode 100644
index 000000000..635ee83dc
--- /dev/null
+++ b/source/x/x11/make/xinput_calibrator
@@ -0,0 +1,5 @@
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+ ninja || exit 1
+ DESTDIR=$PKG ninja install || exit 1
+cd ..
diff --git a/source/x/x11/modularize b/source/x/x11/modularize
index 00aaabf4c..c381ea8cd 100644
--- a/source/x/x11/modularize
+++ b/source/x/x11/modularize
@@ -234,6 +234,7 @@ xhost
xineramaproto
xinit
xinput
+xinput_calibrator
xisxwayland
xkbcomp
xkbevd
diff --git a/source/x/x11/post-install/xinput_calibrator.post-install b/source/x/x11/post-install/xinput_calibrator.post-install
new file mode 100644
index 000000000..adb35ea55
--- /dev/null
+++ b/source/x/x11/post-install/xinput_calibrator.post-install
@@ -0,0 +1,5 @@
+# Add documentation:
+mkdir -p $PKG/usr/doc/xinput_calibrator-$MODULAR_PACKAGE_VERSION
+cp -a \
+ COPYING* README* NEWS* TODO* ChangeLog Changelog \
+ $PKG/usr/doc/xinput_calibrator-$MODULAR_PACKAGE_VERSION
diff --git a/source/x/x11/slack-desc/xinput_calibrator b/source/x/x11/slack-desc/xinput_calibrator
new file mode 100644
index 000000000..2e5e0cbd2
--- /dev/null
+++ b/source/x/x11/slack-desc/xinput_calibrator
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':'.
+
+ |-----handy-ruler------------------------------------------------------|
+xinput_calibrator: xinput_calibrator (touchscreen calibration program)
+xinput_calibrator:
+xinput_calibrator: Xinput_calibrator is based on a simple calibrator that was proposed on
+xinput_calibrator: the Xorg mailing list. The first release improved upon it by reading
+xinput_calibrator: axis valuators from Xinput, hence making it generic for all
+xinput_calibrator: touchscreen drivers.
+xinput_calibrator:
+xinput_calibrator: For more information about the X.Org Foundation (the providers of the
+xinput_calibrator: X.Org implementation of the X Window System), see their website:
+xinput_calibrator: http://www.x.org
+xinput_calibrator: