Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8cd785dd7124e367fa5acbb1aa5ce00a5194013c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8cd785dd7124e367fa5acbb1aa5ce00a5194013c)
  • Date: Sat, 16 Feb 2019 09:04:59 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

kde5-apps/latte-dock/DETAILS | 2
kde5-apps/latte-dock/HISTORY | 3 +
qt5-cmake/rosegarden/DETAILS | 6 +-
qt5-cmake/rosegarden/HISTORY | 3 +
smgl/init.d/BUILD | 2
smgl/init.d/CONFIGURE | 12 -----
smgl/init.d/DEPENDS | 29 ------------
smgl/init.d/DETAILS | 2
smgl/init.d/FINAL | 7 --
smgl/init.d/HISTORY | 10 ++++
smgl/init.d/init.d/devices | 96
----------------------------------------
smgl/init.d/init.d/devices.conf | 4 -
12 files changed, 28 insertions(+), 148 deletions(-)

New commits:
commit 2c18dd48f160cbea63e29ab67194557684c8e0ce
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

latte-dock: => 0.8.6

commit eaac1dd72f18688824e624091bb5d9727eff0c80
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

rosegarden: => 18.12

commit 27a77b14182962b92b38a82a8b4c76e71bba6f51
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

init.d -only support eudev >= 230 (systemd 220)

commit 89539b944496a79d5d07d4de7e8a83b2ead88196
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

init.d - remove linux-2.6 stuff

commit 6ae87e4dbd69f02d5ad83f13a387b237b5736274
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

init.d - remove unneeded missing.h processing

commit a77f1d47e53061d1f349405d6d1c6e909513b740
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

init.d: => 2.2.18

diff --git a/kde5-apps/latte-dock/DETAILS b/kde5-apps/latte-dock/DETAILS
index fb993b1..e2bd592 100755
--- a/kde5-apps/latte-dock/DETAILS
+++ b/kde5-apps/latte-dock/DETAILS
@@ -1,5 +1,5 @@
SPELL=latte-dock
- VERSION=0.8.5
+ VERSION=0.8.6
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://github.com/psifidotos/$SPELLX
diff --git a/kde5-apps/latte-dock/HISTORY b/kde5-apps/latte-dock/HISTORY
index 3ffe1c0..72c39d1 100644
--- a/kde5-apps/latte-dock/HISTORY
+++ b/kde5-apps/latte-dock/HISTORY
@@ -1,3 +1,6 @@
+2019-02-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.8.6
+
2019-01-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.8.5

diff --git a/qt5-cmake/rosegarden/DETAILS b/qt5-cmake/rosegarden/DETAILS
index 4744ad0..19f5eab 100755
--- a/qt5-cmake/rosegarden/DETAILS
+++ b/qt5-cmake/rosegarden/DETAILS
@@ -13,11 +13,11 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
else
- VERSION=18.06
-
SOURCE_HASH=sha512:7ab9c677484c1518457db21091bc612071556e9002c6132e0b4fa7aa5c970f45f130a1a68333a184de895f5912b4229b2bbbcf0f508d6cff1eaec6b7ac599ca9
+ VERSION=18.12
+
SOURCE_HASH=sha512:2adf1c2bfbd6a054d66438b766a33774997ae577668ddbe7869ed4d25ab263b04e1ff086cc5fb4d2916621138d8986a1c032bd2719fa7cc7b43f0abc073d78d8
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=https://downloads.sourceforge.net/project/$SPELL/$SOURCE
+
SOURCE_URL[0]=https://sourceforge.net/projects/rosegarden/files/rosegarden/$VERSION/$SOURCE
fi
WEB_SITE=https://www.rosegardenmusic.com/
ENTERED=20020514
diff --git a/qt5-cmake/rosegarden/HISTORY b/qt5-cmake/rosegarden/HISTORY
index c06fd2f..16e2932 100644
--- a/qt5-cmake/rosegarden/HISTORY
+++ b/qt5-cmake/rosegarden/HISTORY
@@ -1,3 +1,6 @@
+2019-02-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 18.12
+
2018-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 18.06
now qt5 + cmake based
diff --git a/smgl/init.d/BUILD b/smgl/init.d/BUILD
index e979159..2627d29 100755
--- a/smgl/init.d/BUILD
+++ b/smgl/init.d/BUILD
@@ -31,6 +31,6 @@ check_static_dev () {
rmdir /tmp/$$.bindmount
}

-if [[ "$DEVICES" != "devfs" ]] && [[ "$CREATE_DEV_TREE" == y ]]; then
+if [[ "$CREATE_DEV_TREE" == y ]]; then
check_static_dev
fi
diff --git a/smgl/init.d/CONFIGURE b/smgl/init.d/CONFIGURE
index 59446b6..7a4b3ae 100755
--- a/smgl/init.d/CONFIGURE
+++ b/smgl/init.d/CONFIGURE
@@ -10,13 +10,6 @@ else
DEVICES_LIST="static"
fi &&

-if grep -q devfs /proc/filesystems &&
- [[ -e /dev/.devfsd ]]; then
- DEVICES_LIST="$DEVICES_LIST devfs" &&
- message "\n${MESSAGE_COLOR}NOTICE: Switching from devfs to udev or static"
\
- "currently needs manual editing of /etc/fstab.${DEFAULT_COLOR}\n"
-fi &&
-
# default to the previously selected option #9772 - only a problem on the
very
# second cast. Adding it to the start of the list makes it the default in
# the next query.
@@ -25,7 +18,4 @@ if [[ -f $INSTALL_ROOT/etc/sysconfig/devices ]]; then
fi &&
config_query_list DEVICES "Choose /dev management mode:" \
$DEVICES ${DEVICES_LIST/$DEVICES/} &&
-if [[ "$DEVICES" != "devfs" ]]
-then
- config_query CREATE_DEV_TREE "check for/create static /dev tree" y
-fi
+config_query CREATE_DEV_TREE "check for/create static /dev tree" y
diff --git a/smgl/init.d/DEPENDS b/smgl/init.d/DEPENDS
index e529f4d..712afdb 100755
--- a/smgl/init.d/DEPENDS
+++ b/smgl/init.d/DEPENDS
@@ -1,29 +1,4 @@
-depends simpleinit-msb &&
-
-if [[ $DEVICES == devfs ]]
+if [[ $DEVICES == udev ]]
then
- optional_depends devfsd \
- "" \
- "" \
- "to make devfs more functional and compatible with \
-the old static /dev"
-elif [[ $DEVICES == udev ]]
-then
- local KVER=$(get_kernel_version) &&
- local VER1=${KVER/.*} &&
- local VER2=$(echo $KVER | cut -d. -f2) &&
- local VER3=$(echo $KVER | cut -d. -f3) &&
- VER3=${VER3%%[^0-9]*} &&
-
- if (( VER1 > 2 )) ||
- (( VER2 > 6 )) ||
- (( VER2 == 6 && VER3 > 14 )) ||
- spell_ok eudev
- then
- depends DEVICE-MANAGER
- else
- message "You have a kernel < 2.6.15, it is too old for" \
- "latest udev.\nUsing udev-old spell instead." &&
- depends udev-old
- fi
+ depends eudev
fi
diff --git a/smgl/init.d/DETAILS b/smgl/init.d/DETAILS
index 7743084..f09cf86 100755
--- a/smgl/init.d/DETAILS
+++ b/smgl/init.d/DETAILS
@@ -1,5 +1,5 @@
SPELL=init.d
- VERSION=2.2.17
+ VERSION=2.2.18
LICENSE[0]=GPL
GATHER_DOCS=off
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/smgl/init.d/FINAL b/smgl/init.d/FINAL
index e6218da..f6e71ca 100755
--- a/smgl/init.d/FINAL
+++ b/smgl/init.d/FINAL
@@ -21,12 +21,7 @@ fi

sedit "s/DEVICES=.*/DEVICES=$DEVICES/"
${INSTALL_ROOT}/etc/sysconfig/devices

-if [ "$DEVICES" == "devfs" ]; then
- sedit "s:/dev/tty\(.\):/dev/vc/\1:" ${INSTALL_ROOT}/etc/inittab
- message "tty devices in inittab set to $DEVICES/vc/[1-6]"
-else
- message "tty devices in inittab set to /dev/tty[1-6]"
-fi
+message "tty devices in inittab set to /dev/tty[1-6]"

# remove /etc/inittab from the simpleinit install log
# this should work for $INSTALL_ROOT/etc/inittab, too
diff --git a/smgl/init.d/HISTORY b/smgl/init.d/HISTORY
index 4713171..7b9965e 100644
--- a/smgl/init.d/HISTORY
+++ b/smgl/init.d/HISTORY
@@ -1,3 +1,13 @@
+2019-01-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS init.d/devices: remove linux-2.6 related stuff
+ remove old eudev support
+
+2019-01-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.2.18
+ * BUILD CONFIGURE DEPENDS FINAL init.d/devices init.d/devices.conf:
+ remove devfs stuff
+ * init.d/devices: remove missing.h stuff
+
2018-12-15 Treeve Jelbert <treeve AT sourcemage.org>
* init.d/devices: fix for modern eudev
* DETAILS: version 2.2.17
diff --git a/smgl/init.d/init.d/devices b/smgl/init.d/init.d/devices
index 824eea7..478c43d 100755
--- a/smgl/init.d/init.d/devices
+++ b/smgl/init.d/init.d/devices
@@ -7,37 +7,8 @@ ESSENTIAL=yes
. /etc/init.d/smgl_init
. /etc/sysconfig/devices

-start_devfs()
-{
- if ! [ -e /dev/.devfsd ]
- then echo "Mounting devfs on /dev"
- mount -n -t devfs devfs /dev
- evaluate_retval
- fi
-
- echo "Telling init to reopen file descriptors"
- kill -USR1 1
-
- if [ ! -x "/sbin/devfsd" ] ; then
- ln -sf /proc/self/fd /dev/fd
- ln -sf /dev/fd/0 /dev/stdin
- ln -sf /dev/fd/1 /dev/stdout
- ln -sf /dev/fd/2 /dev/stderr
- fi
-}
-
udev_mknodes()
{
-# eudev creates these; errors if they are already present
-UD=`/bin/udevadm --version`
-if [[ $UD < '220' ]];then
- if [ ! -d $udev_root/fd ]; then
- ln -fs /proc/self/fd $udev_root/fd
- fi
- ln -s /dev/fd/0 $udev_root/stdin
- ln -s /dev/fd/1 $udev_root/stdout
- ln -s /dev/fd/2 $udev_root/stderr
-fi
mkdir $udev_root/shm
mkdir $udev_root/pts
}
@@ -55,41 +26,6 @@ start_udev()
fi
# create some needed stuff
udev_mknodes
-
- # kernel 2.6.15-rc1 and higher don't use hotplug
- if [[ $(printf "%s\n%s\n" "$(uname -r)" "2.6.15" | sort -V | head -n 1) \
- = 2.6.15 ]]; then
- echo "don't need hotplug for this kernel"
- builtin echo > /proc/sys/kernel/hotplug
- else
- # Now uses udevsend as the hotplug multiplexer
- echo "Setting udevsend as hotplug agent"
- sysctl -w kernel.hotplug="/sbin/udevsend" > /dev/null 2>&1
- echo "Creating initial udev device nodes"
- /sbin/udevstart
- fi
-
- if [ -f /etc/udev/udev.missing ]; then
- echo "Processing /etc/udev/udev.missing"
- cd /dev
- while read line; do
- if [ "${line:0:1}" == "#" ]; then continue; fi
- for ((i=0; i<7; i++)); do
- val[$i]=${line%%:*}
- line=${line#*:}
- done
- if [ "${val[1]}" == "d" ]; then
- mkdir ${val[0]}
- else
- mknod ${val[0]} ${val[1]} ${val[2]} ${val[3]}
- fi
- chmod ${val[4]} ${val[0]}
- chown ${val[5]}:${val[6]} ${val[0]}
- done < /etc/udev/udev.missing
- cd /
- fi
- echo "Telling init to reopen file descriptors"
- kill -USR1 1
) }

start_static_udev()
@@ -98,38 +34,6 @@ start_static_udev()
# create some needed stuff - and insist on it
udev_mknodes

- # kernel 2.6.15-rc1 and higher don't use hotplug
- if [[ $(printf "%s\n%s\n" "$(uname -r)" "2.6.15" | sort -V | head -n 1) \
- = 2.6.15 ]]; then
- echo "don't need hotplug for this kernel"
- builtin echo > /proc/sys/kernel/hotplug
- else
- # Now uses udevsend as the hotplug multiplexer
- echo "Setting udevsend as hotplug agent"
- sysctl -w kernel.hotplug="/sbin/udevsend" > /dev/null 2>&1
- echo "Creating initial udev device nodes"
- /sbin/udevstart
- fi
-
- if [ -f /etc/udev/udev.missing ]; then
- echo "Processing /etc/udev/udev.missing"
- cd /dev
- while read line; do
- if [ "${line:0:1}" == "#" ]; then continue; fi
- for ((i=0; i<7; i++)); do
- val[$i]=${line%%:*}
- line=${line#*:}
- done
- if [ "${val[1]}" == "d" ]; then
- mkdir -p ${val[0]}
- else
- mknod ${val[0]} ${val[1]} ${val[2]} ${val[3]}
- fi
- chmod ${val[4]} ${val[0]}
- chown ${val[5]}:${val[6]} ${val[0]}
- done < /etc/udev/udev.missing
- cd /
- fi
) }

start_static()
diff --git a/smgl/init.d/init.d/devices.conf b/smgl/init.d/init.d/devices.conf
index e9c9b75..528804b 100644
--- a/smgl/init.d/init.d/devices.conf
+++ b/smgl/init.d/init.d/devices.conf
@@ -1,5 +1,5 @@
-# type of device management, "static", "devfs", "udev" or "static_udev"
-DEVICES=devfs
+# type of device management, "static", "udev" or "static_udev"
+DEVICES=udev

# RUN_SIZE: maximum size of /run
#



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8cd785dd7124e367fa5acbb1aa5ce00a5194013c), Treeve Jelbert, 02/16/2019

Archive powered by MHonArc 2.6.24.

Top of Page