Skip to content

Commit 897b2c9

Browse files
committed
rc: add changelog fetch script for opnsense#341
1 parent 7116568 commit 897b2c9

File tree

4 files changed

+63
-10
lines changed

4 files changed

+63
-10
lines changed

+POST_INSTALL

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@ EOF
2121
cat /etc/rc.bak >> /etc/rc
2222
rm -f /etc/rc.bak
2323

24-
echo "Writing package version"
24+
echo "Writing package metadata"
2525
mkdir -p /usr/local/opnsense/version
2626
if [ -f /usr/local/opnsense/version/opnsense ]; then
2727
mv /usr/local/opnsense/version/opnsense /usr/local/opnsense/version/opnsense.last
2828
fi
29-
3029
echo "%%CORE_COMMIT%%" > /usr/local/opnsense/version/opnsense
3130
echo "%%CORE_NAME%%" > /usr/local/opnsense/version/opnsense.name
3231
echo "%%CORE_ABI%%" > /usr/local/opnsense/version/opnsense.abi

.gitignore

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
/src/etc/pkg.conf
2-
/src/etc/pkg/**
3-
/src/etc/ssh/**
4-
/src/etc/php/**
5-
/src/etc/php.ini
6-
/src/lib/**
71
*.DS_Store
82
*.codekit
3+
*.mo
4+
*.pyc
95
*.sass-cache
106
*.volt.php
11-
*.pyc
12-
*.mo
7+
/src/etc/php.ini
8+
/src/etc/php/**
9+
/src/etc/pkg.conf
10+
/src/etc/pkg/**
11+
/src/etc/ssh/**
12+
/src/lib/**
13+
/src/opnsense/changelog
+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
#!/bin/sh
2+
3+
# Copyright (c) 2016 Franco Fichtner <[email protected]>
4+
#
5+
# Redistribution and use in source and binary forms, with or without
6+
# modification, are permitted provided that the following conditions
7+
# are met:
8+
#
9+
# 1. Redistributions of source code must retain the above copyright
10+
# notice, this list of conditions and the following disclaimer.
11+
#
12+
# 2. Redistributions in binary form must reproduce the above copyright
13+
# notice, this list of conditions and the following disclaimer in the
14+
# documentation and/or other materials provided with the distribution.
15+
#
16+
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
17+
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
18+
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
19+
# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
20+
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21+
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22+
# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23+
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24+
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25+
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26+
# SUCH DAMAGE.
27+
28+
set -e
29+
30+
CORE_ABI=$(cat /usr/local/opnsense/version/opnsense.abi 2> /dev/null)
31+
SYS_ABI=$(opnsense-verify -a 2> /dev/null)
32+
33+
URL="https://pkg.opnsense.org"
34+
URL="${URL}/${SYS_ABI}/${CORE_ABI}"
35+
URL="${URL}/sets/changelog.txz"
36+
37+
DESTDIR="/usr/local/opnsense/changelog"
38+
WORKDIR="/tmp/changelog"
39+
FETCH="fetch -aqT 30"
40+
41+
rm -rf ${WORKDIR}
42+
mkdir -p ${WORKDIR}
43+
44+
${FETCH} -o ${WORKDIR}/changelog.txz.sig "${URL}.sig"
45+
${FETCH} -o ${WORKDIR}/changelog.txz "${URL}"
46+
opnsense-verify -q ${WORKDIR}/changelog.txz
47+
48+
mkdir -p ${DESTDIR}
49+
rm ${DESTDIR}/*
50+
51+
tar -C ${DESTDIR} -xJf ${WORKDIR}/changelog.txz

src/opnsense/scripts/firmware/check.sh

+2
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ tmp_pkg_update_file="/tmp/pkg_updates.output"
6262
# Check if pkg is already runnig
6363
pkg_running=`ps -x | grep "pkg " | grep -v "grep"`
6464
if [ "$pkg_running" == "" ]; then
65+
# load changelogs first
66+
/usr/local/opnsense/scripts/firmware/changelog.sh
6567
# start pkg update
6668
pkg update -f > $tmp_pkg_update_file &
6769
pkg_running="started" # Set running state to arbitrary value

0 commit comments

Comments
 (0)