opensourcemirror
/
opnsense-tools
mirror of https://github.com/opnsense/tools.git
1
0
Fork 0
Code Issues Releases Wiki Activity

build: finish stopping to use the obsolete set

This commit is contained in:
Franco Fichtner 2019-01-09 07:44:48 +01:00
parent 1ef27c249b
commit a8c8a0cf57
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/base.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh
# Copyright (c) 2014-2018 Franco Fichtner <franco@opnsense.org>
# Copyright (c) 2014-2019 Franco Fichtner <franco@opnsense.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -109,7 +109,3 @@ echo "done"
setup_version ${STAGEDIR} ${STAGEDIR}/work ${SELF} ${STAGEDIR}/obsolete
generate_set ${STAGEDIR}/work ${BASE_SET}
generate_signature ${BASE_SET}
# XXX obsolete set usage will be removed in 19.1
cp ${STAGEDIR}/obsolete ${BASE_SET%%.txz}.obsolete
generate_signature ${BASE_SET%%.txz}.obsolete

10
build/rebase.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh
# Copyright (c) 2015-2018 Franco Fichtner <franco@opnsense.org>
# Copyright (c) 2015-2019 Franco Fichtner <franco@opnsense.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -31,11 +31,13 @@ SELF=rebase
. ./common.sh
setup_stage ${STAGEDIR}
BASE_SET=$(find ${SETSDIR} -name "base-*-${PRODUCT_ARCH}.txz")
BASE_OBSOLETE=/usr/local/opnsense/version/base.obsolete
tar -tf ${BASE_SET} | sed -e 's/^\.//g' -e '/\/$/d' | sort > \
${CONFIGDIR}/plist.base.${PRODUCT_ARCH}
# XXX remove obsolete "set" usage, it's in the base set
BASE_OBSOLETE=$(find ${SETSDIR} -name "base-*-${PRODUCT_ARCH}.obsolete")
cp ${BASE_OBSOLETE} ${CONFIGDIR}/plist.obsolete.${PRODUCT_ARCH}
tar -C ${STAGEDIR} -xf ${BASE_SET} .${BASE_OBSOLETE}
cp ${STAGEDIR}${BASE_OBSOLETE} ${CONFIGDIR}/plist.obsolete.${PRODUCT_ARCH}