Skip to content

Commit

Permalink
Fix many version strings
Browse files Browse the repository at this point in the history
  • Loading branch information
@qiluo-msft
qiluo-msft committed Jun 12, 2019
1 parent b767949 commit bb61ce3
Show file tree
Hide file tree
Showing 24 changed files with 43 additions and 43 deletions.
2 changes: 1 addition & 1 deletion files/build_templates/swss.service.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Requires=database.service updategraph.service
{% if sonic_asic_platform == 'broadcom' %}
Requires=opennsl-modules.service
{% elif sonic_asic_platform == 'nephos' %}
Requires=nps-modules-4.9.0-8-2-amd64.service
Requires=nps-modules-4.9.0-9-2-amd64.service
{% endif %}
After=database.service updategraph.service
After=interfaces-config.service
Expand Down
4 changes: 2 additions & 2 deletions files/build_templates/syncd.service.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ Requires=database.service updategraph.service
{% if sonic_asic_platform == 'broadcom' %}
Requires=opennsl-modules.service
{% elif sonic_asic_platform == 'nephos' %}
Requires=nps-modules-4.9.0-8-2-amd64.service
Requires=nps-modules-4.9.0-9-2-amd64.service
{% endif %}
After=database.service updategraph.service
After=interfaces-config.service
{% if sonic_asic_platform == 'broadcom' %}
After=opennsl-modules.service
{% elif sonic_asic_platform == 'nephos' %}
After=nps-modules-4.9.0-8-2-amd64.service
After=nps-modules-4.9.0-9-2-amd64.service
{% endif %}
After=swss.service
Before=ntp-config.service
Expand Down
2 changes: 1 addition & 1 deletion platform/barefoot/bfn-modules/debian/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Standards-Version: 3.9.3

Package: bfn-modules
Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for bfn asic for mmap

2 changes: 1 addition & 1 deletion platform/barefoot/sonic-platform-modules-bfn-montara/debian/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Standards-Version: 3.9.3

Package: sonic-platform-modules-bfn-montara
Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

2 changes: 1 addition & 1 deletion platform/barefoot/sonic-platform-modules-bfn/debian/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Standards-Version: 3.9.3

Package: sonic-platform-modules-bfn
Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

2 changes: 1 addition & 1 deletion platform/broadcom/sai-modules.mk
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Broadcom SAI modules

KVERSION = 4.9.0-8-2-amd64
KVERSION = 4.9.0-9-2-amd64
BRCM_OPENNSL_KERNEL_VERSION = 3.4.1.11-1

BRCM_OPENNSL_KERNEL = opennsl-modules_$(BRCM_OPENNSL_KERNEL_VERSION)_amd64.deb
Expand Down
2 changes: 1 addition & 1 deletion platform/broadcom/saibcm-modules/debian/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ Standards-Version: 3.9.3
Package: opennsl-modules
Architecture: amd64
Section: main
Depends: linux-image-4.9.0-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for broadcom SAI
2 changes: 1 addition & 1 deletion platform/broadcom/saibcm-modules/debian/opennsl-modules.dirs
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lib/modules/4.9.0-8-2-amd64/extra
lib/modules/4.9.0-9-2-amd64/extra
8 changes: 4 additions & 4 deletions platform/broadcom/saibcm-modules/debian/opennsl-modules.install
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/4.9.0-8-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/4.9.0-8-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/4.9.0-8-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/4.9.0-8-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/4.9.0-9-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/4.9.0-9-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/4.9.0-9-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/4.9.0-9-2-amd64/extra
systemd/opennsl-modules.service lib/systemd/system
6 changes: 3 additions & 3 deletions platform/broadcom/saibcm-modules/debian/rules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ kdist_config: prep-deb-files
kdist_clean: clean
dh_testdir
dh_clean
SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 KERNDIR=/usr/src/linux-headers-4.9.0-8-2-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-8-2-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean
SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 KERNDIR=/usr/src/linux-headers-4.9.0-9-2-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-9-2-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean
# rm -f driver/*.o driver/*.ko
#
### end KERNEL SETUP
Expand All @@ -78,7 +78,7 @@ build-arch-stamp:
dh_testdir

# Add here command to compile/build the package.
SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 KERNDIR=/usr/src/linux-headers-4.9.0-8-2-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-8-2-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6
SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 KERNDIR=/usr/src/linux-headers-4.9.0-9-2-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-9-2-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6

touch $@

Expand All @@ -103,7 +103,7 @@ clean:
rm -f build-arch-stamp build-indep-stamp configure-stamp

# Add here commands to clean up after the build process.
SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 KERNDIR=/usr/src/linux-headers-4.9.0-8-2-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-8-2-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean
SDK=$(realpath .) LINUX_UAPI_SPLIT=1 DEBIAN_LINUX_HEADER=1 BUILD_KNET_CB=1 KERNDIR=/usr/src/linux-headers-4.9.0-9-2-amd64 KERNEL_SRC=/usr/src/linux-headers-4.9.0-9-2-amd64 $(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean

dh_clean

Expand Down
4 changes: 2 additions & 2 deletions platform/broadcom/sonic-platform-modules-alphanetworks/debian/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ Standards-Version: 3.9.3

Package: sonic-platform-alphanetworks-snh60a0-320fv2
Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

Package: sonic-platform-alphanetworks-snh60b0-640f
Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

4 changes: 2 additions & 2 deletions platform/broadcom/sonic-platform-modules-cel/debian/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ Standards-Version: 3.9.3

Package: platform-modules-dx010
Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp


Package: platform-modules-haliburton
Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp
6 changes: 3 additions & 3 deletions platform/broadcom/sonic-platform-modules-dell/debian/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ Standards-Version: 3.9.3

Package: platform-modules-z9264f
Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-z9100
Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-s6100
Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

8 changes: 4 additions & 4 deletions platform/broadcom/sonic-platform-modules-delta/debian/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@ Standards-Version: 3.9.3

Package: platform-modules-ag9032v1
Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-ag9064
Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-ag5648
Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-et-6248brb
Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-delta/debian/platform-modules-et-6248brb.init
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ start)
modprobe dni_gpio
modprobe delta_et-6248brb_platform

if [ `uname -a | awk '{print $3}'` = "4.9.0-8-2-amd64" ]; then
if [ `uname -a | awk '{print $3}'` = "4.9.0-9-2-amd64" ]; then
echo "453" > "/sys/class/gpio/export"
echo "454" > "/sys/class/gpio/export"
echo "455" > "/sys/class/gpio/export"
Expand Down
2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-delta/et-6248brb/scripts/led_status.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ FAN2_RPM="/sys/bus/i2c/devices/0-002e/fan2_input"
FAN_TRAY1_LED="/sys/devices/platform/delta-et6248brb-gpio.0/FAN/fan1_led_ag"
FAN_TRAY2_LED="/sys/devices/platform/delta-et6248brb-gpio.0/FAN/fan2_led_ag"

if [ `uname -a | awk '{print $3}'` = "4.9.0-8-2-amd64" ]; then
if [ `uname -a | awk '{print $3}'` = "4.9.0-9-2-amd64" ]; then
SYS_LED_G="/sys/class/gpio/gpio453/value"
SYS_LED_R="/sys/class/gpio/gpio454/value"
PWR_LED_G="/sys/class/gpio/gpio455/value"
Expand Down
10 changes: 5 additions & 5 deletions platform/broadcom/sonic-platform-modules-inventec/debian/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,25 @@ Standards-Version: 3.9.3

Package: platform-modules-d7032q28b
Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led

Package: platform-modules-d7054q28b
Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led

Package: platform-modules-d6254qs
Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led

Package: platform-modules-d6556
Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led

Package: platform-modules-d7264q28b
Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led
2 changes: 1 addition & 1 deletion platform/broadcom/sonic-platform-modules-s6000/debian/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Standards-Version: 3.9.3

Package: platform-modules-s6000
Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

4 changes: 2 additions & 2 deletions platform/centec/sonic-platform-modules-e582/debian/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ Standards-Version: 3.9.3

Package: platform-modules-e582-48x2q4z
Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

Package: platform-modules-e582-48x6q
Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp

2 changes: 1 addition & 1 deletion platform/nephos/nephos-modules/debian/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Standards-Version: 3.9.3

Package: nephos-modules
Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for nephos asic

2 changes: 1 addition & 1 deletion platform/nephos/nephos-modules/modules/init.d/nps-modules-4.9.0-8-2-amd64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ force-reload|restart)
;;

*)
echo "Usage: /etc/init.d/nps-modules-4.9.0-8-2-amd64.init {start|stop}"
echo "Usage: /etc/init.d/nps-modules-4.9.0-9-2-amd64.init {start|stop}"
exit 1
;;
esac
Expand Down
4 changes: 2 additions & 2 deletions platform/nephos/nephos-modules/modules/service/nps-modules-4.9.0-8-2-amd64.service
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ Before=syncd.service

[Service]
Type=oneshot
ExecStart=-/etc/init.d/nps-modules-4.9.0-8-2-amd64 start
ExecStop=-/etc/init.d/nps-modules-4.9.0-8-2-amd64 stop
ExecStart=-/etc/init.d/nps-modules-4.9.0-9-2-amd64 start
ExecStop=-/etc/init.d/nps-modules-4.9.0-9-2-amd64 stop
RemainAfterExit=yes

[Install]
Expand Down
2 changes: 1 addition & 1 deletion platform/nephos/sonic-platform-modules-accton/debian/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ Standards-Version: 3.9.3

Package: sonic-platform-accton-as7116-54x
Architecture: amd64
Depends: linux-image-4.9.0-8-2-amd64
Depends: linux-image-4.9.0-9-2-amd64
Description: kernel modules for platform devices such as fan, led, sfp
2 changes: 1 addition & 1 deletion platform/nephos/sonic-platform-modules-cig/debian/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ Standards-Version: 3.9.3

Package: sonic-platform-cig-cs6436-56p
Architecture: amd64
Depends: linux-image-4.9.0-8-amd64
Depends: linux-image-4.9.0-9-amd64
Description: kernel modules for platform devices such as fan, led, sfp

0 comments on commit bb61ce3

Please # to comment.