Skip to content

Commit 0cda1d9

Browse files
committed
Update changelog and tweak some docs slightly.
1 parent 810e9c6 commit 0cda1d9

File tree

5 files changed

+23
-15
lines changed

5 files changed

+23
-15
lines changed

changelog

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ turnkey-tkldev-16.0 (1) turnkey; urgency=low
44
script has been tweaked and some config setup has been moved to package
55
postinst scripts.
66

7-
NOTE: more work is still required to make it possible for users to easily
8-
build packages.
7+
TODO: more work is still required to make it possible for users to easily
8+
build packages. Plus the buildroot repo needs update.
99

1010
* fab:
1111

12-
- major changes to way that the bootstrap is built. Now leverage Debian's
12+
- major changes to way that the bootstrap is built. Now leverages Debian's
1313
debootstrap directly (bootstrap components removed from fab, remaining
1414
changes in turnkey/bootstrap repo).
1515

@@ -41,7 +41,7 @@ turnkey-tkldev-16.0 (1) turnkey; urgency=low
4141
* Note: Please refer to turnkey-core's changelog for changes common to all
4242
appliances. Here we only describe changes specific to this appliance.
4343

44-
-- Jeremy Davis <[email protected]> Fri, 13 Mar 2020 17:05:15 +1100
44+
-- Jeremy Davis <[email protected]> Fri, 27 Mar 2020 16:23:05 +1100
4545

4646
turnkey-tkldev-15.0 (1) turnkey; urgency=low
4747

docs/appliance-checklist.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Third Party Apt Repos
1919
- [ ] apt pinning
2020
- [ ] packages MEANT for install are pinned to 500
2121
- [ ] packages NOT meant for install are pinned to 10
22-
22+
2323
Third Party Package Management
2424
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2525

docs/development/buildprocess.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@ Extra note
128128
----------
129129

130130
If you wish to build a "production ready" ISO which is named correctly and
131-
a hash file also generated, you can use the ``bt-iso`` script from
131+
a hash file also generated, you can use the ``bt-iso`` script from
132132
`buildtasks`_. Note that ``bit-iso`` will name the ISO by the standard TKL
133-
naming convention (we refer to this internally as "appver"::
133+
naming convention (we refer to this internally as "appver")::
134134

135135
turnkey-_APPLIANCE-NAME_-VERSION-CODENAME_ARCH.iso
136136

docs/development/howto-new-app.rst

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Sane Base
3838
All turnkey appliances must include ``$(FAB_PATH)/common/mk/turnkey.mk``
3939
And all lamp-based appliances must include ``$(FAB_PATH)/common/mk/turnkey/lamp.mk``
4040

41-
.. note::
41+
.. note::
4242

4343
all appliance-base specific common makefiles must be included BEFORE turnkey.mk
4444
as they may modify how turnkey.mk behaves.
@@ -67,9 +67,15 @@ Makefile
6767

6868
WEBMIN_FW_NAT_EXTRA
6969
extra NAT controls?
70-
71-
NONFREE
72-
enable non-free Debian repo
70+
71+
NONFREE=y
72+
enable non-free Debian repo - install packages via plan
73+
74+
BACKPORTS=y
75+
enable Debian backports repo - install packages via plan
76+
77+
TKL_TESTING=y
78+
enable TurnKey 'testing' apt repo - install packages via plan
7379

7480
COMMON_CONF
7581
space separated list of conf scripts to be included from common
@@ -83,7 +89,9 @@ Makefile
8389
CREDIT_LOCATION
8490
FIXME: don't know what this does
8591

86-
PHP56
92+
PHP_VERSION=XY
93+
Configure PHP X.Y version third party apt repo (deb.sury.org)
94+
- install packages via plan
8795

8896
.. note::
8997
including common stuff

docs/development/installing-software.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ Install upstream software
3333

3434
See `AptPreferences <https://wiki.debian.org/AptPreferences>`_ for more information on
3535
apt pinning. However the following should be enough for turnkey development.
36-
36+
3737
#. Create a file in ``/etc/apt/preferences.d/<name>``
3838

3939
#. Pin all packages from this repo to never install by adding the following:
4040

41-
.. code-block::
41+
.. code-block::
4242
4343
Package: *
4444
Pin: origin "<url-to-apt-repo>"
@@ -48,7 +48,7 @@ Install upstream software
4848

4949
#. Pin all packages you require to priority over default repos.
5050

51-
.. code-block::
51+
.. code-block::
5252
5353
Package: *
5454
Pin: origin "<url-to-apt-repo>"

0 commit comments

Comments
 (0)