summaryrefslogtreecommitdiff
path: root/source/a/aaa_base
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2018-05-28 19:12:29 +0000
committerEric Hameleers <alien@slackware.com>2018-05-31 23:39:35 +0200
commit646a5c1cbfd95873950a87b5f75d52073a967023 (patch)
treeb8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/a/aaa_base
parentd31c50870d0bee042ce660e445c9294a59a3a65b (diff)
downloadcurrent-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a/aaa_base')
-rwxr-xr-xsource/a/aaa_base/aaa_base.SlackBuild48
-rw-r--r--source/a/aaa_base/current-release28
-rw-r--r--source/a/aaa_base/os-release2
-rw-r--r--source/a/aaa_base/slack-desc6
4 files changed, 76 insertions, 8 deletions
diff --git a/source/a/aaa_base/aaa_base.SlackBuild b/source/a/aaa_base/aaa_base.SlackBuild
index 487542da..4497e892 100755
--- a/source/a/aaa_base/aaa_base.SlackBuild
+++ b/source/a/aaa_base/aaa_base.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
-# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2015 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -20,8 +20,11 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+cd $(dirname $0) ; CWD=$(pwd)
+
+PKGNAM=aaa_base
VERSION=14.2
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-4}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -33,7 +36,14 @@ if [ -z "$ARCH" ]; then
esac
fi
-CWD=$(pwd)
+# 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.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
TMP=${TMP:-/tmp}
PKG=$TMP/package-aaa_base
@@ -55,6 +65,19 @@ chmod 644 $PKG/etc/slackware-version
cp -a $CWD/os-release $PKG/etc/os-release
chown root:root $PKG/etc/os-release
chmod 644 $PKG/etc/os-release
+# Set $ARCH in PRETTY_NAME:
+sed -i "s/%ARCH%/$ARCH/g" $PKG/etc/os-release
+
+# If this is a -current version, label it as such:
+if [ -r $CWD/current-release ]; then
+ # Read variables:
+ . $CWD/current-release
+ echo "$SLACKWARE_VERSION" > $PKG/etc/slackware-version
+ echo "VERSION_CODENAME=$VERSION_CODENAME" >> $PKG/etc/os-release
+ sed -i "s/PRETTY_NAME=.*/PRETTY_NAME=\"$PRETTY_NAME\"/g" $PKG/etc/os-release
+else
+ echo "VERSION_CODENAME=stable" >> $PKG/etc/os-release
+fi
# Add lib64 directories on x86_64:
if [ "$ARCH" = "x86_64" ]; then
@@ -65,6 +88,23 @@ fi
cd $PKG
makepkg -l y -c n $TMP/aaa_base-$VERSION-$ARCH-$BUILD.txz
+# Black box warning on -current label:
+if [ -r $CWD/current-release ]; then
+cat << EOF
+################################################################
+################################################################
+## ##
+## WARNING: This release is tagged as -current! ##
+## ##
+## Before issuing a -stable release, rename current-release ##
+## to current-release.inactive and then rebuild this package. ##
+## ##
+################################################################
+################################################################
+EOF
+sleep 5
+fi
+
# Clean up the extra stuff:
if [ "$1" = "--cleanup" ]; then
rm -rf $PKG
diff --git a/source/a/aaa_base/current-release b/source/a/aaa_base/current-release
new file mode 100644
index 00000000..57543bba
--- /dev/null
+++ b/source/a/aaa_base/current-release
@@ -0,0 +1,28 @@
+# If this file is present and named "current-release" when aaa_base is
+# built, then we will modify the files /etc/slackware-version and
+# /etc/os-release to help users identify that this system is running a
+# -current (test) version of Slackware, rather than the otherwise listed
+# stable release.
+#
+# How useful this will be remains to be seen, because there can be a wide
+# variation in the amount of difference a -current installation has from
+# the previous stable depending on how many updates have been made to it.
+# But, it's probably better than nothing.
+#
+# Change made to /etc/slackware-version:
+# Append a "+" to indicate -current.
+#
+# Changes made to /etc/os-release:
+# Add VERSION_CODENAME seen below.
+# Use the PRETTY_NAME variable seen below.
+#
+# This file will still ship in the build directory of a stable release,
+# but will be renamed "current-release.inactive".
+
+# For /etc/slackware-version:
+SLACKWARE_VERSION="Slackware 14.2+"
+
+# For /etc/os-release:
+VERSION_CODENAME=current
+PRETTY_NAME="Slackware 14.2 $ARCH (post 14.2 -current)"
+
diff --git a/source/a/aaa_base/os-release b/source/a/aaa_base/os-release
index de8afe3b..13372b5a 100644
--- a/source/a/aaa_base/os-release
+++ b/source/a/aaa_base/os-release
@@ -2,7 +2,7 @@ NAME=Slackware
VERSION="14.2"
ID=slackware
VERSION_ID=14.2
-PRETTY_NAME="Slackware 14.2"
+PRETTY_NAME="Slackware 14.2 %ARCH%"
ANSI_COLOR="0;34"
CPE_NAME="cpe:/o:slackware:slackware_linux:14.2"
HOME_URL="http://slackware.com/"
diff --git a/source/a/aaa_base/slack-desc b/source/a/aaa_base/slack-desc
index 011f90fb..1c30763c 100644
--- a/source/a/aaa_base/slack-desc
+++ b/source/a/aaa_base/slack-desc
@@ -1,8 +1,8 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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------------------------------------------------------|